Get vfork_daemon_rexec working under uclinux

diff --git a/include/libbb.h b/include/libbb.h
index 5ff49114bd0e08e787f9c5af4d4f6c2eccadf020..1367ee62496aec4a5359820b96464a5450e8c3c1 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -473,7 +473,8 @@ extern llist_t *llist_add_to(llist_t *old_head, char *new_item);
 extern void print_login_issue(const char *issue_file, const char *tty);
 extern void print_login_prompt(void);
 
-extern void vfork_daemon_rexec(int argc, char **argv, char *foreground_opt);
+extern void vfork_daemon_rexec(int nochdir, int noclose,
+               int argc, char **argv, char *foreground_opt);
 extern void get_terminal_width_height(int fd, int *width, int *height);
 extern unsigned long get_ug_id(const char *s, long (*my_getxxnam)(const char *));
 extern void xregcomp(regex_t *preg, const char *regex, int cflags);

diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index c8f9d277ea8d8142b2b628f93b4fc14235fdb67b..2fd70ba1acc73c8e291ebab5d374086f2402eaaa 100644 (file)
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -1,27 +1,78 @@
 /*
  * Rexec program for system have fork() as vfork() with foregound option
- * Copyright (C) Vladminr Oleynik and many different people.
+ *
+ * Copyright (C) Vladimir N. Oleynik <dzo@simtreas.ru>
+ * Copyright (C) 2003 Russ Dill <Russ.Dill@asu.edu>
+ *
+ * daemon() portion taken from uclibc:
+ *
+ * Copyright (c) 1991, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Modified for uClibc by Erik Andersen <andersee@debian.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include <unistd.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <paths.h>
 #include "libbb.h"
 
 
 #if defined(__uClinux__)
-void vfork_daemon_rexec(int argc, char **argv, char *foreground_opt)
+void vfork_daemon_rexec(int nochdir, int noclose,
+               int argc, char **argv, char *foreground_opt)
 {
+       int fd;
        char **vfork_args;
        int a = 0;
+       
+       setsid();
+       
+       if (!nochdir)
+               chdir("/");
+
+       if (!noclose && (fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) {
+               dup2(fd, STDIN_FILENO);
+               dup2(fd, STDOUT_FILENO);
+               dup2(fd, STDERR_FILENO);
+               if (fd > 2)
+                       close(fd);
+       }
 
        vfork_args = xcalloc(sizeof(char *), argc + 3);
+       vfork_args[a++] = "/bin/busybox";
        while(*argv) {
            vfork_args[a++] = *argv;
            argv++;
        }
        vfork_args[a] = foreground_opt;
-       execvp("/proc/self/exe", vfork_args);
-       vfork_args[0] = "/bin/busybox";
-       execv(vfork_args[0], vfork_args);
-       bb_perror_msg_and_die("execv %s", vfork_args[0]);
+       switch (vfork()) {
+       case 0: /* child */
+               /* Make certain we are not a session leader, or else we
+                * might reacquire a controlling terminal */
+               if (vfork())
+                       _exit(0);
+               execv(vfork_args[0], vfork_args);
+               bb_perror_msg_and_die("execv %s", vfork_args[0]);
+       case -1: /* error */
+               bb_perror_msg_and_die("vfork");
+       default: /* parent */
+               exit(0);
+       }       
 }
 #endif /* uClinux */

diff --git a/miscutils/crond.c b/miscutils/crond.c
index 6de00dfde692ef74e16dcce315afaa5d1485eea6..81fd72b850c52147088842e25d9a65c8949c8d1b 100644 (file)
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -200,14 +200,12 @@ crond_main(int ac, char **av)
      */
 
     if (!(opt & 4)) {
+#if defined(__uClinux__)
+       /* reexec for vfork() do continue parent */
+       vfork_daemon_rexec(1, 0, ac, av, "-f");
+#else /* uClinux */
        if(daemon(1, 0) < 0) {
                bb_perror_msg_and_die("daemon");
-       } 
-#if defined(__uClinux__)
-       else {
-           /* reexec for vfork() do continue parent */
-           vfork_daemon_rexec(ac, av, "-f");
-       }
 #endif /* uClinux */
     }
 

diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index c132e065cc4058c23c0924cd9a5afbf7a10e5b55..df3a668dd56ab84896d4be205096a6a8340e6fff 100644 (file)
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -147,11 +147,12 @@ extern int klogd_main(int argc, char **argv)
        }
 
        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);
 

diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 74b242c42e65ac78b97904b8a2f0b99888ff0cda..622500e48e407ae910d224503676c6eb8f3ae664 100644 (file)
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -681,11 +681,12 @@ extern int syslogd_main(int argc, char **argv)
        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();