[BusyBox-cvs] busybox/sysklogd klogd.c, 1.18, 1.19 syslogd.c, 1.104, 1.105

[Russ Dill]

Update of /var/cvs/busybox/sysklogd
In directory nail:/tmp/cvs-serv4184/sysklogd

Modified Files:
	klogd.c syslogd.c 
Log Message:
Get vfork_daemon_rexec working under uclinux

Index: klogd.c
===================================================================
RCS file: /var/cvs/busybox/sysklogd/klogd.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- klogd.c	28 Jul 2003 09:31:26 -0000	1.18
+++ klogd.c	15 Dec 2003 21:57:44 -0000	1.19
@@ -147,11 +147,12 @@
 	}
 
 	if (doFork) {
+#if defined(__uClinux__)
+		vfork_daemon_rexec(0, 1, argc, argv, "-n");
+#else /* __uClinux__ */
 		if (daemon(0, 1) < 0)
 			bb_perror_msg_and_die("daemon");
-#if defined(__uClinux__)
-		vfork_daemon_rexec(argc, argv, "-n");
-#endif
+#endif /* __uClinux__ */
 	}
 	doKlogd(console_log_level);
 

Index: syslogd.c
===================================================================
RCS file: /var/cvs/busybox/sysklogd/syslogd.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- syslogd.c	9 Oct 2003 09:43:18 -0000	1.104
+++ syslogd.c	15 Dec 2003 21:57:44 -0000	1.105
@@ -681,11 +681,12 @@
 	umask(0);
 
 	if (doFork == TRUE) {
-		if(daemon(0, 1) < 0)
-		bb_perror_msg_and_die("daemon");
 #if defined(__uClinux__)
-		vfork_daemon_rexec(argc, argv, "-n");
-#endif
+		vfork_daemon_rexec(0, 1, argc, argv, "-n");
+#else /* __uClinux__ */
+		if(daemon(0, 1) < 0)
+			bb_perror_msg_and_die("daemon");
+#endif /* __uClinux__ */
 	}
 	doSyslogd();