diff options
author | Ulrich Drepper <drepper@redhat.com> | 1996-12-08 08:01:13 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1996-12-08 08:01:13 +0000 |
commit | f65fd747b440ae2d8a7481ecc50e668c5e4d0cc9 (patch) | |
tree | f64c3eeda0e9acc58b96c28ca852a014c822047f /stdlib/canonicalize.c | |
parent | 42054ddb496798d9b936490cf0050f6619f86bc1 (diff) |
update from main archive 961207cvs/libc-961208
Sun Dec 8 06:56:49 1996 Ulrich Drepper <drepper@cygnus.com>
* io/getwd.c: Use PATH_MAX not LOCAL_PATH_MAX. Fix typo in
comment.
* stdlib/canonicalize.c: Correct bugs in last change.
Patch by HJ Lu.
* libio/Makefile (routines): Remove ioprims.
(aux): Remove cleanup.
Add IO_DEBUG option for .o files.
* libio/cleanups.c: Removed.
* libio/ioprims.c: Removed.
* libio/filedoalloc.c: More updates from libg++-2.8b5.
* libio/fileops.c: Likewise.
* libio/genops.c: Likewise.
* libio/iolibio.h: Likewise.
* libio/iopopen.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* libio/libio.h: Likewise.
* libio/libioP.h: Likewise.
* libio/memstream.c: Likewise.
* libio/strfile.h: Likewise.
* libio/vasprintf.c: Likewise.
* libio/vsnprintf.c: Likewise.
* libio/stdio.h: Define P_tmpdir only is __USE_SVID.
* manual/arith.texi: Change references to ANSI C to ISO C.
* manual/conf.texi: Likewise.
* manual/creature.texi: Likewise.
* manual/ctype.texi: Likewise.
* manual/errno.texi: Likewise.
* manual/filesys.texi: Likewise.
* manual/intro.texi. Likewise.
* manual/io.texi: Likewise.
* manual/lang.texi: Likewise.
* manual/libc.texinfo: Likewise.
* manual/locale.texi: Likewise.
* manual/maint.texi: Likewise.
* manual/mbyte.texi: Likewise.
* manual/memory.texi: Likewise.
* manual/process.texi: Likewise.
* manual/process.texi: Likewise.
* manual/search.texi: Likewise.
* manual/setjmp.texi: Likewise.
* manual/signal.texi: Likewise.
* manual/startup.texi: Likewise.
* manual/stdio.texi: Likewise.
* manual/string.texi: Likewise.
* manual/time.texi: Likewise.
* manual/locale.texi: Remove description of LC_RESPONSE and add
LC_MESSAGES.
* Makefile (subdirs): Change malloc in $(malloc).
* config.make.in: Add variable malloc which is initialized from
@malloc@.
* configure.in: Add new option --enable-new-malloc to use new
malloc. This is the default on Linux.
* sysdeps/unix/sysv/linux/configure.in: Define malloc to new-malloc
by default.
* new-malloc/Makefile: New file. Improved malloc implementation.
* new-malloc/malloc.c: Likewise.
* new-malloc/malloc.h: Likewise.
* new-malloc/mallocbug.c: Likewise.
* new-malloc/obstack.c: Likewise.
* new-malloc/obstack.h: Likewise.
* new-malloc/thread-m.h: Likewise.
* time/Makefile: Compile ap.c with NO_MCHECK flag for now.
* time/ap.c: Don't call mcheck if NO_MCHECK is defined.
* resolv/Makefile: Add rule to rebuiild libresolv.so when libc.so
changed.
* stdio/feof.c: Update copyright.
* stdio/stdio.h: Add field for lock to FILE structure.
Add cast to *MAGIC constants to prevent warnings.
* stdio-common/bug7.c: Correct test. Stream must not be closed
twice.
* stdlib/Makefile (routines): Add secure-getenv.
* stdlib/secure-getenv.c: New file. __secure_getenv function
moved to here from sysdeps/generic/getenv.c. Otherwise an
application cannot replace the getenv function in the libc.
* sysdeps/generic/getenv.c: Remove __secure_getenv function.
* sysdeps/stub/getenv.c: Remove __secure_getenv alias.
* sysdeps/mach/libc-lock.h: Define__libc_mutex_lock to __mutex_lock.
* sysdeps/posix/fdopen.c: Update copyright. Don't use EXFUN.
* time/test-tz.c: Comment fifth test out. PROBLEM.
* time/tzset.c: De-ANSI-declfy.
(__tzset): Don't increment pointer tz when no DST information is
given.
Sat Dec 7 23:47:54 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/mach/libc-lock.h [_LIBC]: Add definition of
__libc_mutex_lock.
Patch by Thomas Bushnell.
* sysdeps/unix/sysv/linux/timebits.h: Load <asm/param.h> only
if __USE_MISC.
* sysdeps/unix/sysv/linux/Dist: Add llseek.c.
Sat Dec 7 12:18:56 1996 Ulrich Drepper <drepper@cygnus.com>
* time/strftime (%c format): Remove %Z from default string.
Reported by Paul Eggert
* io/getwd.c: Don't apply getcwd on user supplied buffer.
Diffstat (limited to 'stdlib/canonicalize.c')
-rw-r--r-- | stdlib/canonicalize.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c index 8c0074a11c..0985e250b8 100644 --- a/stdlib/canonicalize.c +++ b/stdlib/canonicalize.c @@ -53,21 +53,14 @@ canonicalize (const char *name, char *resolved) path_max = 1024; #endif - rpath = resolved; + rpath = resolved ? __alloca (path_max) : malloc (path_max); rpath_limit = rpath + path_max; - if (!resolved) - rpath = malloc (path_max); if (name[0] != '/') { - /* We don't write to RPATH directly since the application and - the library might disagree about the value for PATH_MAX. */ - char tmpbuf[path_max]; - if (!getcwd (rpath, path_max)) goto error; - - dest = __stpcpy (rpath, tmpbuf); + dest = strchr (rpath, '\0'); } else { @@ -128,7 +121,7 @@ canonicalize (const char *name, char *resolved) if (S_ISLNK (st.st_mode)) { - char * buf = __alloca(path_max); + char *buf = __alloca (path_max); if (++num_links > MAXSYMLINKS) { @@ -169,10 +162,13 @@ canonicalize (const char *name, char *resolved) if (dest > rpath + 1 && dest[-1] == '/') --dest; *dest = '\0'; - return rpath; + + return resolved ? strcpy (resolved, rpath) : rpath; error: - if (!resolved) + if (resolved) + strcpy (resolved, rpath); + else free (rpath); return NULL; } |