Changeset 154 in MondoRescue for branches/2.05/mondo/mondo/common/libmondo-fork.c

Timestamp:

Dec 7, 2005, 12:58:15 PM (18 years ago)

Author:

andree

Message:

Evaluate errno to find out whether an external command succeeded or not
in function run_program_and_log_to_screen(). This ensures amongst other
things that we terminate if mindi fails rather than happily continuing
and throwing an incomprehensible error later down the track because no
floppy images exist.

File:

• branches/2.05/mondo/mondo/common/libmondo-fork.c (modified) (1 diff)

branches/2.05/mondo/mondo/common/libmondo-fork.c

@@ -473 +473 @@
     }
 #endif
-    paranoid_pclose(fin);
-    retval += res;
+    /* Evaluate the status returned by pclose to get the exit code of the called program. */
+    errno = 0;
+    res = pclose(fin);
+    /* Log actual pclose errors. */
+    if (errno) log_msg(5, "pclose err: %d", errno);
+    /* Check if we have a valid status. If we do, extract the called program's exit code. */
+    /* If we don't, highlight this fact by returning -1. */
+    if (WIFEXITED(res)) {
+        retval = WEXITSTATUS(res);
+    } else {
+        retval = -1;
+    }
     close_evalcall_form();
     unlink(lockfile);