Update.

	* sysdeps/unix/sysv/linux/internal_statvfs.c (__internal_statvfs):
	Avoid infinite loops in case the mounts file is hosed.
	* io/Makefile: Add rules to build and run tst-statvfs.
	* io/tst-statvfs.c: New file.

diff --git a/ChangeLog b/ChangeLog
index 04bc03b..14d5e31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-10-26  Ulrich Drepper  <drepper@redhat.com>
 
+       * sysdeps/unix/sysv/linux/internal_statvfs.c (__internal_statvfs):
+       Avoid infinite loops in case the mounts file is hosed.
+       * io/Makefile: Add rules to build and run tst-statvfs.
+       * io/tst-statvfs.c: New file.
+
        * include/dlfcn.h (__RTLD_OPENEXEC): Define.
        * elf/dl-load.c (_dl_map_object_from_fd): Don't allow loading
        executables unless __RTLD_OPENEXEC flag is present.

diff --git a/io/Makefile b/io/Makefile
index 24ead88..14358ec 100644 (file)
--- a/io/Makefile
+++ b/io/Makefile
@@ -57,7 +57,7 @@ static-only-routines = stat fstat lstat mknod stat64 fstat64 lstat64
 others         := pwd
 test-srcs      := ftwtest
 tests          := test-utime test-stat test-stat2 test-lfs tst-getcwd \
-                  tst-fcntl bug-ftw1 bug-ftw2 bug-ftw3
+                  tst-fcntl bug-ftw1 bug-ftw2 bug-ftw3 tst-statvfs
 
 distribute     := ftwtest-sh
 
@@ -92,6 +92,8 @@ endif
 
 test-stat2-ARGS = Makefile . $(objpfx)test-stat2
 
+tst-statvfs-ARGS = $(objpfx)tst-statvfs tst-statvfs.c /tmp
+
 ifeq ($(cross-compiling),no)
 tests: $(objpfx)ftwtest.out
 

diff --git a/io/tst-statvfs.c b/io/tst-statvfs.c
new file mode 100644 (file)
index 0000000..227c62d
--- /dev/null
+++ b/io/tst-statvfs.c
@@ -0,0 +1,30 @@
+#include <stdio.h>
+#include <sys/statvfs.h>
+
+
+/* This test cannot detect many errors.  But it will fail if the
+   statvfs is completely hosed and it'll detect a missing export.  So
+   it is better than nothing.  */
+static int
+do_test (int argc, char *argv[])
+{
+  for (int i = 1; i < argc; ++i)
+    {
+      struct statvfs st;
+      if (statvfs (argv[i], &st) != 0)
+        printf ("%s: failed (%m)\n", argv[i]);
+      else
+        printf ("%s: free: %llu, mandatory: %s\n", argv[i],
+                (unsigned long long int) st.f_bfree,
+#ifdef ST_MANDLOCK
+                (st.f_flag & ST_MANDLOCK) ? "yes" : "no"
+#else
+                "no"
+#endif
+                );
+    }
+  return 0;
+}
+
+#define TEST_FUNCTION do_test (argc, argv)
+#include "../test-skeleton.c"

diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.c
index 172113d..b2d882e 100644 (file)
--- a/sysdeps/unix/sysv/linux/internal_statvfs.c
+++ b/sysdeps/unix/sysv/linux/internal_statvfs.c
@@ -17,6 +17,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <assert.h>
 #include <errno.h>
 #include <mntent.h>
 #include <paths.h>
@@ -167,14 +168,17 @@ __internal_statvfs (const char *name, struct statvfs *buf,
             statvfs call got a name which was not the mount point.
             Check again, this time without checking for name matches
             first.  */
-         if (! success)
+         if (! success && (name != NULL || fsname != NULL))
            {
              if (name != NULL)
                /* Try without a mount point name.  */
                name = NULL;
-             else if (fsname != NULL)
-               /* Try without a filesystem name.  */
-               fsname = fsname2 = NULL;
+             else
+               {
+                 /* Try without a filesystem name.  */
+                 assert (fsname != NULL);
+                 fsname = fsname2 = NULL;
+               }
 
              /* It is not strictly allowed to use rewind here.  But
                 this code is part of the implementation so it is