[launchd-changes] [22933] trunk/launchd/src

source_changes at macosforge.org source_changes at macosforge.org
Fri Nov 3 10:07:24 PST 2006


Revision: 22933
          http://trac.macosforge.org/projects/launchd/changeset/22933
Author:   zarzycki at apple.com
Date:     2006-11-03 10:07:24 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
Simplify an internal API.

Modified Paths:
--------------
    trunk/launchd/src/liblaunch.c
    trunk/launchd/src/libvproc.c
    trunk/launchd/src/libvproc_internal.h

Modified: trunk/launchd/src/liblaunch.c
===================================================================
--- trunk/launchd/src/liblaunch.c	2006-11-02 22:06:55 UTC (rev 22932)
+++ trunk/launchd/src/liblaunch.c	2006-11-03 18:07:24 UTC (rev 22933)
@@ -1200,25 +1200,31 @@
 	u = pwe->pw_uid;
 	g = pwe->pw_gid;
 
-	if ((ldp = fexecv_as_user(login, u, g, ldargv)) == -1)
+	if ((ldp = fexecv_as_user(login, u, g, ldargv)) == -1) {
 		return -1;
+	}
 
-	while (_vprocmgr_getsocket(bootstrap_port, sp) != BOOTSTRAP_SUCCESS)
+	while (_vprocmgr_getsocket(sp) != BOOTSTRAP_SUCCESS) {
 		usleep(20000);
+	}
 
 	setenv(LAUNCHD_SOCKET_ENV, sp, 1);
 
-	if (flags & LOAD_ONLY_SAFEMODE_LAUNCHAGENTS)
+	if (flags & LOAD_ONLY_SAFEMODE_LAUNCHAGENTS) {
 		largv[5] = "system";
+	}
 
-	if ((p = fexecv_as_user(login, u, g, largv)) == -1)
+	if ((p = fexecv_as_user(login, u, g, largv)) == -1) {
 		return -1;
+	}
 
-	if (waitpid(p, &wstatus, 0) != p)
+	if (waitpid(p, &wstatus, 0) != p) {
 		return -1;
+	}
 
-	if (!(WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == 0))
+	if (!(WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == 0)) {
 		return -1;
+	}
 
 #define BEZEL_UI_PATH "/System/Library/LoginPlugins/BezelServices.loginPlugin/Contents/Resources/BezelUI/BezelUIServer"
 #define BEZEL_UI_PLIST "/System/Library/LaunchAgents/com.apple.BezelUIServer.plist"

Modified: trunk/launchd/src/libvproc.c
===================================================================
--- trunk/launchd/src/libvproc.c	2006-11-02 22:06:55 UTC (rev 22932)
+++ trunk/launchd/src/libvproc.c	2006-11-03 18:07:24 UTC (rev 22933)
@@ -158,9 +158,9 @@
 }
 
 kern_return_t
-_vprocmgr_getsocket(mach_port_t bp, name_t sockpath)
+_vprocmgr_getsocket(name_t sockpath)
 {
-	return vproc_mig_getsocket(bp, sockpath);
+	return vproc_mig_getsocket(bootstrap_port, sockpath);
 }
 
 vproc_err_t

Modified: trunk/launchd/src/libvproc_internal.h
===================================================================
--- trunk/launchd/src/libvproc_internal.h	2006-11-02 22:06:55 UTC (rev 22932)
+++ trunk/launchd/src/libvproc_internal.h	2006-11-03 18:07:24 UTC (rev 22933)
@@ -52,7 +52,7 @@
 		name_array_t *service_names, mach_msg_type_number_t *service_namesCnt,
 		mach_port_array_t *ports, mach_msg_type_number_t *portCnt);
 
-kern_return_t _vprocmgr_getsocket(mach_port_t bp, name_t);
+kern_return_t _vprocmgr_getsocket(name_t);
 
 void _vproc_logv(int pri, int err, const char *msg, va_list ap);
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20061103/5c8f1f72/attachment.html


More information about the launchd-changes mailing list