PERFORCE change 86163 for review

[soc-tyler]

http://perforce.freebsd.org/chv.cgi?CH=86163

Change 86163 by soc-tyler at soc-tyler_launchd on 2005/11/01 10:45:06

	Assuming PID 1 has been bumped down on the priority list.
	
	Might as well not build that nonsense into launchd(8)

Affected files ...

.. //depot/projects/soc2005/launchd/Makefile#22 edit
.. //depot/projects/soc2005/launchd/launchd.c#26 edit

Differences ...

==== //depot/projects/soc2005/launchd/Makefile#22 (text+ko) ====

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	launchd
-SRCS=	launchd.c liblaunch.c init.c
+SRCS=	launchd.c liblaunch.c launchd_unix_ipc.c launchd_core_logic.c init.c
 #launchdebugd.c launchproxy.c
 MAN=	launchd.8 
 
@@ -11,11 +11,11 @@
 NO_SHARED?=	YES
 
 
-CFLAGS+= -g -Wall -W -Wshadow -Wpadded -Iincludes
+CFLAGS+= -g -Wall -Iincludes
 # init.c related CFLAGS (from src/sbin/init/Makefile)
 # -DSECURE to make secure single-user logins (enter root passwd, etc)
 # -DDEBUGSHELL ? we don't need no stinkin' DEBUGSHELL
-CFLAGS+= -DLOGIN_CAP -DCOMPAT_SYSV_INIT -D_BE_INIT_ \
+CFLAGS+= -DLOGIN_CAP -DCOMPAT_SYSV_INIT \
 	-DLAUNCHD_PATH=`echo \"$$PWD/launchd\"` \
 	-DLAUNCHCTL_PATH=`echo \"$$PWD/launchctl/launchctl\"`
 # defining LAUNCHD_PATH and LAUNCHCTL_PATH is for development only

==== //depot/projects/soc2005/launchd/launchd.c#26 (text+ko) ====

@@ -731,9 +731,11 @@
 	launchd_assumes(close(s6) == 0);
 }
 
+/* this is a workaround for an openfirmware bug */
 void
 workaround3048875(int argc, char *argv[])
 {
+#ifdef _BUILD_DARWIN_
 	int i;
 	char **ap, *newargv[100], *p = argv[1];
 
@@ -754,6 +756,7 @@
 		return;
 
 	execv(newargv[0], newargv);
+#endif
 }
 
 #ifdef _BUILD_DARWIN_