aboutsummaryrefslogtreecommitdiff
path: root/string
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-09-28 09:00:19 +0000
committerRoland McGrath <roland@gnu.org>1995-09-28 09:00:19 +0000
commit3ec41e0302fb7b3910edecfd30c97edba3a6e282 (patch)
tree64126b756c37dfcbca2564779896601d4fbed800 /string
parentf94f8067b18803b47153fa0f8f67fe5763a1cd3b (diff)
downloadglibc-3ec41e0302fb7b3910edecfd30c97edba3a6e282.tar
glibc-3ec41e0302fb7b3910edecfd30c97edba3a6e282.tar.gz
glibc-3ec41e0302fb7b3910edecfd30c97edba3a6e282.tar.bz2
glibc-3ec41e0302fb7b3910edecfd30c97edba3a6e282.zip
* sysdeps/mach/hurd/getcwd.c (__getcwd): Renamed from getcwd.
(getcwd): Define as weak alias. * sysdeps/posix/getcwd.c: Likewise. * sysdeps/stub/getcwd.c: Likewise. * posix/unistd.h: Declare __getcwd. * string/string.h: Declare __strcasecmp. * sysdeps/generic/strcasecmp.c (__strcasecmp): Renamed from strcasecmp. (strcasecmp): Define as weak alias. * string/string.h: Declare __stpcpy. * sysdeps/generic/stpcpy.c (__stpcpy): Renamed from stpcpy. (stpcpy): Define as weak alias.
Diffstat (limited to 'string')
-rw-r--r--string/string.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/string/string.h b/string/string.h
index 564adcce2a..0f995319bb 100644
--- a/string/string.h
+++ b/string/string.h
@@ -149,6 +149,7 @@ extern int bcmp __P ((__const __ptr_t __s1, __const __ptr_t __s2, size_t __n));
extern int ffs __P ((int __i));
/* Compare S1 and S2, ignoring case. */
+extern int __strcasecmp __P ((__const char *__s1, __const char *__s2));
extern int strcasecmp __P ((__const char *__s1, __const char *__s2));
/* Return the next DELIM-delimited token from *STRINGP,
@@ -156,10 +157,6 @@ extern int strcasecmp __P ((__const char *__s1, __const char *__s2));
extern char *strsep __P ((char **__stringp, __const char *__delim));
#endif
-/* Copy no more than N characters of SRC to DEST, returning the address of
- the last character written into DEST. */
-extern char *__stpncpy __P ((char *__dest, __const char *__src, size_t __n));
-
#ifdef __USE_GNU
/* Compare no more than N chars of S1 and S2, ignoring case. */
extern int strncasecmp __P ((__const char *__s1, __const char *__s2,
@@ -169,16 +166,14 @@ extern int strncasecmp __P ((__const char *__s1, __const char *__s2,
extern char *strsignal __P ((int __sig));
/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */
+extern char *__stpcpy __P ((char *__dest, __const char *__src));
extern char *stpcpy __P ((char *__dest, __const char *__src));
/* Copy no more than N characters of SRC to DEST, returning the address of
the last character written into DEST. */
+extern char *__stpncpy __P ((char *__dest, __const char *__src, size_t __n));
extern char *stpncpy __P ((char *__dest, __const char *__src, size_t __n));
-#ifdef __OPTIMIZE__
-#define stpncpy(dest, src, n) __stpncpy ((dest), (src), (n))
-#endif
-
/* Sautee STRING briskly. */
extern char *strfry __P ((char *__string));