Changeset 23060

Timestamp:

02/13/07 17:52:08 (22 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/4922374> Let the stdout/sterr pipe linger longer for GUI applications

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -274 +274 @@
         mode_t mask;
         unsigned int globargv:1, wait4debugger:1, unload_at_exit:1, stall_before_exec:1, only_once:1,
-                     currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1, removal_pending:1;
+                     currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1, removal_pending:1,
+                     wait4pipe_eof:1;
         char label[0];
 };
@@ -870 +871 @@
 
         jr->unload_at_exit = true;
+        jr->wait4pipe_eof = true;
         jr->stall_before_exec = w4d;
 
@@ -1638 +1640 @@
         job_log(j, LOG_DEBUG, "Reaping");
 
-        if (j->log_redirect_fd) {
+        if (j->log_redirect_fd && !j->wait4pipe_eof) {
                 job_assumes(j, close(j->log_redirect_fd) != -1);
                 j->log_redirect_fd = 0;
@@ -1774 +1776 @@
                 job_assumes(j, close(j->log_redirect_fd) != -1);
                 j->log_redirect_fd = 0;
+                job_dispatch(j, false);
         } else if (job_assumes(j, rsz != -1)) {
                 buf[rsz] = '\0';
@@ -2997 +3000 @@
         }
 
+        if (j->wait4pipe_eof && j->log_redirect_fd) {
+                return true;
+        }
+
         if (j->p) {
                 return true;