X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffsusage.c;h=2c1c7f0e24b50ce6218bfd5c609d613637a20041;hb=c89f48f01f6047b50c1ed3c981901f620ec98f6a;hp=e0aec2a88142483dfbd7bf7794fac6658c54558d;hpb=535ad0d12391ae61b91cb173f9b980ac1e2699b6;p=gnulib.git diff --git a/lib/fsusage.c b/lib/fsusage.c index e0aec2a88..2c1c7f0e2 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -22,7 +22,6 @@ #include #include #include "fsusage.h" -#include "safe-stat.h" int statfs (); @@ -59,6 +58,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 +125,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 +207,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;