Changeset 23469

Timestamp:

12/19/07 09:40:56 (12 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5582235> printf output not appearing in console or appearing after app quits

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (1 diff)
• launchd_runtime.c (modified) (5 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -2085 +2085 @@
 
         if (j->log_redirect_fd && !j->legacy_LS_job) {
-                job_assumes(j, runtime_close(j->log_redirect_fd) != -1);
-                j->log_redirect_fd = 0;
+                job_log_stdouterr(j); /* one last chance */
+
+                if (j->log_redirect_fd) {
+                        job_assumes(j, runtime_close(j->log_redirect_fd) != -1);
+                        j->log_redirect_fd = 0;
+                }
         }
 

trunk/launchd/src/launchd_runtime.c

@@ -1184 +1184 @@
 
         if (!(LOG_MASK(attr->priority) & internal_mask_pri)) {
-                goto out;
+                return;
         }
 
@@ -1190 +1190 @@
                 vsnprintf(newmsg, sizeof(newmsg), message, args);
                 logmsg_add(attr, saved_errno, newmsg);
-                goto out;
+                return;
         }
 
@@ -1212 +1212 @@
 
         if (ourlogfile == NULL) {
-                goto out;
+                return;
         }
 
         if (message == NULL) {
-                goto out;
+                return;
         }
 
@@ -1249 +1249 @@
 
         vfprintf(ourlogfile, newmsg, args);
-
-out:
-        runtime_log_uncork_pending_drain();
 }
 
@@ -1376 +1373 @@
                 return;
         } else if (getpid() == 1) {
+                runtime_log_uncork_pending_drain();
                 return;
         }