<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23001] trunk/launchd/src/launchd_core_logic.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23001">23001</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-01-04 12:17:27 -0800 (Thu, 04 Jan 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prepare for growth.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23000 => 23001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-01-04 20:05:30 UTC (rev 23000)
+++ trunk/launchd/src/launchd_core_logic.c 2007-01-04 20:17:27 UTC (rev 23001)
</span><span class="lines">@@ -306,6 +306,7 @@
</span><span class="cx"> static pid_t job_get_pid(job_t j);
</span><span class="cx"> static jobmgr_t job_get_bs(job_t j);
</span><span class="cx"> static void job_uncork_fork(job_t j);
</span><ins>+static void job_log_stdouterr(job_t j);
</ins><span class="cx"> static void job_logv(job_t j, int pri, int err, const char *msg, va_list ap);
</span><span class="cx"> static void job_log(job_t j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4)));
</span><span class="cx"> static void job_log_error(job_t j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4)));
</span><span class="lines">@@ -1683,6 +1684,31 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><ins>+job_log_stdouterr(job_t j)
+{
+ char buf[4001];
+ ssize_t rsz;
+
+ rsz = read(j->log_redirect_fd, buf, sizeof(buf) - 1);
+
+ if (rsz == 0) {
+ job_assumes(j, close(j->log_redirect_fd) != -1);
+ j->log_redirect_fd = 0;
+ } else if (job_assumes(j, rsz != -1)) {
+ buf[rsz] = '\0';
+ switch (buf[0]) {
+ case '\n':
+ case '\r':
+ case '\0':
+ break;
+ default:
+ job_log(j, LOG_NOTICE, "Standard Out/Error: %s", buf);
+ break;
+ }
+ }
+}
+
+void
</ins><span class="cx"> job_callback(void *obj, struct kevent *kev)
</span><span class="cx"> {
</span><span class="cx"> job_t j = obj;
</span><span class="lines">@@ -1716,26 +1742,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case EVFILT_READ:
</span><span class="cx"> if (kev->ident == (uintptr_t)j->log_redirect_fd) {
</span><del>- char buf[4001];
- ssize_t rsz;
-
- rsz = read(j->log_redirect_fd, buf, sizeof(buf) - 1);
-
- if (rsz == 0) {
- job_assumes(j, close(j->log_redirect_fd) != -1);
- j->log_redirect_fd = 0;
- } else if (job_assumes(j, rsz != -1)) {
- buf[rsz] = '\0';
- switch (buf[0]) {
- case '\n':
- case '\r':
- case '\0':
- break;
- default:
- job_log(j, LOG_NOTICE, "Standard Out/Error: %s", buf);
- break;
- }
- }
</del><ins>+ job_log_stdouterr(j);
</ins><span class="cx"> } else {
</span><span class="cx"> socketgroup_callback(j, kev);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>