<!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>[23002] 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/23002">23002</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-01-04 15:15:46 -0800 (Thu, 04 Jan 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/4904970> launchd needs to do better buffer management for job stdout/stderr</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 (23001 => 23002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-01-04 20:17:27 UTC (rev 23001)
+++ trunk/launchd/src/launchd_core_logic.c 2007-01-04 23:15:46 UTC (rev 23002)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #include <sys/resource.h>
</span><span class="cx"> #include <sys/ioctl.h>
</span><span class="cx"> #include <sys/mount.h>
</span><ins>+#include <sys/pipe.h>
</ins><span class="cx"> #include <net/if.h>
</span><span class="cx"> #include <netinet/in.h>
</span><span class="cx"> #include <netinet/in_var.h>
</span><span class="lines">@@ -1686,26 +1687,31 @@
</span><span class="cx"> void
</span><span class="cx"> job_log_stdouterr(job_t j)
</span><span class="cx"> {
</span><del>- char buf[4001];
</del><ins>+ char *msg, *bufindex, *buf = malloc(BIG_PIPE_SIZE + 1);
</ins><span class="cx"> ssize_t rsz;
</span><span class="cx">
</span><del>- rsz = read(j->log_redirect_fd, buf, sizeof(buf) - 1);
</del><ins>+ if (!job_assumes(j, buf != NULL)) {
+ return;
+ }
</ins><span class="cx">
</span><ins>+ bufindex = buf;
+
+ rsz = read(j->log_redirect_fd, buf, BIG_PIPE_SIZE);
+
</ins><span class="cx"> if (rsz == 0) {
</span><span class="cx"> job_assumes(j, close(j->log_redirect_fd) != -1);
</span><span class="cx"> j->log_redirect_fd = 0;
</span><span class="cx"> } else if (job_assumes(j, rsz != -1)) {
</span><span class="cx"> buf[rsz] = '\0';
</span><del>- switch (buf[0]) {
- case '\n':
- case '\r':
- case '\0':
- break;
- default:
- job_log(j, LOG_NOTICE, "Standard Out/Error: %s", buf);
- break;
</del><ins>+
+ while ((msg = strsep(&bufindex, "\n\r"))) {
+ if (msg[0]) {
+ job_log(j, LOG_NOTICE, "Standard Out/Error: %s", msg);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ free(buf);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span></span></pre>
</div>
</div>
</body>
</html>