removed global error code, and returned the leftmost error code from …

…the command list
insidewhy · Oct 7, 2015 · e3868df · e3868df
1 parent 08fc237
commit e3868df
Showing 1 changed file with 23 additions and 15 deletions.
diff --git a/main.c b/main.c
@@ -7,24 +7,27 @@
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
+#include <limits.h>
 
 #define WAIT_FOR_PROC_DEATH_TIMEOUT 10
 #define MAX_CMDS 16
 #define SEP      "---"
 
+#undef NDEBUG
+
 // TODO: sig_atomic_t (although it is typedefd to int :P)
 // used as boolean by signal handlers to tell process it should exit
 static volatile int running = 1;
 
-static int error_code = 0;
-
-static void wait_for_requested_commands_to_exit(int n_cmds, pid_t *pids) {
+static int wait_for_requested_commands_to_exit(int n_cmds, pid_t *pids) {
   int cmds_left = n_cmds;
+  int error_code = 0;
+  int error_code_idx = INT_MAX;
 
   for (;;) {
     int status;
 
-    if (! running) return;
+    if (! running) return error_code;
     pid_t waited_pid = waitpid(-1, &status, 0);
     if (waited_pid == -1) {
       if (errno == EINTR) {
@@ -38,20 +41,23 @@ static void wait_for_requested_commands_to_exit(int n_cmds, pid_t *pids) {
 #       endif
       }
     }
-    if (! running) return;
+    if (! running) return error_code;
 
     // check for pid in list of child pids
     for (int i = 0; i < n_cmds; ++i) {
-      if (WIFEXITED(status)) {
-        int exit_status = WEXITSTATUS(status);
-#       ifndef NDEBUG
-        fprintf(stderr, "process exit with status: %d \n", exit_status);
-#       endif
-        error_code = exit_status;
-      }
 
-
       if (pids[i] == waited_pid) {
+        if (WIFEXITED(status)) {
+          int exit_status = WEXITSTATUS(status);
+#         ifndef NDEBUG
+          fprintf(stderr, "process exit with status: %d \n", exit_status);
+#         endif
+          if (exit_status != 0 && i < error_code_idx) {
+            error_code = exit_status;
+            error_code_idx = i;
+          }
+        }
+
 #       ifndef NDEBUG
         fprintf(stderr, "process exit: %d in command list, %d left\n", waited_pid, cmds_left - 1);
 #       endif
@@ -60,7 +66,7 @@ static void wait_for_requested_commands_to_exit(int n_cmds, pid_t *pids) {
 #         ifndef NDEBUG
           fprintf(stderr, "all processes exited\n");
 #         endif
-          return;
+          return error_code;
         }
         break;
       }
@@ -71,6 +77,8 @@ static void wait_for_requested_commands_to_exit(int n_cmds, pid_t *pids) {
 #     endif
     }
   }
+
+  return error_code;
 }
 
 static void wait_for_all_processes_to_exit() {
@@ -167,7 +175,7 @@ int main(int argc, char *argv[]) {
       cmds[n_cmds++] = run_proc(cmd_begin);
   }
 
-  wait_for_requested_commands_to_exit(n_cmds, cmds);
+  int error_code = wait_for_requested_commands_to_exit(n_cmds, cmds);
   remove_term_and_int_handlers();
   alarm(WAIT_FOR_PROC_DEATH_TIMEOUT);
   kill(0, SIGTERM);