Changeset 23055

Timestamp:

02/10/07 08:52:04 (22 months ago)

Author:

zarzycki@…

Message:

Minor bug fixes.

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (3 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -3669 +3669 @@
         int logfile_fd = -1;
         int console_fd = -1;
+        int wstatus;
         pid_t sp;
 
@@ -3686 +3687 @@
          * can't deadlock against launchd.
          */
-        if (job_assumes(j, (errno = posix_spawnp(&sp, sample_args[0], NULL, NULL, sample_args, environ)) == 0)) {
-                int wstatus;
-
-                job_assumes(j, waitpid(sp, &wstatus, 0) != -1);
+        if (!job_assumes(j, (errno = posix_spawnp(&sp, sample_args[0], NULL, NULL, sample_args, environ)) == 0)) {
+                goto out;
+        }
+
+        if (!job_assumes(j, waitpid(sp, &wstatus, 0) != -1)) {
+                goto out;
+        }
+
+        if (!job_assumes(j, WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == 0)) {
+                goto out;
         }
 
@@ -3696 +3703 @@
         }
 
-        if (!job_assumes(j, (console_fd = open(_PATH_CONSOLE, O_WRONLY|O_APPEND||O_NOCTTY)) != -1)) {
+        if (!job_assumes(j, (console_fd = open(_PATH_CONSOLE, O_WRONLY|O_APPEND|O_NOCTTY)) != -1)) {
                 goto out;
         }