Revision

23929

Author

dsorresso@apple.com

Date

2009-07-02 16:32:19 -0700 (Thu, 02 Jul 2009)

Log Message

launchctl properly detects boot args.

Modified Paths

• trunk/launchd/src/launchctl.c
• trunk/launchd/src/launchd_runtime.c

Diff

--- trunk/launchd/src/launchctl.c	2009-07-02 23:29:48 UTC (rev 23928)
+++ trunk/launchd/src/launchctl.c	2009-07-02 23:32:19 UTC (rev 23929)
@@ -4054,7 +4054,7 @@
 	}
 
 	char bootargs[128];
-	size_t len = 0;
+	size_t len = sizeof(bootargs) - 1;
 	int r = sysctlbyname("kern.bootargs", bootargs, &len, NULL, 0);
 	if( r == 0 && strnstr(bootargs, "-v", len) != NULL ) {
 		g_verbose_boot = true;

--- trunk/launchd/src/launchd_runtime.c	2009-07-02 23:29:48 UTC (rev 23928)
+++ trunk/launchd/src/launchd_runtime.c	2009-07-02 23:32:19 UTC (rev 23929)
@@ -1833,7 +1833,7 @@
 	}
 	
 	char bootargs[128];
-	size_t len = sizeof(bootargs);
+	size_t len = sizeof(bootargs) - 1;
 	int r = pid1_magic ? sysctlbyname("kern.bootargs", bootargs, &len, NULL, 0) : -1;
 	if( r == 0 && strnstr(bootargs, "-v", len) != NULL ) {
 		g_verbose_boot = true;