From: Jim Meyering <jim@meyering.net>
Date: Fri, 27 Jan 1995 17:20:54 +0000 (+0000)
Subject: (get_fs_usage, statfs): Use safe_read, and safe_stat rather than
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=849c4387e6e64090599a8980bb76558d242f6c9c;p=pspp

(get_fs_usage, statfs): Use safe_read, and safe_stat rather than
bare read and stat.
---

diff --git a/lib/fsusage.c b/lib/fsusage.c
index e0aec2a881..1784d4a2a4 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 (safe_stat (path, &stats))
     return -1;
   if (dustat (stats.st_dev, 0, &fsd, sizeof (fsd)))
     return -1;