* 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.

9 files changed, 47 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index a4093c9974..1e961a9672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 Wed Sep 27 00:27:25 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
+	* 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.
+
 	* sysdeps/unix/sysv/linux/Implies: Add unix/common.
 
 	* sysdeps/unix/i386/sysdep.h [HAVE_ELF] (ASM_TYPE_DIRECTIVE):
diff --git a/Makeconfig b/Makeconfig
index 07496423c6..9533b776cb 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -153,13 +153,13 @@ ifndef zonedir
 zonedir = $(datadir)/zoneinfo
 endif
 
-# Where to install the locale data files (which are machine-independent).
+# Where to install the locale and message catalog data files (which are
+# machine-independent).
 ifndef localedir
 localedir = $(datadir)/locale
 endif
 
-# Where to install the locale charmap and message catalog files (which are
-# machine-independent).
+# Where to install the locale charmap source files.
 ifndef nlsdir
 nlsdir = $(datadir)/nls
 endif
diff --git a/posix/unistd.h b/posix/unistd.h
index 846653c75c..ffd83b2b1e 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -216,6 +216,7 @@ extern int fchdir __P ((int __fd));
    an array is allocated with `malloc'; the array is SIZE
    bytes long, unless SIZE <= 0, in which case it is as
    big as necessary.  */
+extern char *__getcwd __P ((char *__buf, size_t __size));
 extern char *getcwd __P ((char *__buf, size_t __size));
 
 #ifdef	__USE_GNU
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));
 
diff --git a/sysdeps/generic/stpcpy.c b/sysdeps/generic/stpcpy.c
index dd96948c40..4dda9a1400 100644
--- a/sysdeps/generic/stpcpy.c
+++ b/sysdeps/generic/stpcpy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995 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
@@ -16,16 +16,14 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
-#include <ansidecl.h>
 #include <string.h>
 
-
 /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
 char *
-DEFUN(stpcpy, (dest, src), char *dest AND CONST char *src)
+__stpcpy (char *dest, const char *src)
 {
   register char *d = dest;
-  register CONST char *s = src;
+  register const char *s = src;
 
   do
     *d++ = *s;
@@ -33,3 +31,4 @@ DEFUN(stpcpy, (dest, src), char *dest AND CONST char *src)
   
   return d - 1;
 }
+weak_alias (__stpcpy, stpcpy)
diff --git a/sysdeps/generic/strcasecmp.c b/sysdeps/generic/strcasecmp.c
index 7ccfe5c0c5..82e1a90334 100644
--- a/sysdeps/generic/strcasecmp.c
+++ b/sysdeps/generic/strcasecmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995 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
@@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
-#include <ansidecl.h>
 #include <string.h>
 #include <ctype.h>
 
@@ -24,10 +23,10 @@ Cambridge, MA 02139, USA.  */
    greater than zero if S1 is lexiographically less than,
    equal to or greater than S2.  */
 int
-DEFUN(strcasecmp, (s1, s2), CONST char *s1 AND CONST char *s2)
+__strcasecmp (const char *s1, const char *s2)
 {
-  register CONST unsigned char *p1 = (CONST unsigned char *) s1;
-  register CONST unsigned char *p2 = (CONST unsigned char *) s2;
+  register const unsigned char *p1 = (const unsigned char *) s1;
+  register const unsigned char *p2 = (const unsigned char *) s2;
   unsigned char c1, c2;
 
   if (p1 == p2)
@@ -44,3 +43,4 @@ DEFUN(strcasecmp, (s1, s2), CONST char *s1 AND CONST char *s2)
 
   return c1 - c2;
 }
+weak_alias (__strcasecmp, strcasecmp)
diff --git a/sysdeps/mach/hurd/getcwd.c b/sysdeps/mach/hurd/getcwd.c
index c0d9bcd567..caed104bce 100644
--- a/sysdeps/mach/hurd/getcwd.c
+++ b/sysdeps/mach/hurd/getcwd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1994, 1995 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
@@ -36,7 +36,7 @@ Cambridge, MA 02139, USA.  */
    unless SIZE <= 0, in which case it is as big as necessary.  */
 
 char *
-getcwd (char *buf, size_t size)
+__getcwd (char *buf, size_t size)
 {
   error_t err;
   dev_t rootdev, thisdev;
@@ -248,3 +248,4 @@ getcwd (char *buf, size_t size)
   cleanup ();
   return NULL;
 }
+weak_alias (__getcwd, getcwd)
diff --git a/sysdeps/posix/getcwd.c b/sysdeps/posix/getcwd.c
index 7b992a9f43..11577ebdbf 100644
--- a/sysdeps/posix/getcwd.c
+++ b/sysdeps/posix/getcwd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1994, 1995 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
@@ -180,6 +180,10 @@ extern char *alloca ();
 #define	__lstat	stat
 #endif
 
+#ifndef _LIBC
+#define __getcwd getcwd
+#endif
+
 /* Get the pathname of the current working directory, and put it in SIZE
    bytes of BUF.  Returns NULL if the directory couldn't be determined or
    SIZE was too small.  If successful, returns BUF.  In GNU, if BUF is
@@ -187,7 +191,7 @@ extern char *alloca ();
    unless SIZE <= 0, in which case it is as big as necessary.  */
 
 char *
-getcwd (buf, size)
+__getcwd (buf, size)
      char *buf;
      size_t size;
 {
@@ -364,3 +368,7 @@ getcwd (buf, size)
     free ((__ptr_t) dotlist);
   return NULL;
 }
+
+#ifdef _LIBC
+weak_alias (__getcwd, getcwd)
+#endif
diff --git a/sysdeps/stub/getcwd.c b/sysdeps/stub/getcwd.c
index b6efa89e28..2aca49091e 100644
--- a/sysdeps/stub/getcwd.c
+++ b/sysdeps/stub/getcwd.c
@@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
-#include <ansidecl.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stddef.h>
@@ -29,11 +28,12 @@ Cambridge, MA 02139, USA.  */
    bytes long, unless SIZE <= 0, in which case it is as
    big as necessary.  */
 char *
-DEFUN(getcwd, (buf, size), char *buf AND size_t size)
+__getcwd (char *buf, size_t size)
 {
   errno = ENOSYS;
   return NULL;
 }
+weak_alias (__getcwd, getcwd)
 
-
+stub_warning (__getcwd)
 stub_warning (getcwd)