Changeset 839 in MondoRescue for trunk/mondo/src/common/libmondo-files.c

Timestamp:

Sep 26, 2006, 9:47:32 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r814:838 $SVN_M/branches/stable

File:

• trunk/mondo/src/common/libmondo-files.c (modified) (1 diff)

trunk/mondo/src/common/libmondo-files.c

@@ -772 +772 @@
 
     asprintf(&command, "du -sk %s", mountpt);
+    errno = 0;
     fin = popen(command, "r");
-    paranoid_free(command);
-
-    (void) getline(&tmp, &n, 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) getline(&tmp, &n, 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');
+        }
+    }
+
+    paranoid_free(command);
     paranoid_free(tmp);
     return (llres);