9 files changed, 29 insertions, 10 deletions
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)