PERFORCE change 82313 for review

[soc-tyler]

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

Change 82313 by soc-tyler at soc-tyler_launchd on 2005/08/20 08:56:34

	Thanks for not warning, and yelling at me gcc. -lpthread to make
	launch_client_init() do what it printf("should do, damnit\n");
	
	gah.

Affected files ...

.. //depot/projects/soc2005/launchd/Makefile#13 edit
.. //depot/projects/soc2005/launchd/launchctl/Makefile#6 edit
.. //depot/projects/soc2005/launchd/liblaunch.c#8 edit

Differences ...

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

@@ -21,7 +21,7 @@
 
 # -lcrypt needed by original FreeBSD init(8) code
 DPADD=	${LIBUTIL} ${LIBCRYPT}
-LDADD+=	-lutil -lcrypt
+LDADD+=	-lutil -lcrypt -lpthread
 
 
 .include <bsd.prog.mk>

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

@@ -9,7 +9,7 @@
 LAUNCHD=  ${.CURDIR}/../
 
 CFLAGS+= -g -Wall -W -Wshadow -Wpadded -I${LAUNCHD}/includes -D_LAUNCHD_
-LDADD+=	-lreadline -lutil
+LDADD+=	-lreadline -lutil -lpthread
 
 .PATH: ${LAUNCHD}
 

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

@@ -130,10 +130,8 @@
 	_lc = calloc(1, sizeof(struct _launch_client));
 
 	// if we can't calloc() _lc, exit function
-	if (_lc == NULL) {
-		printf("we can't calloc(_lc) in liblaunch.c:%d\n", __LINE__);
+	if (_lc == NULL) 
 		return;
-	}
 
 	pthread_mutex_init(&_lc->mtx, NULL);
 
@@ -666,8 +664,9 @@
 }
 
 
-int launch_get_fd(void)
-{
+int launch_get_fd(void) {
+// XXX: This function is *never* called....why does it exist?
+/*
 	pthread_once(&_lc_once, launch_client_init);
 
 	if (_lc == NULL) {
@@ -676,6 +675,8 @@
 	}
 
 	return _lc->l->fd;
+*/
+	return 0;
 }
 
 static void launch_msg_getmsgs(launch_data_t m, void *context)