X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffsusage.c;h=82bdd19702d083307fcaa12fbda1908b5acbcd52;hb=8e8fe8777e71f90eeec25ac267d800150ec34870;hp=e0aec2a88142483dfbd7bf7794fac6658c54558d;hpb=535ad0d12391ae61b91cb173f9b980ac1e2699b6;p=gnulib.git diff --git a/lib/fsusage.c b/lib/fsusage.c index e0aec2a88..82bdd1970 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -59,6 +59,8 @@ int statfs (); int statvfs (); #endif +int safe_read (); + /* Return the number of TOSIZE-byte blocks used by BLOCKS FROMSIZE-byte blocks, rounding away from zero. TOSIZE must be positive. Return -1 if FROMSIZE is not positive. */ @@ -124,7 +126,7 @@ get_fs_usage (path, disk, fsp) if (fd < 0) return -1; lseek (fd, (long) SUPERBOFF, 0); - if (read (fd, (char *) &fsd, sizeof fsd) != sizeof fsd) + if (safe_read (fd, (char *) &fsd, sizeof fsd) != sizeof fsd) { close (fd); return -1; @@ -206,7 +208,7 @@ statfs (path, fsb) struct stat stats; struct dustat fsd; - if (SAFE_STAT (path, &stats)) + if (stat (path, &stats)) return -1; if (dustat (stats.st_dev, 0, &fsd, sizeof (fsd))) return -1;