[prev in list] [next in list] [prev in thread] [next in thread] 

List:       launchd-changes
Subject:    [launchd-changes] [23452] trunk/launchd/src
From:       source_changes () macosforge ! org
Date:       2007-11-30 21:00:44
Message-ID: 20071130210044.8DD032290D2 () beta ! macosforge ! org
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Revision: 23452
          http://trac.macosforge.org/projects/launchd/changeset/23452
Author:   zarzycki@apple.com
Date:     2007-11-30 13:00:42 -0800 (Fri, 30 Nov 2007)

Log Message:
-----------
Random changes.

Modified Paths:
--------------
    trunk/launchd/src/launchctl.c
    trunk/launchd/src/launchd_unix_ipc.c
    trunk/launchd/src/liblaunch_private.h

Modified: trunk/launchd/src/launchctl.c
===================================================================
--- trunk/launchd/src/launchctl.c	2007-11-30 20:47:06 UTC (rev 23451)
+++ trunk/launchd/src/launchctl.c	2007-11-30 21:00:42 UTC (rev 23452)
@@ -79,7 +79,7 @@
 extern char **environ;
 
 
-#define LAUNCH_SECDIR "/tmp/launch-XXXXXX"
+#define LAUNCH_SECDIR _PATH_TMP "launch-XXXXXX"
 
 #define MACHINIT_JOBKEY_ONDEMAND	"OnDemand"
 #define MACHINIT_JOBKEY_SERVICENAME	"ServiceName"

Modified: trunk/launchd/src/launchd_unix_ipc.c
===================================================================
--- trunk/launchd/src/launchd_unix_ipc.c	2007-11-30 20:47:06 UTC (rev 23451)
+++ trunk/launchd/src/launchd_unix_ipc.c	2007-11-30 21:00:42 UTC (rev 23452)
@@ -123,7 +123,7 @@
 			}
 		}
 	} else {
-		snprintf(ourdir, sizeof(ourdir), "/tmp/launchd-%u.XXXXXX", getpid());
+		snprintf(ourdir, sizeof(ourdir), _PATH_TMP "launchd-%u.XXXXXX", getpid());
 		if (mkdtemp(ourdir) == NULL) {
 			runtime_syslog(LOG_ERR, "Could not create critical directory \"%s\": %m", ourdir);
 			goto out_bad;

Modified: trunk/launchd/src/liblaunch_private.h
===================================================================
--- trunk/launchd/src/liblaunch_private.h	2007-11-30 20:47:06 UTC (rev 23451)
+++ trunk/launchd/src/liblaunch_private.h	2007-11-30 21:00:42 UTC (rev 23452)
@@ -24,6 +24,7 @@
 #include <sys/types.h>
 #include <launch.h>
 #include <unistd.h>
+#include <paths.h>
 #include <quarantine.h>
 
 #pragma GCC visibility push(default)
@@ -40,7 +41,7 @@
 #define LAUNCH_KEY_GETRUSAGECHILDREN	"GetResourceUsageChildren"
 
 #define LAUNCHD_SOCKET_ENV		"LAUNCHD_SOCKET"
-#define LAUNCHD_SOCK_PREFIX		"/var/tmp/launchd"
+#define LAUNCHD_SOCK_PREFIX		_PATH_VARTMP "launchd"
 #define LAUNCHD_TRUSTED_FD_ENV		"__LAUNCHD_FD"
 #define LAUNCHD_ASYNC_MSG_KEY		"_AsyncMessage"
 #define LAUNCH_KEY_BATCHCONTROL		"BatchControl"


[Attachment #5 (text/html)]

<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; \
padding: 6px; } #msg ul { 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>[23452] trunk/launchd/src</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a \
href="http://trac.macosforge.org/projects/launchd/changeset/23452">23452</a></dd> \
<dt>Author</dt> <dd>zarzycki@apple.com</dd> <dt>Date</dt> <dd>2007-11-30 13:00:42 \
-0800 (Fri, 30 Nov 2007)</dd> </dl>

<h3>Log Message</h3>
<pre>Random changes.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchctlc">trunk/launchd/src/launchctl.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_unix_ipcc">trunk/launchd/src/launchd_unix_ipc.c</a></li>
 <li><a href="#trunklaunchdsrcliblaunch_privateh">trunk/launchd/src/liblaunch_private.h</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchctlc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchctl.c (23451 => \
23452)</h4> <pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchctl.c	2007-11-30 20:47:06 UTC (rev \
                23451)
+++ trunk/launchd/src/launchctl.c	2007-11-30 21:00:42 UTC (rev 23452)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> extern char **environ;
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-#define LAUNCH_SECDIR &quot;/tmp/launch-XXXXXX&quot;
</del><ins>+#define LAUNCH_SECDIR _PATH_TMP &quot;launch-XXXXXX&quot;
</ins><span class="cx"> 
</span><span class="cx"> #define MACHINIT_JOBKEY_ONDEMAND	&quot;OnDemand&quot;
</span><span class="cx"> #define MACHINIT_JOBKEY_SERVICENAME	&quot;ServiceName&quot;
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_unix_ipcc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_unix_ipc.c (23451 => \
23452)</h4> <pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_unix_ipc.c	2007-11-30 20:47:06 UTC \
                (rev 23451)
+++ trunk/launchd/src/launchd_unix_ipc.c	2007-11-30 21:00:42 UTC (rev 23452)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> 			}
</span><span class="cx"> 		}
</span><span class="cx"> 	} else {
</span><del>-		snprintf(ourdir, sizeof(ourdir), &quot;/tmp/launchd-%u.XXXXXX&quot;, \
getpid()); </del><ins>+		snprintf(ourdir, sizeof(ourdir), _PATH_TMP \
&quot;launchd-%u.XXXXXX&quot;, getpid()); </ins><span class="cx"> 		if \
(mkdtemp(ourdir) == NULL) { </span><span class="cx"> 			runtime_syslog(LOG_ERR, \
&quot;Could not create critical directory \&quot;%s\&quot;: %m&quot;, ourdir); \
</span><span class="cx"> 			goto out_bad; </span></span></pre></div>
<a id="trunklaunchdsrcliblaunch_privateh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/liblaunch_private.h (23451 => \
23452)</h4> <pre class="diff"><span>
<span class="info">--- trunk/launchd/src/liblaunch_private.h	2007-11-30 20:47:06 UTC \
                (rev 23451)
+++ trunk/launchd/src/liblaunch_private.h	2007-11-30 21:00:42 UTC (rev 23452)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include &lt;sys/types.h&gt;
</span><span class="cx"> #include &lt;launch.h&gt;
</span><span class="cx"> #include &lt;unistd.h&gt;
</span><ins>+#include &lt;paths.h&gt;
</ins><span class="cx"> #include &lt;quarantine.h&gt;
</span><span class="cx"> 
</span><span class="cx"> #pragma GCC visibility push(default)
</span><span class="lines">@@ -40,7 +41,7 @@
</span><span class="cx"> #define \
LAUNCH_KEY_GETRUSAGECHILDREN	&quot;GetResourceUsageChildren&quot; </span><span \
class="cx">  </span><span class="cx"> #define \
LAUNCHD_SOCKET_ENV		&quot;LAUNCHD_SOCKET&quot; </span><del>-#define \
LAUNCHD_SOCK_PREFIX		&quot;/var/tmp/launchd&quot; </del><ins>+#define \
LAUNCHD_SOCK_PREFIX		_PATH_VARTMP &quot;launchd&quot; </ins><span class="cx"> #define \
LAUNCHD_TRUSTED_FD_ENV		&quot;__LAUNCHD_FD&quot; </span><span class="cx"> #define \
LAUNCHD_ASYNC_MSG_KEY		&quot;_AsyncMessage&quot; </span><span class="cx"> #define \
LAUNCH_KEY_BATCHCONTROL		&quot;BatchControl&quot; </span></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
launchd-changes mailing list
launchd-changes@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo/launchd-changes


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic