diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | stdlib/canonicalize.c | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index c39ca5325f..a574af7ffa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-02-16 Ulrich Drepper <drepper@redhat.com> + * stdlib/canonicalize.c (__realpath): Remove unnecessary copy + operations. + * nscd/nscd_conf.c (nscd_parse_file): Little optimization. 2004-02-14 Thorsten Kukuk <kukuk@suse.de> diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c index 5c55c5dbd1..0947c67dd2 100644 --- a/stdlib/canonicalize.c +++ b/stdlib/canonicalize.c @@ -1,5 +1,5 @@ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1996-2001, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -17,6 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <assert.h> #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -204,12 +205,12 @@ __realpath (const char *name, char *resolved) --dest; *dest = '\0'; - return resolved ? memcpy (resolved, rpath, dest - rpath + 1) : rpath; + assert (resolved == NULL || resolved == rpath); + return resolved ?: rpath; error: - if (resolved) - strcpy (resolved, rpath); - else + assert (resolved == NULL || resolved == rpath); + if (resolved == NULL) free (rpath); return NULL; } |