Update.

	* io/Makefile (tests): Add test-stat2.
	(test-stat2-ARS): New variable.
	* io/test-stat2.c: New file.

3 files changed, 96 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 95d452b49b..fca2d03c32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-10-28  Ulrich Drepper  <drepper@redhat.com>
 
+	* io/Makefile (tests): Add test-stat2.
+	(test-stat2-ARS): New variable.
+	* io/test-stat2.c: New file.
+
 	* Makeconfig (ETAGS): Remove -T flag.
 
 	* elf/dl-load.c (open_verify): Only try to load ET_DYN and ET_EXEC
diff --git a/io/Makefile b/io/Makefile
index 0d528cc1a5..bec1549da5 100644
--- a/io/Makefile
+++ b/io/Makefile
@@ -55,7 +55,8 @@ static-only-routines = stat fstat lstat mknod stat64 fstat64 lstat64
 
 others		:= pwd
 test-srcs	:= ftwtest
-tests		:= test-utime test-stat test-lfs tst-getcwd tst-fcntl
+tests		:= test-utime test-stat test-stat2 test-lfs tst-getcwd \
+		   tst-fcntl
 
 distribute	:= ftwtest-sh
 
@@ -65,6 +66,8 @@ CFLAGS-fts.c = -Wno-uninitialized
 CFLAGS-test-stat.c = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
 CFLAGS-test-lfs.c = -D_LARGEFILE64_SOURCE
 
+test-stat2-ARGS = Makefile . $(objpfx)test-stat2
+
 ifeq ($(cross-compiling),no)
 tests: $(objpfx)ftwtest.out
 
diff --git a/io/test-stat2.c b/io/test-stat2.c
new file mode 100644
index 0000000000..e979b52c23
--- /dev/null
+++ b/io/test-stat2.c
@@ -0,0 +1,88 @@
+/* Test consistence of results of stat and stat64.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
+
+   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.  */
+
+#include <errno.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/stat.h>
+
+int
+main (int argc, char *argv[])
+{
+  int i;
+  int result = 0;
+
+  for (i = 1; i < argc; ++i)
+    {
+      struct stat st;
+      struct stat64 st64;
+      int same;
+
+      if (stat (argv[i], &st) != 0)
+	{
+	  if (errno != EOVERFLOW)
+	    {
+	      /* Something is wrong.  */
+	      printf ("stat(\"%s\",....) failed: %m", argv[i]);
+	      result = 1;
+	    }
+	  continue;
+	}
+
+      if (stat64 (argv[i], &st64) != 0)
+	{
+	  if (errno != ENOSYS)
+	    {
+	      /* Something is wrong.  */
+	      printf ("stat64(\"%s\",....) failed: %m", argv[i]);
+	      result = 1;
+	    }
+	  continue;
+	}
+
+      printf ("\nName: %s\n", argv[i]);
+
+#define TEST(name) \
+      same = st.name == st64.name;					      \
+      printf (#name ": %jd vs %jd  %s\n",				      \
+	      (intmax_t) st.name, (intmax_t) st64.name,			      \
+	      same ? "OK" : "FAIL");					      \
+      result |= ! same
+
+      TEST (st_dev);
+      TEST (st_ino);
+      TEST (st_mode);
+      TEST (st_nlink);
+      TEST (st_uid);
+      TEST (st_gid);
+#ifdef _STATBUF_ST_RDEV
+      TEST (st_rdev);
+#endif
+#ifdef _STATBUF_ST_BLKSIZE
+      TEST (st_blksize);
+#endif
+      TEST (st_blocks);
+      TEST (st_atime);
+      TEST (st_mtime);
+      TEST (st_ctime);
+    }
+
+  return result;
+}