Update.

	* include/sys/socket.h: Declare __libc_sa_len_internal and define
	SA_LEN macro to use it if not NOT_IN_libc.
	* sysdeps/unix/sysv/linux/sa_len.c: Use INTDEF for __libc_sa_len.

	* include/fcntl.h: Declare __open_internal and define __open and
	__libc_open macros if not NOT_IN_libc.
	* sysdeps/generic/open.c: Use INTDEF for __open.
	* sysdeps/mach/hurd/open.c: Likewise.
	* sysdeps/unix/sysv/aix/open.c: Likewise.
	* sysdeps/unix/syscalls.list: Add __open_internal alias.

	* sysdeps/generic/check_fds.c: Make sure newly opened file descriptor
	has correct number.

	* include/fcntl.h: Define __libc_fcntl macro if not NOT_IN_libc.
	* sysdeps/mach/hurd/fcntl.c: Undefine __libc_fcntl as well.
	* sysdeps/unix/sysv/aix/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise.

	* include/wctype.h: Declare __iswalpha_l_internal,
	__iswdigit_l_internal, __iswspace_l_internal,
	__iswxdigit_l_internal, and __iswctype_internal.  Define
	__iswalpha_l, __iswctype, __iswdigit_l, __iswspace_l, and
	__iswxdigit_l macros if not NOT_IN_libc.
	* wctype/iswctype.c: Use INTDEF for __iswctype.
	* wctype/wcfuncs_l.c: Use INTDEF for all __iswXXX_l.

15 files changed, 99 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 9715bdf5f3..5590b53f01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,32 @@
 2002-04-14  Ulrich Drepper  <drepper@redhat.com>
 
+	* include/sys/socket.h: Declare __libc_sa_len_internal and define
+	SA_LEN macro to use it if not NOT_IN_libc.
+	* sysdeps/unix/sysv/linux/sa_len.c: Use INTDEF for __libc_sa_len.
+
+	* include/fcntl.h: Declare __open_internal and define __open and
+	__libc_open macros if not NOT_IN_libc.
+	* sysdeps/generic/open.c: Use INTDEF for __open.
+	* sysdeps/mach/hurd/open.c: Likewise.
+	* sysdeps/unix/sysv/aix/open.c: Likewise.
+	* sysdeps/unix/syscalls.list: Add __open_internal alias.
+
+	* sysdeps/generic/check_fds.c: Make sure newly opened file descriptor
+	has correct number.
+
+	* include/fcntl.h: Define __libc_fcntl macro if not NOT_IN_libc.
+	* sysdeps/mach/hurd/fcntl.c: Undefine __libc_fcntl as well.
+	* sysdeps/unix/sysv/aix/fcntl.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise.
+
+	* include/wctype.h: Declare __iswalpha_l_internal,
+	__iswdigit_l_internal, __iswspace_l_internal,
+	__iswxdigit_l_internal, and __iswctype_internal.  Define
+	__iswalpha_l, __iswctype, __iswdigit_l, __iswspace_l, and
+	__iswxdigit_l macros if not NOT_IN_libc.
+	* wctype/iswctype.c: Use INTDEF for __iswctype.
+	* wctype/wcfuncs_l.c: Use INTDEF for all __iswXXX_l.
+
 	* include/math.h: Declare __isinf_internal, __isinfl_internal,
 	__isnan_internal, and __isnanl_internal.
 	* stdio-common/printf_fp.c: Use INTUSE for calls to __isinf, __isinfl,
diff --git a/include/fcntl.h b/include/fcntl.h
index 7ac5febbf2..f14baf7ae5 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -7,11 +7,19 @@ extern int __libc_open64 (const char *file, int oflag, ...);
 extern int __libc_open (const char *file, int oflag, ...);
 extern int __libc_fcntl (int fd, int cmd, ...);
 extern int __open (__const char *__file, int __oflag, ...);
+extern int __open_internal (__const char *__file, int __oflag, ...)
+     attribute_hidden;
 extern int __fcntl (int __fd, int __cmd, ...);
-extern int __fcntl_internal (int __fd, int __cmd, ...);
+extern int __fcntl_internal (int __fd, int __cmd, ...) attribute_hidden;
 
 #ifndef NOT_IN_libc
 # define __fcntl(fd, cmd, args...) INTUSE(__fcntl) (fd, cmd, ##args)
+# define __open(file, oflag, args...) INTUSE(__open) (file, oflag, ##args)
+# ifdef SHARED
+#  define __libc_fcntl(fd, cmd, args...) __fcntl_internal (fd, cmd, ##args)
+#  define __libc_open(file, oflag, args...) \
+  __open_internal (file, oflag, ##args)
+# endif
 #endif
 
 #endif
diff --git a/include/sys/socket.h b/include/sys/socket.h
index c09eac488f..5a8169ffc8 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -34,8 +34,13 @@ extern int __connect_internal (int __fd, __CONST_SOCKADDR_ARG __addr,
 #ifdef _HAVE_SA_LEN
 # define SA_LEN(_x)      (_x)->sa_len
 #else
-# define SA_LEN(_x)      __libc_sa_len((_x)->sa_family)
-extern int __libc_sa_len (sa_family_t __af) __THROW;
+extern int __libc_sa_len (sa_family_t __af);
+extern int __libc_sa_len_internal (sa_family_t __af) attribute_hidden;
+# ifndef NOT_IN_libc
+#  define SA_LEN(_x)      INTUSE(__libc_sa_len)((_x)->sa_family)
+# else
+#  define SA_LEN(_x)      __libc_sa_len((_x)->sa_family)
+# endif
 #endif
 
 
diff --git a/include/wctype.h b/include/wctype.h
index 2a944915a5..92fc849f95 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -3,10 +3,26 @@
 #include <wctype/wctype.h>
 
 /* Internal interfaces.  */
+extern int __iswalpha_l_internal (wint_t __wc, __locale_t __locale)
+     attribute_hidden;
+extern int __iswdigit_l_internal (wint_t __wc, __locale_t __locale)
+     attribute_hidden;
+extern int __iswspace_l_internal (wint_t __wc, __locale_t __locale)
+     attribute_hidden;
+extern int __iswxdigit_l_internal (wint_t __wc, __locale_t __locale)
+     attribute_hidden;
 extern int __iswspace (wint_t __wc);
 extern int __iswctype (wint_t __wc, wctype_t __desc);
+extern int __iswctype_internal (wint_t __wc, wctype_t __desc) attribute_hidden;
 extern wctype_t __wctype (__const char *__property);
 extern wint_t __towctrans (wint_t __wc, wctrans_t __desc);
 
+#ifndef NOT_IN_libc
+# define __iswalpha_l(wc, loc) INTUSE(__iswalpha_l) (wc, loc)
+# define __iswctype(wc, desc) INTUSE(__iswctype) (wc, desc)
+# define __iswdigit_l(wc, loc) INTUSE(__iswdigit_l) (wc, loc)
+# define __iswspace_l(wc, loc) INTUSE(__iswspace_l) (wc, loc)
+# define __iswxdigit_l(wc, loc) INTUSE(__iswxdigit_l) (wc, loc)
+#endif
 
 #endif
diff --git a/sysdeps/generic/check_fds.c b/sysdeps/generic/check_fds.c
index 083b72de16..ff9562de08 100644
--- a/sysdeps/generic/check_fds.c
+++ b/sysdeps/generic/check_fds.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2002 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
@@ -50,9 +50,13 @@ check_one_fd (int fd, int mode)
       int nullfd = __libc_open (_PATH_DEVNULL, mode);
       /* We are very paranoid here.  With all means we try to ensure
 	 that we are actually opening the /dev/null device and nothing
-	 else.  */
-      if (__builtin_expect (nullfd, 0) == -1
-	  || __builtin_expect (__fxstat64 (_STAT_VER, nullfd, &st), 0) != 0
+	 else.
+
+	 Note that the following code assumes that STDIN_FILENO,
+	 STDOUT_FILENO, STDERR_FILENO are the three lowest file
+	 decsriptor numbers, in this order.  */
+      if (__builtin_expect (nullfd != fd, 0)
+	  || __builtin_expect (__fxstat64 (_STAT_VER, fd, &st), 0) != 0
 	  || __builtin_expect (S_ISCHR (st.st_mode), 1) == 0
 #if defined DEV_NULL_MAJOR && defined DEV_NULL_MINOR
 	  || st.st_rdev != makedev (DEV_NULL_MAJOR, DEV_NULL_MINOR)
@@ -72,7 +76,7 @@ __libc_check_standard_fds (void)
 {
   /* This is really paranoid but some people actually are.  If /dev/null
      should happen to be a symlink to somewhere else and not the device
-     commonly known as "/dev/null" be bail out.  We can detect this with
+     commonly known as "/dev/null" we bail out.  We can detect this with
      the O_NOFOLLOW flag for open() but only on some system.  */
 #ifndef O_NOFOLLOW
 # define O_NOFOLLOW	0
diff --git a/sysdeps/generic/open.c b/sysdeps/generic/open.c
index f4778b905a..c9ea902447 100644
--- a/sysdeps/generic/open.c
+++ b/sysdeps/generic/open.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 2002 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
@@ -21,6 +21,8 @@
 #include <stdarg.h>
 #include <stddef.h>
 
+#undef __open
+
 /* Open FILE with access OFLAG.  If OFLAG includes O_CREAT,
    a third argument is the file protection.  */
 int
@@ -49,5 +51,6 @@ __open (file, oflag)
 }
 stub_warning (open)
 
+INTDEF(__open)
 weak_alias (__open, open)
 #include <stub-tag.h>
diff --git a/sysdeps/mach/hurd/fcntl.c b/sysdeps/mach/hurd/fcntl.c
index 9c03b3cbc2..15aa3ae6af 100644
--- a/sysdeps/mach/hurd/fcntl.c
+++ b/sysdeps/mach/hurd/fcntl.c
@@ -23,6 +23,7 @@
 #include <stdarg.h>
 #include <sys/file.h>		/* XXX for LOCK_* */
 
+#undef __libc_fcntl
 #undef __fcntl
 
 
diff --git a/sysdeps/mach/hurd/open.c b/sysdeps/mach/hurd/open.c
index 01efe73cbf..3ca9a72c84 100644
--- a/sysdeps/mach/hurd/open.c
+++ b/sysdeps/mach/hurd/open.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,93,94,95,97,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1992,93,94,95,97,2000,2002 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
@@ -22,6 +22,9 @@
 #include <hurd.h>
 #include <hurd/fd.h>
 
+#undef __libc_open
+#undef __open
+
 /* Open FILE with access OFLAG.  If OFLAG includes O_CREAT,
    a third argument is the file protection.  */
 int
@@ -47,5 +50,6 @@ __libc_open (const char *file, int oflag, ...)
   return _hurd_intern_fd (port, oflag, 1);
 }
 
+INTDEF2(__libc_open, __open)
 weak_alias (__libc_open, __open)
 weak_alias (__libc_open, open)
diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
index d6392be61f..d922cbbe75 100644
--- a/sysdeps/unix/syscalls.list
+++ b/sysdeps/unix/syscalls.list
@@ -26,7 +26,7 @@ kill		-	kill		i:ii	__kill		kill
 link		-	link		i:ss	__link		link
 lseek		-	lseek		i:iii	__libc_lseek	__lseek lseek
 mkdir		-	mkdir		i:si	__mkdir		mkdir
-open		-	open		i:siv	__libc_open	__open open
+open		-	open		i:siv	__libc_open	__open open __open_internal
 profil		-	profil		i:piii	profil
 ptrace		-	ptrace		i:iiii	ptrace
 read		-	read		i:ibn	__libc_read	__read read
diff --git a/sysdeps/unix/sysv/aix/fcntl.c b/sysdeps/unix/sysv/aix/fcntl.c
index 43f21b6e58..f9bb42a766 100644
--- a/sysdeps/unix/sysv/aix/fcntl.c
+++ b/sysdeps/unix/sysv/aix/fcntl.c
@@ -19,6 +19,7 @@
 #include <fcntl.h>
 #include <stdarg.h>
 
+#undef __libc_fcntl
 #undef __fcntl
 
 extern int kfcntl (int fdes, int cmd, unsigned long int arg);
diff --git a/sysdeps/unix/sysv/aix/open.c b/sysdeps/unix/sysv/aix/open.c
index 4116c4ebdc..c41c708564 100644
--- a/sysdeps/unix/sysv/aix/open.c
+++ b/sysdeps/unix/sysv/aix/open.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2002 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
@@ -20,6 +20,9 @@
 #include <stdarg.h>
 #include <unistd.h>
 
+#undef __libc_open
+#undef __open
+
 int
 __open (const char *file, int oflag, ...)
 {
@@ -36,3 +39,4 @@ __open (const char *file, int oflag, ...)
   return open (file, oflag, mode);
 }
 strong_alias (__open, __libc_open)
+INTDEF(__open)
diff --git a/sysdeps/unix/sysv/linux/i386/fcntl.c b/sysdeps/unix/sysv/linux/i386/fcntl.c
index 3c013cc962..3af0fb5f36 100644
--- a/sysdeps/unix/sysv/linux/i386/fcntl.c
+++ b/sysdeps/unix/sysv/linux/i386/fcntl.c
@@ -25,6 +25,7 @@
 #include <sys/syscall.h>
 #include "../kernel-features.h"
 
+#undef __libc_fcntl
 #undef __fcntl
 
 extern int __syscall_fcntl (int __fd, int __cmd, ...);
diff --git a/sysdeps/unix/sysv/linux/sa_len.c b/sysdeps/unix/sysv/linux/sa_len.c
index b18919f30a..ae5616bf45 100644
--- a/sysdeps/unix/sysv/linux/sa_len.c
+++ b/sysdeps/unix/sysv/linux/sa_len.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2002 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
@@ -56,3 +56,4 @@ __libc_sa_len (sa_family_t af)
     }
   return 0;
 }
+INTDEF(__libc_sa_len)
diff --git a/wctype/iswctype.c b/wctype/iswctype.c
index 68db36b603..9a13861a8b 100644
--- a/wctype/iswctype.c
+++ b/wctype/iswctype.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
 
@@ -22,6 +22,7 @@
 
 #include "wchar-lookup.h"
 
+#undef __iswctype
 
 int
 __iswctype (wint_t wc, wctype_t desc)
@@ -33,4 +34,5 @@ __iswctype (wint_t wc, wctype_t desc)
 
   return wctype_table_lookup ((const char *) desc, wc);
 }
+INTDEF(__iswctype)
 weak_alias (__iswctype, iswctype)
diff --git a/wctype/wcfuncs_l.c b/wctype/wcfuncs_l.c
index a6fd3111b8..ff85b9814c 100644
--- a/wctype/wcfuncs_l.c
+++ b/wctype/wcfuncs_l.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 2000, 2001, 2002 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
@@ -24,6 +24,11 @@
 #define USE_IN_EXTENDED_LOCALE_MODEL
 #include "wchar-lookup.h"
 
+#undef __iswalpha_l
+#undef __iswdigit_l
+#undef __iswspace_l
+#undef __iswxdigit_l
+
 /* Provide real-function versions of all the wctype macros.  */
 
 #define	func(name, type) \
@@ -32,7 +37,8 @@
     size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_CLASS_OFFSET)].word + type; \
     const char *desc = locale->__locales[LC_CTYPE]->values[i].string;	      \
     return wctype_table_lookup (desc, wc);				      \
-  }
+  }									      \
+  INTDEF(name)
 
 func (__iswalnum_l, __ISwalnum)
 func (__iswalpha_l, __ISwalpha)