diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-04-08 20:27:31 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-04-08 20:27:31 +0000 |
| commit | 2ad4fab214b13af85237b9e836c525e9ce3e7fb6 (patch) | |
| tree | 62a1af6c73f43be6aba28da5d8fdc33122b476aa /stdlib/canonicalize.c | |
| parent | cd2bd5915d633f9d526d8d17636054c93cd1580e (diff) | |
| download | glibc-2ad4fab214b13af85237b9e836c525e9ce3e7fb6.zip glibc-2ad4fab214b13af85237b9e836c525e9ce3e7fb6.tar.gz glibc-2ad4fab214b13af85237b9e836c525e9ce3e7fb6.tar.bz2 | |
Update.
1998-04-08 20:06 Ulrich Drepper <drepper@cygnus.com>
* iconv/gconv_conf.c (__gconv_read_conf): Use __realpath not realpath.
* iconv/gconv_db.c: Use __ protected regex functions.
* iconv/gconv_simple.c: Use __mbsinit not mbsinit.
* posix/getopt_init.c: Use __getpid not getpid.
* posix/regex.c: Rename all global functions to start with __ and
make old names weak aliases.
* posix/regex.h: Adopt prototypes for this.
* stdlib/canonicalize.c: Define __realpath, make canonicalize_file_name
a weak alias and use __getcwd instead of getcwd.
* stdlib/stdlib.h: Declare __realpath and __canonicalize_file_name.
* stdlib/strtod.c: Use __btowc instead of btowc.
* stdlib/strtol.c: Likewise.
* sysdeps/libm-ieee754/s_matherr.c: Weaken definition of matherr.
* sysdeps/unix/sysv/linux/errlist.c: Make sure definitions of sys_nerr
and sys_errlist are weak.
* wcsmbs/btowc.c: Define function as __btowc and make btowc weak alias.
* wcsmbs/mbrtowc.c: Use __mbsinit not mbsinit.
* wcsmbs/mbsnrtowcs.c: Likewise.
* wcsmbs/mbsrtowcs.c: Likewise.
* wcsmbs/wcsnrtombs.c: Likewise.
* wcsmbs/wcsrtombs.c: Likewise.
* wcsmbs/mbsinit.c: Define function as __mbsinit and make mbsinit
weak alias.
* wcsmbs/wchar.h: Declare __btowc and __mbsinit.
* wctype/wctype.c: Define function as __wctype and make wctype
weak alias.
* wctype/wctype.h: Declare __wctype.
Diffstat (limited to 'stdlib/canonicalize.c')
| -rw-r--r-- | stdlib/canonicalize.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c index 3617226..ef7311e 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, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998 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 @@ -74,7 +74,7 @@ canonicalize (const char *name, char *resolved) if (name[0] != '/') { - if (!getcwd (rpath, path_max)) + if (!__getcwd (rpath, path_max)) goto error; dest = strchr (rpath, '\0'); } @@ -147,7 +147,7 @@ canonicalize (const char *name, char *resolved) goto error; } - n = readlink (rpath, buf, path_max); + n = __readlink (rpath, buf, path_max); if (n < 0) goto error; buf[n] = '\0'; @@ -191,11 +191,13 @@ error: free (rpath); return NULL; } +strong_alias (canonicalize, __realpath) weak_alias (canonicalize, realpath) char * -canonicalize_file_name (const char *name) +__canonicalize_file_name (const char *name) { return canonicalize (name, NULL); } +weak_alias (__canonicalize_file_name, canonicalize_file_name) |