From 2ad4fab214b13af85237b9e836c525e9ce3e7fb6 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 8 Apr 1998 20:27:31 +0000 Subject: Update. 1998-04-08 20:06 Ulrich Drepper * 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. --- stdlib/canonicalize.c | 10 ++++++---- stdlib/stdlib.h | 2 ++ stdlib/strtod.c | 4 ++-- stdlib/strtol.c | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) (limited to 'stdlib') diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c index 3617226f0a..ef7311e90d 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) diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index bf7b2638d2..757c252e87 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -573,6 +573,7 @@ extern int system __P ((__const char *__command)); /* Return a malloc'd string containing the canonical absolute name of the named file. The last file name component need not exist, and may be a symlink to a nonexistent file. */ +extern char *__canonicalize_file_name __P ((__const char *__name)); extern char *canonicalize_file_name __P ((__const char *__name)); #endif @@ -583,6 +584,7 @@ extern char *canonicalize_file_name __P ((__const char *__name)); name is PATH_MAX chars or more, returns null with `errno' set to ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars, returns the name in RESOLVED. */ +extern char *__realpath __P ((__const char *__name, char *__resolved)); extern char *realpath __P ((__const char *__name, char *__resolved)); #endif diff --git a/stdlib/strtod.c b/stdlib/strtod.c index 226b16ff5c..ad3bcd1117 100644 --- a/stdlib/strtod.c +++ b/stdlib/strtod.c @@ -459,7 +459,7 @@ INTERNAL (STRTOF) (nptr, endptr, group LOCALE_PARAM) else { /* Figure out the thousands separator character. */ - thousands = btowc (*_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP)); + thousands = __btowc (*_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP)); if (thousands == WEOF) thousands = L'\0'; if (thousands == L'\0') @@ -470,7 +470,7 @@ INTERNAL (STRTOF) (nptr, endptr, group LOCALE_PARAM) grouping = NULL; /* Find the locale's decimal point character. */ - decimal = btowc (*_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT)); + decimal = __btowc (*_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT)); if (decimal == WEOF) decimal = L'.'; assert (decimal != L'\0'); diff --git a/stdlib/strtol.c b/stdlib/strtol.c index e4e7b4e5a6..c467173838 100644 --- a/stdlib/strtol.c +++ b/stdlib/strtol.c @@ -263,7 +263,7 @@ INTERNAL (strtol) (nptr, endptr, base, group LOCALE_PARAM) { /* Figure out the thousands separator character. */ # if defined _LIBC || defined _HAVE_BTOWC - thousands = btowc (*_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP)); + thousands = __btowc (*_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP)); if (thousands == WEOF) thousands = L'\0'; # endif -- cgit v1.2.3