1 files changed, 18 insertions, 56 deletions

diff --git a/sysdeps/unix/sysv/linux/lxstat.c b/sysdeps/unix/sysv/linux/lxstat.c
index 11c9038646..7fbe14e138 100644
--- a/sysdeps/unix/sysv/linux/lxstat.c
+++ b/sysdeps/unix/sysv/linux/lxstat.c
@@ -1,4 +1,4 @@
-/* lxstat using old-style Unix fstat system call.
+/* lxstat using old-style Unix lstat system call.
    Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -17,12 +17,17 @@
    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 <xstatconv.c>
+
 extern int __syscall_lstat (const char *, struct kernel_stat *);
 
 /* Get information about the file NAME in BUF.  */
@@ -32,61 +37,18 @@ __lxstat (int vers, const char *name, struct stat *buf)
   struct kernel_stat kbuf;
   int result;
 
-  switch (vers)
-    {
-    case _STAT_VER_LINUX_OLD:
-      /* Nothing to do.  The struct is in the form the kernel expects
-	 it to be.  */
-      result = __syscall_lstat (name, (struct kernel_stat *) buf);
-      break;
-
-    case _STAT_VER_LINUX:
-      /* Do the system call.  */
-      result = __syscall_lstat (name, &kbuf);
-
-      /* Convert to current kernel version of `struct stat'.  */
-      buf->st_dev = kbuf.st_dev;
-#ifdef _HAVE___PAD1
-      buf->__pad1 = 0;
-#endif
-      buf->st_ino = kbuf.st_ino;
-      buf->st_mode = kbuf.st_mode;
-      buf->st_nlink = kbuf.st_nlink;
-      buf->st_uid = kbuf.st_uid;
-      buf->st_gid = kbuf.st_gid;
-      buf->st_rdev = kbuf.st_rdev;
-#ifdef _HAVE___PAD2
-      buf->__pad2 = 0;
-#endif
-      buf->st_size = kbuf.st_size;
-      buf->st_blksize = kbuf.st_blksize;
-      buf->st_blocks = kbuf.st_blocks;
-      buf->st_atime = kbuf.st_atime;
-#ifdef _HAVE___UNUSED1
-      buf->__unused1 = 0;
-#endif
-      buf->st_mtime = kbuf.st_mtime;
-#ifdef _HAVE___UNUSED2
-      buf->__unused2 = 0;
-#endif
-      buf->st_ctime = kbuf.st_ctime;
-#ifdef _HAVE___UNUSED3
-      buf->__unused3 = 0;
-#endif
-#ifdef _HAVE___UNUSED4
-      buf->__unused4 = 0;
-#endif
-#ifdef _HAVE___UNUSED5
-      buf->__unused5 = 0;
-#endif
-      break;
+  if (vers == _STAT_VER_KERNEL)
+    return __syscall_lstat (name, (struct kernel_stat *) buf);
 
-    default:
-      __set_errno (EINVAL);
-      result = -1;
-      break;
-    }
+  result =  __syscall_lstat (name, &kbuf);
+  if (result == 0)
+    result = xstat_conv (vers, &kbuf, buf);
 
   return result;
 }
-weak_alias (__lxstat, _lxstat)
+
+weak_alias (__lxstat, _lxstat);
+#ifdef XSTAT_IS_XSTAT64
+#undef __lxstat64
+strong_alias (__lxstat, __lxstat64);
+#endif