diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-10-27 04:05:04 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-10-27 04:05:04 +0000 |
| commit | a14f121d3edf326ffef2f3dea5d9adfe673cba81 (patch) | |
| tree | 7116ec85a61c1c0c83f9db632817f69716351c33 | |
| parent | 5a4b5076f1e002ebb43ccbab7d84dfa76d96146e (diff) | |
| download | glibc-a14f121d3edf326ffef2f3dea5d9adfe673cba81.tar.gz glibc-a14f121d3edf326ffef2f3dea5d9adfe673cba81.tar.xz glibc-a14f121d3edf326ffef2f3dea5d9adfe673cba81.zip | |
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | io/Makefile | 4 | ||||
| -rw-r--r-- | io/tst-statvfs.c | 30 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/internal_statvfs.c | 12 |
4 files changed, 46 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 04bc03bc2b..14d5e31587 100644 --- 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 24ead888b2..14358ec93f 100644 --- 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 index 0000000000..227c62d7da --- /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 172113d496..b2d882ece1 100644 --- 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 |