1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
* 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.
This commit is contained in:
Ulrich Drepper
2003-10-27 04:05:04 +00:00
parent 5a4b5076f1
commit a14f121d3e
4 changed files with 46 additions and 5 deletions

View File

@ -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