Changeset 816 in MondoRescue

Timestamp:

Sep 23, 2006, 10:57:13 AM (18 years ago)

Author:

andree

Message:

Evaluate errno after popen in space_occupied_by_cd() and in case of an
error create a log entry and return 0 as size.

File:

• branches/stable/mondo/mondo/common/libmondo-files.c (modified) (1 diff)

branches/stable/mondo/mondo/common/libmondo-files.c

@@ -967 +967 @@
 
     sprintf(command, "du -sk %s", mountpt);
+    errno = 0;
     fin = popen(command, "r");
-    (void) fgets(tmp, MAX_STR_LEN, fin);
-    paranoid_pclose(fin);
-    p = strchr(tmp, '\t');
-    if (p) {
-        *p = '\0';
-    }
-    for (p = tmp, llres = 0; *p != '\0'; p++) {
-        llres *= 10;
-        llres += (int) (*p - '0');
-    }
+    if (errno) {
+      log_it("popen() FAILED: command=%s, mountpt=%s, fin=%d, errno=%d, strerror=%s", command, mountpt, fin, errno, strerror(errno));
+      llres = 0;
+    } else {
+      (void) fgets(tmp, MAX_STR_LEN, fin);
+      paranoid_pclose(fin);
+      p = strchr(tmp, '\t');
+      if (p) {
+        *p = '\0';
+      }
+      for (p = tmp, llres = 0; *p != '\0'; p++) {
+        llres *= 10;
+        llres += (int) (*p - '0');
+      }
+    }
+
     return (llres);
 }