Changeset 39457 for trunk/Ohana/src/opihi/cmd.basic/shell.c

Timestamp:

Mar 11, 2016, 10:23:42 PM (10 years ago)

Author:

eugene

Message:

modify to pass with extremely pedantic build; force consistency for signed vs unsigned and int sizes; various relastro updates

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/cmd.basic/shell.c (modified) (6 diffs)

trunk/Ohana/src/opihi/cmd.basic/shell.c

@@ -51 +51 @@
   // wait for process to finish or timeout
   // loop forever if desired, but catch C-C and stop the process on interrupt
-  interrupt = FALSE;
+  struct sigaction *old_sigaction = SetInterrupt();
   while (!interrupt) {
     result = waitpid (pid, &wait_status, WNOHANG);
@@ -59 +59 @@
           case ECHILD:
             gprint (GP_ERR, "unknown PID, not a child process: %d\n", pid);
+            ClearInterrupt (old_sigaction);
             return (FALSE);
           default:
@@ -72 +73 @@
           if (DTIME(now, start) > timeout) {
             gprint (GP_ERR, "timeout on %s (pid %d)\n", argv[1], pid);
+            ClearInterrupt (old_sigaction);
             return (FALSE);
           }
@@ -83 +85 @@
         }
         if (WIFEXITED(wait_status)) {
+          ClearInterrupt (old_sigaction);
           exit_status = WEXITSTATUS(wait_status);
           if (exit_status) {
@@ -91 +94 @@
         }
         if (WIFSIGNALED(wait_status)) {
+          ClearInterrupt (old_sigaction);
           gprint (GP_ERR, "job %d exited on signal %d\n", pid, WTERMSIG(wait_status));
           return (FALSE);
@@ -100 +104 @@
     }
   }
+  ClearInterrupt (old_sigaction);
   gprint (GP_ERR, "caught interrupt, killing %s (%d)\n", argv[1], pid);