Fixup bugs in last patch

git-svn-id: svn://busybox.net/trunk/busybox@7122 69ca8d6d-28ef-0310-b511-8ec308f3f277

diff --git a/miscutils/crond.c b/miscutils/crond.c
index 198bc2d..b139593 100644 (file)
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -203,8 +203,9 @@ crond_main(int ac, char **av)
     if (!(opt & 4)) {
        if(daemon(1, 0) < 0) {
                bb_perror_msg_and_die("daemon");
     if (!(opt & 4)) {
        if(daemon(1, 0) < 0) {
                bb_perror_msg_and_die("daemon");

+       } 

 #if defined(__uClinux__)
 #if defined(__uClinux__)

-       } else {
+       else {

            /* reexec for vfork() do continue parent */
            vfork_daemon_rexec(ac, av, "-f");
        }
            /* reexec for vfork() do continue parent */
            vfork_daemon_rexec(ac, av, "-f");
        }

diff --git a/networking/inetd.c b/networking/inetd.c
index af262c3..4c46495 100644 (file)
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -832,13 +832,13 @@ inetd_main(int argc, char *argv[])
 
 #if defined(__uClinux__)
        opt = bb_getopt_ulflags(argc, argv, "q:f", &sq);
 
 #if defined(__uClinux__)
        opt = bb_getopt_ulflags(argc, argv, "q:f", &sq);

-       if (!(opt & 4)) {
+       if (!(opt & 2)) {

            daemon(0, 0);
            /* reexec for vfork() do continue parent */
            vfork_daemon_rexec(argc, argv, "-f");
        }
 #else
            daemon(0, 0);
            /* reexec for vfork() do continue parent */
            vfork_daemon_rexec(argc, argv, "-f");
        }
 #else

-       opt = bb_getopt_ulflags(ac, av, "q:", &sq);
+       opt = bb_getopt_ulflags(argc, argv, "q:", &sq);

        daemon(0, 0);
 #endif /* uClinux */
 
        daemon(0, 0);
 #endif /* uClinux */
 

diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index 2e187b1..c132e06 100644 (file)
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -147,7 +147,6 @@ extern int klogd_main(int argc, char **argv)
        }
 
        if (doFork) {
        }
 
        if (doFork) {

-#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)

                if (daemon(0, 1) < 0)
                        bb_perror_msg_and_die("daemon");
 #if defined(__uClinux__)
                if (daemon(0, 1) < 0)
                        bb_perror_msg_and_die("daemon");
 #if defined(__uClinux__)