February 2007 - launchd-changes - lists.macosforge.org

[23118] trunk/launchd/src
by source_changes＠macosforge.org 28 Feb '07

28 Feb '07

Revision: 23118 http://trac.macosforge.org/projects/launchd/changeset/23118 Author: zarzycki(a)apple.com Date: 2007-02-28 15:39:18 -0800 (Wed, 28 Feb 2007) Log Message: ----------- <rdar://problem/5030392> Delete all code referring to /etc/rc.shutdown Modified Paths: -------------- trunk/launchd/src/Makefile.am trunk/launchd/src/Makefile.in trunk/launchd/src/SystemStarter.c trunk/launchd/src/com.apple.SystemStarter.plist Removed Paths: ------------- trunk/launchd/src/rc.shutdown Modified: trunk/launchd/src/Makefile.am =================================================================== --- trunk/launchd/src/Makefile.am 2007-02-27 22:28:29 UTC (rev 23117) +++ trunk/launchd/src/Makefile.am 2007-02-28 23:39:18 UTC (rev 23118) @@ -34,7 +34,7 @@ sbin_PROGRAMS = launchd SystemStarter libexec_PROGRAMS = launchproxy -sysconf_DATA = hostconfig rc.common rc.netboot rc.shutdown +sysconf_DATA = hostconfig rc.common rc.netboot launchctl_CFLAGS = $(AM_CFLAGS) -I/System/Library/Frameworks/System.framework/PrivateHeaders launchctl_LDFLAGS = -framework CoreFoundation -framework IOKit -weak_library /usr/lib/libedit.dylib Modified: trunk/launchd/src/Makefile.in =================================================================== --- trunk/launchd/src/Makefile.in 2007-02-27 22:28:29 UTC (rev 23117) +++ trunk/launchd/src/Makefile.in 2007-02-28 23:39:18 UTC (rev 23118) @@ -235,7 +235,7 @@ @LIBS_ONLY_TRUE@liblaunch_profile_a_CFLAGS = -pg $(AM_CFLAGS) @LIBS_ONLY_TRUE@liblaunch_profile_a_SOURCES = liblaunch.c libvproc.c libbootstrap.c protocol_vprocUser.c @LIBS_ONLY_FALSE@sbin_SCRIPTS = service -@LIBS_ONLY_FALSE@sysconf_DATA = hostconfig rc.common rc.netboot rc.shutdown +@LIBS_ONLY_FALSE@sysconf_DATA = hostconfig rc.common rc.netboot @LIBS_ONLY_FALSE@launchctl_CFLAGS = $(AM_CFLAGS) -I/System/Library/Frameworks/System.framework/PrivateHeaders @LIBS_ONLY_FALSE@launchctl_LDFLAGS = -framework CoreFoundation -framework IOKit -weak_library /usr/lib/libedit.dylib @LIBS_ONLY_FALSE@SystemStarter_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) Modified: trunk/launchd/src/SystemStarter.c =================================================================== --- trunk/launchd/src/SystemStarter.c 2007-02-27 22:28:29 UTC (rev 23117) +++ trunk/launchd/src/SystemStarter.c 2007-02-28 23:39:18 UTC (rev 23118) @@ -163,6 +163,12 @@ assert(r != -1); assert(kev.filter == EVFILT_SIGNAL && kev.ident == SIGTERM); + if (stat("/etc/rc.shutdown.local", &sb) != -1) { + const char *rc_shutdown_local_cmd[] = { "_PATH_BSHELL", "/etc/rc.shutdown.local", NULL }; + + fwexec(rc_shutdown_local_cmd, true); + } + system_starter(kActionStop, NULL); exit(EXIT_SUCCESS); Modified: trunk/launchd/src/com.apple.SystemStarter.plist =================================================================== --- trunk/launchd/src/com.apple.SystemStarter.plist 2007-02-27 22:28:29 UTC (rev 23117) +++ trunk/launchd/src/com.apple.SystemStarter.plist 2007-02-28 23:39:18 UTC (rev 23118) @@ -12,6 +12,8 @@ <dict> <key>/etc/rc.local</key> <true/> + <key>/etc/rc.shutdown.local</key> + <true/> </dict> </dict> <key>QueueDirectories</key> Deleted: trunk/launchd/src/rc.shutdown =================================================================== --- trunk/launchd/src/rc.shutdown 2007-02-27 22:28:29 UTC (rev 23117) +++ trunk/launchd/src/rc.shutdown 2007-02-28 23:39:18 UTC (rev 23118) @@ -1,8 +0,0 @@ -#!/bin/sh -# Copyright 1997-2004 Apple Computer, Inc. - -. /etc/rc.common - -if [ -f /etc/rc.shutdown.local ]; then - exec sh /etc/rc.shutdown.local -fi

1 0

[23117] tags/launchd-199/
by source_changes＠macosforge.org 27 Feb '07

27 Feb '07

Revision: 23117 http://trac.macosforge.org/projects/launchd/changeset/23117 Author: zarzycki(a)apple.com Date: 2007-02-27 14:28:29 -0800 (Tue, 27 Feb 2007) Log Message: ----------- "Tagging launchd-199 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-199/ Copied: tags/launchd-199 (from rev 23116, trunk)

1 0

[23116] trunk/launchd/src
by source_changes＠macosforge.org 27 Feb '07

27 Feb '07

Revision: 23116 http://trac.macosforge.org/projects/launchd/changeset/23116 Author: zarzycki(a)apple.com Date: 2007-02-27 12:39:13 -0800 (Tue, 27 Feb 2007) Log Message: ----------- <rdar://problem/5023447> Leopard9A377: /SourceCache/xnu/xnu-1051/bsd/kern/kern_exit.c:247 "init died\nState at Last Exc Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_unix_ipc.c trunk/launchd/src/launchd_unix_ipc.h Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-27 20:28:31 UTC (rev 23115) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-27 20:39:13 UTC (rev 23116) @@ -633,6 +633,8 @@ return; } + ipc_close_all_with_job(j); + if (j->forced_peers_to_demand_mode) { job_set_global_on_demand(j, false); } Modified: trunk/launchd/src/launchd_unix_ipc.c =================================================================== --- trunk/launchd/src/launchd_unix_ipc.c 2007-02-27 20:28:31 UTC (rev 23115) +++ trunk/launchd/src/launchd_unix_ipc.c 2007-02-27 20:39:13 UTC (rev 23116) @@ -238,6 +238,18 @@ } void +ipc_close_all_with_job(job_t j) +{ + struct conncb *ci, *cin; + + SLIST_FOREACH_SAFE(ci, &connections, sle, cin) { + if (ci->j == j) { + ipc_close(ci); + } + } +} + +void ipc_close_fds(launch_data_t o) { size_t i; Modified: trunk/launchd/src/launchd_unix_ipc.h =================================================================== --- trunk/launchd/src/launchd_unix_ipc.h 2007-02-27 20:28:31 UTC (rev 23115) +++ trunk/launchd/src/launchd_unix_ipc.h 2007-02-27 20:39:13 UTC (rev 23116) @@ -37,6 +37,7 @@ extern char *sockpath; void ipc_open(int fd, job_t j); +void ipc_close_all_with_job(job_t j); void ipc_close(struct conncb *c); void ipc_callback(void *, struct kevent *); void ipc_readmsg(launch_data_t msg, void *context);

1 0

[23115] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 27 Feb '07

27 Feb '07

Revision: 23115 http://trac.macosforge.org/projects/launchd/changeset/23115 Author: zarzycki(a)apple.com Date: 2007-02-27 12:28:31 -0800 (Tue, 27 Feb 2007) Log Message: ----------- <rdar://problem/5025358> Bug: launchd_core_logic.c:562 (23087):2: TAILQ_NEXT(ji, sle) == NULL Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-27 20:08:06 UTC (rev 23114) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-27 20:28:31 UTC (rev 23115) @@ -1648,7 +1648,7 @@ job_log(j, LOG_DEBUG, "Reaping"); - if (j->log_redirect_fd && !j->wait4pipe_eof) { + if (j->log_redirect_fd && (!j->wait4pipe_eof || j->mgr->shutting_down)) { job_assumes(j, close(j->log_redirect_fd) != -1); j->log_redirect_fd = 0; }

1 0

[23114] trunk
by source_changes＠macosforge.org 27 Feb '07

27 Feb '07

Revision: 23114 http://trac.macosforge.org/projects/launchd/changeset/23114 Author: zarzycki(a)apple.com Date: 2007-02-27 12:08:06 -0800 (Tue, 27 Feb 2007) Log Message: ----------- <rdar://problem/5026323> Only run SystemStarter when StartupItems exist Modified Paths: -------------- trunk/Makefile trunk/launchd/src/SystemStarter.c Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2007-02-27 19:52:04 UTC (rev 23113) +++ trunk/Makefile 2007-02-27 20:08:06 UTC (rev 23114) @@ -12,6 +12,8 @@ else mkdir -p $(DSTROOT)/Library/StartupItems chmod 755 $(DSTROOT)/Library/StartupItems + mkdir -p $(DSTROOT)/System/Library/StartupItems + chmod 755 $(DSTROOT)/System/Library/StartupItems rm -rf $(DSTROOT)/usr/local/lib/system cp $(OBJROOT)/src/launchd $(SYMROOT) cp $(OBJROOT)/src/launchctl $(SYMROOT) Modified: trunk/launchd/src/SystemStarter.c =================================================================== --- trunk/launchd/src/SystemStarter.c 2007-02-27 19:52:04 UTC (rev 23113) +++ trunk/launchd/src/SystemStarter.c 2007-02-27 20:08:06 UTC (rev 23114) @@ -53,13 +53,14 @@ { struct kevent kev; Action anAction = kActionStart; - int ch, kq; + int ch, r, kq = kqueue(); - assert((kq = kqueue()) != -1); + assert(kq != -1); EV_SET(&kev, SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, 0); - assert(kevent(kq, &kev, 1, NULL, 0, NULL) != -1); - assert(signal(SIGTERM, SIG_IGN) != SIG_ERR); + r = kevent(kq, &kev, 1, NULL, 0, NULL); + assert(r != -1); + signal(SIGTERM, SIG_IGN); while ((ch = getopt(argc, argv, "gvxirdDqn?")) != -1) { switch (ch) { @@ -158,7 +159,8 @@ NULL, NULL, kCFNotificationDeliverImmediately | kCFNotificationPostToAllSessions); - assert(kevent(kq, NULL, 0, &kev, 1, NULL) != -1); + r = kevent(kq, NULL, 0, &kev, 1, NULL); + assert(r != -1); assert(kev.filter == EVFILT_SIGNAL && kev.ident == SIGTERM); system_starter(kActionStop, NULL);

1 0

[23113] trunk/launchd/src
by source_changes＠macosforge.org 27 Feb '07

27 Feb '07

Revision: 23113 http://trac.macosforge.org/projects/launchd/changeset/23113 Author: zarzycki(a)apple.com Date: 2007-02-27 11:52:04 -0800 (Tue, 27 Feb 2007) Log Message: ----------- <rdar://problem/5026323> Only run SystemStarter when StartupItems exist Modified Paths: -------------- trunk/launchd/src/SystemStarter.c trunk/launchd/src/com.apple.SystemStarter.plist trunk/launchd/src/launchctl.c trunk/launchd/src/rc.shutdown Modified: trunk/launchd/src/SystemStarter.c =================================================================== --- trunk/launchd/src/SystemStarter.c 2007-02-27 18:34:14 UTC (rev 23112) +++ trunk/launchd/src/SystemStarter.c 2007-02-27 19:52:04 UTC (rev 23113) @@ -24,12 +24,14 @@ #include <IOKit/IOKitLib.h> #include <sys/types.h> +#include <sys/event.h> #include <sys/stat.h> #include <paths.h> #include <unistd.h> #include <crt_externs.h> #include <fcntl.h> #include <syslog.h> +#include <assert.h> #include <CoreFoundation/CoreFoundation.h> #include <NSSystemDirectories.h> #include "IPC.h" @@ -44,16 +46,21 @@ static void usage(void) __attribute__((noreturn)); static int system_starter(Action anAction, const char *aService); static void displayErrorMessages(StartupContext aStartupContext); -static void doCFnote(void); static pid_t fwexec(const char *const *argv, bool _wait); int main(int argc, char *argv[]) { + struct kevent kev; Action anAction = kActionStart; - char *aService = NULL; - int ch; + int ch, kq; + assert((kq = kqueue()) != -1); + + EV_SET(&kev, SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, 0); + assert(kevent(kq, &kev, 1, NULL, 0, NULL) != -1); + assert(signal(SIGTERM, SIG_IGN) != SIG_ERR); + while ((ch = getopt(argc, argv, "gvxirdDqn?")) != -1) { switch (ch) { case 'v': @@ -80,15 +87,18 @@ argc -= optind; argv += optind; - if (argc > 2) + if (argc > 2) { usage(); + } openlog(getprogname(), LOG_PID|LOG_CONS|(gDebugFlag ? LOG_PERROR : 0), LOG_DAEMON); - setlogmask(LOG_UPTO(LOG_NOTICE)); - if (gVerboseFlag) - setlogmask(LOG_UPTO(LOG_INFO)); - if (gDebugFlag) + if (gDebugFlag) { setlogmask(LOG_UPTO(LOG_DEBUG)); + } else if (gVerboseFlag) { + setlogmask(LOG_UPTO(LOG_INFO)); + } else { + setlogmask(LOG_UPTO(LOG_NOTICE)); + } if (!gNoRunFlag && (getuid() != 0)) { syslog(LOG_ERR, "must be root to run"); @@ -107,55 +117,53 @@ } } - atexit(doCFnote); + if (argc == 2) { + exit(system_starter(anAction, argv[1])); + } unlink(kFixerPath); - if (argc == 2) { - aService = argv[1]; - } else if (!gDebugFlag && anAction != kActionStop) { - const char *ipw_cmd[] = { "/usr/sbin/ipconfig", "waitall", NULL }; - const char *adm_cmd[] = { "/sbin/autodiskmount", "-va", NULL }; - mach_timespec_t w = { 600, 0 }; - kern_return_t kr; + const char *ipw_cmd[] = { "/usr/sbin/ipconfig", "waitall", NULL }; + const char *adm_cmd[] = { "/sbin/autodiskmount", "-va", NULL }; + mach_timespec_t w = { 600, 0 }; + kern_return_t kr; + struct stat sb; - /* Too many old StartupItems had implicit dependancies on - * "Network" via other StartupItems that are now no-ops. - * - * SystemStarter is not on the critical path for boot up, - * so we'll stall here to deal with this legacy dependancy - * problem. - */ + /* + * Too many old StartupItems had implicit dependancies on "Network" via + * other StartupItems that are now no-ops. + * + * SystemStarter is not on the critical path for boot up, so we'll + * stall here to deal with this legacy dependancy problem. + */ - if ((kr = IOKitWaitQuiet(kIOMasterPortDefault, &w)) != kIOReturnSuccess) { - syslog(LOG_NOTICE, "IOKitWaitQuiet: %d\n", kr); - } - - fwexec(ipw_cmd, true); - fwexec(adm_cmd, true); + if ((kr = IOKitWaitQuiet(kIOMasterPortDefault, &w)) != kIOReturnSuccess) { + syslog(LOG_NOTICE, "IOKitWaitQuiet: %d\n", kr); } - int ssec = system_starter(anAction, aService); - struct stat sb; + fwexec(ipw_cmd, true); + fwexec(adm_cmd, true); - if (anAction == kActionStart && stat("/etc/rc.local", &sb) != -1) { - int wstatus; - pid_t rclp; + system_starter(kActionStart, NULL); - switch ((rclp = fork())) { - case -1: - break; - case 0: - execlp(_PATH_BSHELL, _PATH_BSHELL, "/etc/rc.local", NULL); - _exit(EXIT_FAILURE); - break; - default: - waitpid(rclp, &wstatus, 0); - break; - } + if (stat("/etc/rc.local", &sb) != -1) { + const char *rc_local_cmd[] = { "_PATH_BSHELL", "/etc/rc.local", NULL }; + + fwexec(rc_local_cmd, true); } - exit(ssec); + CFNotificationCenterPostNotificationWithOptions( + CFNotificationCenterGetDistributedCenter(), + CFSTR("com.apple.startupitems.completed"), + NULL, NULL, + kCFNotificationDeliverImmediately | kCFNotificationPostToAllSessions); + + assert(kevent(kq, NULL, 0, &kev, 1, NULL) != -1); + assert(kev.filter == EVFILT_SIGNAL && kev.ident == SIGTERM); + + system_starter(kActionStop, NULL); + + exit(EXIT_SUCCESS); } @@ -383,15 +391,6 @@ exit(EXIT_FAILURE); } -static void doCFnote(void) -{ - CFNotificationCenterPostNotificationWithOptions( - CFNotificationCenterGetDistributedCenter(), - CFSTR("com.apple.startupitems.completed"), - NULL, NULL, - kCFNotificationDeliverImmediately | kCFNotificationPostToAllSessions); -} - pid_t fwexec(const char *const *argv, bool _wait) { Modified: trunk/launchd/src/com.apple.SystemStarter.plist =================================================================== --- trunk/launchd/src/com.apple.SystemStarter.plist 2007-02-27 18:34:14 UTC (rev 23112) +++ trunk/launchd/src/com.apple.SystemStarter.plist 2007-02-27 19:52:04 UTC (rev 23113) @@ -6,7 +6,18 @@ <string>com.apple.SystemStarter</string> <key>Program</key> <string>/sbin/SystemStarter</string> - <key>RunAtLoad</key> - <true/> + <key>KeepAlive</key> + <dict> + <key>KeepAlive</key> + <dict> + <key>/etc/rc.local</key> + <true/> + </dict> + </dict> + <key>QueueDirectories</key> + <array> + <string>/Library/StartupItems</string> + <string>/System/Library/StartupItems</string> + </array> </dict> </plist> Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-02-27 18:34:14 UTC (rev 23112) +++ trunk/launchd/src/launchctl.c 2007-02-27 19:52:04 UTC (rev 23113) @@ -1259,10 +1259,10 @@ EV_SET(&kev, 0, EVFILT_TIMER, EV_ADD|EV_ONESHOT, NOTE_SECONDS, 90, 0); assumes(kevent(kq, &kev, 1, NULL, 0, NULL) != -1); - assumes(signal(SIGTERM, SIG_IGN) != SIG_ERR); EV_SET(&kev, SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, 0); assumes(kevent(kq, &kev, 1, NULL, 0, NULL) != -1); + assumes(signal(SIGTERM, SIG_IGN) != SIG_ERR); if (assumes((tfp_gr = getgrnam("procview")) != NULL)) { int tfp_r_mib[3] = { CTL_KERN, KERN_TFP, KERN_TFP_READ_GROUP }; Modified: trunk/launchd/src/rc.shutdown =================================================================== --- trunk/launchd/src/rc.shutdown 2007-02-27 18:34:14 UTC (rev 23112) +++ trunk/launchd/src/rc.shutdown 2007-02-27 19:52:04 UTC (rev 23113) @@ -4,7 +4,5 @@ . /etc/rc.common if [ -f /etc/rc.shutdown.local ]; then - sh /etc/rc.shutdown.local + exec sh /etc/rc.shutdown.local fi - -exec SystemStarter stop

1 0

[23112] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 27 Feb '07

27 Feb '07

Revision: 23112 http://trac.macosforge.org/projects/launchd/changeset/23112 Author: zarzycki(a)apple.com Date: 2007-02-27 10:34:14 -0800 (Tue, 27 Feb 2007) Log Message: ----------- <rdar://problem/5025941> launchd passess BonjourFDs on checkin Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-27 18:27:04 UTC (rev 23111) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-27 18:34:14 UTC (rev 23112) @@ -486,6 +486,9 @@ int i; SLIST_FOREACH(sg, &j->sockets, sle) { + if (sg->junkfds) { + continue; + } if ((tmp2 = launch_data_alloc(LAUNCH_DATA_ARRAY))) { for (i = 0; i < sg->fd_cnt; i++) { if ((tmp3 = launch_data_new_fd(sg->fds[i]))) {

1 0

[23111] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 27 Feb '07

27 Feb '07

Revision: 23111 http://trac.macosforge.org/projects/launchd/changeset/23111 Author: zarzycki(a)apple.com Date: 2007-02-27 10:27:04 -0800 (Tue, 27 Feb 2007) Log Message: ----------- <rdar://problem/5021320> launchd should always pass '-f' to BootCacheControl Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-02-27 17:38:36 UTC (rev 23110) +++ trunk/launchd/src/launchctl.c 2007-02-27 18:27:04 UTC (rev 23111) @@ -141,6 +141,14 @@ static void do_single_user_mode(bool); static bool do_single_user_mode2(void); +typedef enum { + BOOTCACHE_START = 1, + BOOTCACHE_TAG, + BOOTCACHE_STOP, +} BootCache_action_t; + +static void do_BootCache_magic(BootCache_action_t what); + static int bootstrap_cmd(int argc, char *const argv[]); static int load_and_unload_cmd(int argc, char *const argv[]); //static int reload_cmd(int argc, char *const argv[]); @@ -1326,8 +1334,7 @@ assumes(fwexec(audit_tool, true) != -1); } - const char *bcc_tool[] = { "BootCacheControl", "start", NULL }; - assumes(fwexec(bcc_tool, true) != -1); + do_BootCache_magic(BOOTCACHE_START); preheat_page_cache_hack(); @@ -1341,8 +1348,7 @@ assumes(load_and_unload_cmd(4, load_launchd_items) == 0); - const char *bcc_tag_tool[] = { "BootCacheControl", "tag", NULL }; - assumes(fwexec(bcc_tag_tool, true) != -1); + do_BootCache_magic(BOOTCACHE_TAG); do_bootroot_magic(); @@ -1351,13 +1357,35 @@ if (!path_check("/System/Library/LoginPlugins/BootCache.loginPlugin")) { assumes(kevent(kq, NULL, 0, &kev, 1, NULL) == 1); - const char *bcc_stop_tool[] = { "BootCacheControl", "stop", NULL }; - assumes(fwexec(bcc_stop_tool, true) != -1); + do_BootCache_magic(BOOTCACHE_STOP); } assumes(close(kq) != -1); } +void +do_BootCache_magic(BootCache_action_t what) +{ + const char *bcc_tool[] = { "BootCacheControl", "-f", "/var/db/BootCache.playlist", NULL, NULL }; + + switch (what) { + case BOOTCACHE_START: + bcc_tool[3] = "start"; + break; + case BOOTCACHE_TAG: + bcc_tool[3] = "tag"; + break; + case BOOTCACHE_STOP: + bcc_tool[3] = "stop"; + break; + default: + assumes(false); + return; + } + + assumes(fwexec(bcc_tool, true) != -1); +} + int bootstrap_cmd(int argc, char *const argv[] __attribute__((unused))) {

1 0

[23110] trunk/launchd/src/service
by source_changes＠macosforge.org 27 Feb '07

27 Feb '07

Revision: 23110 http://trac.macosforge.org/projects/launchd/changeset/23110 Author: zarzycki(a)apple.com Date: 2007-02-27 09:38:36 -0800 (Tue, 27 Feb 2007) Log Message: ----------- Dead code deletion. Modified Paths: -------------- trunk/launchd/src/service Modified: trunk/launchd/src/service =================================================================== --- trunk/launchd/src/service 2007-02-25 23:43:10 UTC (rev 23109) +++ trunk/launchd/src/service 2007-02-27 17:38:36 UTC (rev 23110) @@ -20,8 +20,6 @@ if [ "$1" == "--list" ] then - echo smtp - echo fax-receive cd /System/Library/LaunchDaemons 2>/dev/null ls -1 | egrep '.plist$' | sed 's,.plist$,,g' exit 0 @@ -37,74 +35,15 @@ exit 0 fi fi - if [ "$2" = "smtp" ] - then - egrep '^MAILSERVER.*-YES-' /etc/hostconfig >/dev/null 2>&1 - exit $? - fi - if [ "$2" = "fax-receive" ] - then - egrep '^fax.*unknown.*on$' /etc/ttys >/dev/null 2>&1 - exit $? - fi exit 1 elif [ "$1" == "--test-if-available" ] then [ -f /System/Library/LaunchDaemons/$2.plist ] && exit 0 - [ "$2" = "smtp" ] && exit 0 - [ "$2" = "fax-receive" ] && exit 0 - exit 0 + exit 1 elif [ -f "/System/Library/LaunchDaemons/$1.plist" ] then [ "$2" == start ] && launchctl load -w /System/Library/LaunchDaemons/$1.plist [ "$2" == stop ] && launchctl unload -w /System/Library/LaunchDaemons/$1.plist -elif [ "$1" = "smtp" ] -then - if [ $UID != 0 ] - then - echo "You must be root to run this option" >&2 - exit 1 - fi - TMPFILE=$(mktemp /var/run/xinetd.tmp.$$.XXXXXX) - cp -f /etc/hostconfig $TMPFILE - if [ "$2" == start ] - then - if grep -q MAILSERVER=-NO- /etc/hostconfig ; then - sed 's,^MAILSERVER=-NO-,MAILSERVER=-YES-,g' < $TMPFILE > /etc/hostconfig - fi - postfix start - postfix flush - elif [ "$2" == stop ] - then - if grep -q MAILSERVER=-YES- /etc/hostconfig ; then - sed 's,^MAILSERVER=-YES-,MAILSERVER=-NO-,g' < $TMPFILE > /etc/hostconfig - fi - postfix stop - else - echo "No such service command" >&2 - fi - rm -f $TMPFILE -elif [ "$1" = "fax-receive" ] -then - if [ $UID != 0 ] - then - echo "You must be root to run this option" >&2 - exit 1 - fi - TMPFILE=$(mktemp /var/run/xinetd.tmp.$$.XXXXXX) - cp -f /etc/ttys $TMPFILE - if [ "$2" == start ] - then - sed 's,^fax$.*$off$,fax\1on,g' < $TMPFILE > /etc/ttys - kill -HUP 1 - elif [ "$2" == stop ] - then - sed 's,^fax$.*$on$,fax\1off,g' < $TMPFILE > /etc/ttys - kill -HUP 1 - else - echo "No such service command" >&2 - fi - rm -f $TMPFILE else echo "No such service $1" >&2 exit 1

1 0

[23109] trunk/launchd/src/wait4path.c
by source_changes＠macosforge.org 25 Feb '07

25 Feb '07

Revision: 23109 http://trac.macosforge.org/projects/launchd/changeset/23109 Author: zarzycki(a)apple.com Date: 2007-02-25 15:43:10 -0800 (Sun, 25 Feb 2007) Log Message: ----------- Fix a small race (never seen in practice). Modified Paths: -------------- trunk/launchd/src/wait4path.c Modified: trunk/launchd/src/wait4path.c =================================================================== --- trunk/launchd/src/wait4path.c 2007-02-25 23:32:43 UTC (rev 23108) +++ trunk/launchd/src/wait4path.c 2007-02-25 23:43:10 UTC (rev 23109) @@ -39,9 +39,6 @@ exit(EXIT_FAILURE); } - if (stat(argv[1], &sb) == 0) - exit(EXIT_SUCCESS); - EV_SET(&kev, 0, EVFILT_FS, EV_ADD, 0, 0, 0); if (kevent(kq, &kev, 1, NULL, 0, NULL) == -1) { @@ -49,10 +46,15 @@ exit(EXIT_FAILURE); } + if (stat(argv[1], &sb) == 0) { + exit(EXIT_SUCCESS); + } + for (;;) { kevent(kq, NULL, 0, &kev, 1, NULL); - if (stat(argv[1], &sb) == 0) + if (stat(argv[1], &sb) == 0) { break; + } } exit(EXIT_SUCCESS);

1 0