Changeset 23035

Timestamp:

02/07/07 08:34:09 (22 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/4968241> spurious logging from the libraries used by the various importers

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -1804 +1804 @@
         job_assumes(j, socketpair(AF_UNIX, SOCK_STREAM, 0, execspair) != -1);
 
-        if (job_assumes(j, pipe(oepair) != -1)) {
+        if (!j->legacy_mach_job && job_assumes(j, pipe(oepair) != -1)) {
                 j->log_redirect_fd = _fd(oepair[0]);
                 job_assumes(j, fcntl(j->log_redirect_fd, F_SETFL, O_NONBLOCK) != -1);
@@ -1823 +1823 @@
                 break;
         case 0:
-                job_assumes(j, dup2(oepair[1], STDOUT_FILENO) != -1);
-                job_assumes(j, dup2(oepair[1], STDERR_FILENO) != -1);
-                job_assumes(j, close(oepair[1]) != -1);
+                if (!j->legacy_mach_job) {
+                        job_assumes(j, dup2(oepair[1], STDOUT_FILENO) != -1);
+                        job_assumes(j, dup2(oepair[1], STDERR_FILENO) != -1);
+                        job_assumes(j, close(oepair[1]) != -1);
+                }
                 job_assumes(j, close(execspair[0]) == 0);
                 /* wait for our parent to say they've attached a kevent to us */
@@ -1846 +1848 @@
                 break;
         default:
-                job_assumes(j, close(oepair[1]) != -1);
+                if (!j->legacy_mach_job) {
+                        job_assumes(j, close(oepair[1]) != -1);
+                }
                 j->p = c;
                 j->forkfd = _fd(execspair[0]);