[BusyBox-cvs] busybox/networking/udhcp common.c, 1.2, 1.3 script.c, 1.6, 1.7

[Russ Dill]

Update of /var/cvs/busybox/networking/udhcp
In directory nail:/tmp/cvs-serv4590/networking/udhcp

Modified Files:
	common.c script.c 
Log Message:
make udhcp work under uclinux, to an extent

Index: script.c
===================================================================
RCS file: /var/cvs/busybox/networking/udhcp/script.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- script.c	15 Dec 2003 22:09:36 -0000	1.6
+++ script.c	15 Dec 2003 22:11:26 -0000	1.7
@@ -225,7 +225,7 @@
 		return;
 
 	/* call script */
-	pid = fork();
+	pid = vfork();
 	if (pid) {
 		waitpid(pid, NULL, 0);
 		return;
@@ -235,7 +235,9 @@
 		/* close fd's? */
 		
 		/* exec script */
+#ifndef __uClinux__
 		DEBUG(LOG_INFO, "execle'ing %s", client_config.script);
+#endif /* __uClinux__ */
 		execle(client_config.script, client_config.script,
 		       name, NULL, envp);
 		LOG(LOG_ERR, "script %s failed: %m", client_config.script);

Index: common.c
===================================================================
RCS file: /var/cvs/busybox/networking/udhcp/common.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- common.c	30 Aug 2003 04:47:36 -0000	1.2
+++ common.c	15 Dec 2003 22:11:26 -0000	1.3
@@ -102,6 +102,9 @@
 
 void background(const char *pidfile)
 {
+#ifdef __uClinux__
+	LOG(LOG_ERR, "Cannot background in uclinux (yet)");	
+#else /* __uClinux__ */
 	int pid_fd = -1;
 
 	if (pidfile) {
@@ -131,6 +134,7 @@
 		lockf(pid_fd, F_UNLCK, 0);
 		close(pid_fd);
 	}
+#endif /* __uClinux__ */
 }
 
 /* Signal handler */