Update.

2000-01-18  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/i386/lxstat.c: New file, handles 32bit UIDs.
	* sysdeps/unix/sysv/linux/i386/fxstat.c: Likewise.
	* sysdeps/unix/sysv/linux/i386/xstat.c (__xstat): Move
	_STAT_VER_KERNEL handling up; don't save errno.
	* sysdeps/unix/sysv/linux/arm/fxstat.c: New file.
	* sysdeps/unix/sysv/linux/arm/lxstat.c: Likewise.
	* sysdeps/unix/sysv/linux/arm/xstat.c: Likewise.
	* sysdeps/unix/sysv/linux/m68k/fxstat.c: Likewise.
	* sysdeps/unix/sysv/linux/m68k/lxstat.c: Likewise.
	* sysdeps/unix/sysv/linux/m68k/xstat.c: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/fxstat.c: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/lxstat.c: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c: Likewise.

	Reported by Bruno Haible.

3 files changed, 194 insertions, 12 deletions

diff --git a/sysdeps/unix/sysv/linux/i386/fxstat.c b/sysdeps/unix/sysv/linux/i386/fxstat.c
new file mode 100644
index 0000000000..192325e6b0
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/i386/fxstat.c
@@ -0,0 +1,93 @@
+/* fxstat using old-style Unix fstat system call.
+   Copyright (C) 1991,95,96,97,98,2000 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* Ho hum, if xstat == xstat64 we must get rid of the prototype or gcc
+   will complain since they don't strictly match.  */
+#define __fxstat64 __fxstat64_disable
+
+#include <errno.h>
+#include <stddef.h>
+#include <sys/stat.h>
+#include <kernel_stat.h>
+
+#include <sysdep.h>
+#include <sys/syscall.h>
+
+#include <xstatconv.c>
+
+extern int __syscall_fstat (int, struct kernel_stat *);
+
+#ifdef __NR_stat64
+extern int __syscall_fstat64 (int, struct stat64 *);
+# if  __ASSUME_STAT64_SYSCALL == 0
+/* The variable is shared between all wrappers around *stat64 calls.  */
+extern int __have_no_stat64;
+# endif
+#endif
+
+/* Get information about the file FD in BUF.  */
+int
+__fxstat (int vers, int fd, struct stat *buf)
+{
+  struct kernel_stat kbuf;
+  int result;
+
+  if (vers == _STAT_VER_KERNEL)
+    {
+      return INLINE_SYSCALL (fstat, 2, fd, (struct kernel_stat *) buf);
+    }
+#if __ASSUME_STAT64_SYSCALL > 0
+  result = INLINE_SYSCALL (fstat64, 2, name, &buf64);
+  if (result == 0)
+    result = xstat32_conv (vers, &buf64, buf);
+  return result;
+#else
+
+# if defined __NR_stat64
+  /* To support 32 bit UIDs, we have to use stat64.  The normal stat call only returns
+     16 bit UIDs.  */
+  if (! __have_no_stat64)
+    {
+      struct stat64 buf64;
+
+      result = INLINE_SYSCALL (fstat64, 2, name, &buf64);
+
+      if (result == 0)
+	result = xstat32_conv (vers, &buf64, buf);
+      
+      if (result != -1 || errno != ENOSYS)
+	return result;
+
+      __have_no_stat64 = 1;
+    }
+# endif  
+
+  result = INLINE_SYSCALL (fstat, 2, fd, &kbuf);
+  if (result == 0)
+    result = xstat_conv (vers, &kbuf, buf);
+
+  return result;
+#endif  /* __ASSUME_STAT64_SYSCALL  */
+}
+
+weak_alias (__fxstat, _fxstat);
+#ifdef XSTAT_IS_XSTAT64
+#undef __fxstat64
+strong_alias (__fxstat, __fxstat64);
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/lxstat.c b/sysdeps/unix/sysv/linux/i386/lxstat.c
new file mode 100644
index 0000000000..fa5b463362
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/i386/lxstat.c
@@ -0,0 +1,94 @@
+/* lxstat using old-style Unix lstat system call.
+   Copyright (C) 1991,95,96,97,98,2000 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* Ho hum, if xstat == xstat64 we must get rid of the prototype or gcc
+   will complain since they don't strictly match.  */
+#define __lxstat64 __lxstat64_disable
+
+#include <errno.h>
+#include <stddef.h>
+#include <sys/stat.h>
+#include <kernel_stat.h>
+
+#include <sysdep.h>
+#include <sys/syscall.h>
+
+#include <xstatconv.c>
+
+extern int __syscall_lstat (const char *, struct kernel_stat *);
+
+#ifdef __NR_stat64
+extern int __syscall_lstat64 (const char *, struct stat64 *);
+# if  __ASSUME_STAT64_SYSCALL == 0
+/* The variable is shared between all wrappers around *stat64 calls.  */
+extern int __have_no_stat64;
+# endif
+#endif
+
+
+/* Get information about the file NAME in BUF.  */
+int
+__lxstat (int vers, const char *name, struct stat *buf)
+{
+  struct kernel_stat kbuf;
+  int result;
+
+  if (vers == _STAT_VER_KERNEL)
+    {
+      return INLINE_SYSCALL (lstat, 2, name, (struct kernel_stat *) buf);
+    }
+
+#if __ASSUME_STAT64_SYSCALL > 0
+  result = INLINE_SYSCALL (lstat64, 2, name, &buf64);
+  if (result == 0)
+    result = xstat32_conv (vers, &buf64, buf);
+  return result;
+#else
+
+# if defined __NR_stat64
+  /* To support 32 bit UIDs, we have to use stat64.  The normal stat call only returns
+     16 bit UIDs.  */
+  if (! __have_no_stat64)
+    {
+      struct stat64 buf64;
+      result = INLINE_SYSCALL (lstat64, 2, name, &buf64);
+
+      if (result == 0)
+	result = xstat32_conv (vers, &buf64, buf);
+
+      if (result != -1 || errno != ENOSYS)
+	return result;
+
+      __have_no_stat64 = 1;
+    }
+# endif  
+  
+  result = INLINE_SYSCALL (lstat, 2, name, &kbuf);
+  if (result == 0)
+    result = xstat_conv (vers, &kbuf, buf);
+
+  return result;
+#endif
+}
+
+weak_alias (__lxstat, _lxstat);
+#ifdef XSTAT_IS_XSTAT64
+#undef __lxstat64
+strong_alias (__lxstat, __lxstat64);
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/xstat.c b/sysdeps/unix/sysv/linux/i386/xstat.c
index 2e6eb3ee0a..c879960a58 100644
--- a/sysdeps/unix/sysv/linux/i386/xstat.c
+++ b/sysdeps/unix/sysv/linux/i386/xstat.c
@@ -46,39 +46,34 @@ extern int __have_no_stat64;
 int
 __xstat (int vers, const char *name, struct stat *buf)
 {
-#if __ASSUME_STAT64_SYSCALL > 0
   struct kernel_stat kbuf;
   int result;
 
+  if (vers == _STAT_VER_KERNEL)
+    {
+      return INLINE_SYSCALL (stat, 2, name, (struct kernel_stat *) buf);
+    }
+#if __ASSUME_STAT64_SYSCALL > 0
   result = INLINE_SYSCALL (stat64, 2, name, &buf64);
   if (result == 0)
     result = xstat32_conv (vers, &buf64, buf);
   return result;
 #else
-  struct kernel_stat kbuf;
-  int result;
-
-  if (vers == _STAT_VER_KERNEL)
-    {
-      return INLINE_SYSCALL (stat, 2, name, (struct kernel_stat *) buf);
-    }
 # if defined __NR_stat64
   /* To support 32 bit UIDs, we have to use stat64.  The normal stat call only returns
      16 bit UIDs.  */
   if (! __have_no_stat64)
     {
       struct stat64 buf64;
-      
-      int saved_errno = errno;
+
       result = INLINE_SYSCALL (stat64, 2, name, &buf64);
 
       if (result == 0)
 	result = xstat32_conv (vers, &buf64, buf);
-      
+
       if (result != -1 || errno != ENOSYS)
 	return result;
 
-      __set_errno (saved_errno);
       __have_no_stat64 = 1;
     }
 # endif