Changeset 68 in MondoRescue for trunk/mondo/mondo/common

Timestamp:

Oct 17, 2005, 2:37:16 PM (19 years ago)

Author:

andree

Message:

At the end of function run_program_and_log_to_screen, paranoid_pclose is
used to close the process stream. This means - as we don't evaluate the
exit code of the called program - that mondoarchive will happily
continue even if mondo has failed. Only later will it give an error when
it tries to burn an image that miondi has actually failed to create.

The change to libmondo-fork.c.diff addresses this by using pclose
directly (rather than the paranoid_pclose macro) and by then evaluating
the status information and extracting the exit code of the called
program.

The change to libmondo-archive.c makes it so that at the end of function
call_mindi_to_supply_boot_disks popup_and_OK is called in case of an
error rather than log_to_screen. This ensures that the main error is not
drowned in a sea of other messages.

Location:

trunk/mondo/mondo/common

Files:

• libmondo-archive.c (modified) (1 diff)
• libmondo-fork.c (modified) (1 diff)

trunk/mondo/mondo/common/libmondo-archive.c

@@ -926 +926 @@
         paranoid_free(command);
         if (strlen(tmp) > 1) {
-            log_to_screen(tmp);
+            popup_and_OK(tmp);
         }
         paranoid_free(tmp);

trunk/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);