ntpd: default to FEATURE_NTP_AUTH=y

[oweals/busybox.git] / coreutils / nohup.c

diff --git a/coreutils/nohup.c b/coreutils/nohup.c
index 317d2a8ae900e2ac514b24a865d98e3108af19cf..ae136e085743e8c36f3f1b606715ce7381343b56 100644 (file)
--- a/coreutils/nohup.c
+++ b/coreutils/nohup.c
@@ -1,31 +1,72 @@
 /* vi: set sw=4 ts=4: */
-/* nohup - invoke a utility immune to hangups.
+/*
+ * nohup - invoke a utility immune to hangups.
  *
  * Busybox version based on nohup specification at
  * http://www.opengroup.org/onlinepubs/007904975/utilities/nohup.html
  *
  * Copyright 2006 Rob Landley <rob@landley.net>
- * Copyright 2006 Bernhard Fischer
+ * Copyright 2006 Bernhard Reutner-Fischer
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//config:config NOHUP
+//config:      bool "nohup (2 kb)"
+//config:      default y
+//config:      help
+//config:      run a command immune to hangups, with output to a non-tty.
 
-#include "busybox.h"
+//applet:IF_NOHUP(APPLET_NOEXEC(nohup, nohup, BB_DIR_USR_BIN, BB_SUID_DROP, nohup))
 
-int nohup_main(int argc, char **argv)
+//kbuild:lib-$(CONFIG_NOHUP) += nohup.o
+
+//usage:#define nohup_trivial_usage
+//usage:       "PROG ARGS"
+//usage:#define nohup_full_usage "\n\n"
+//usage:       "Run PROG immune to hangups, with output to a non-tty"
+//usage:
+//usage:#define nohup_example_usage
+//usage:       "$ nohup make &"
+
+#include "libbb.h"
+
+/* Compat info: nohup (GNU coreutils 6.8) does this:
+# nohup true
+nohup: ignoring input and appending output to 'nohup.out'
+# nohup true 1>/dev/null
+nohup: ignoring input and redirecting stderr to stdout
+# nohup true 2>zz
+# cat zz
+nohup: ignoring input and appending output to 'nohup.out'
+# nohup true 2>zz 1>/dev/null
+# cat zz
+nohup: ignoring input
+# nohup true </dev/null 1>/dev/null
+nohup: redirecting stderr to stdout
+# nohup true </dev/null 2>zz 1>/dev/null
+# cat zz
+  (nothing)
+#
+*/
+
+int nohup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int nohup_main(int argc UNUSED_PARAM, char **argv)
 {
-       int nullfd;
        const char *nohupout;
-       char *home = NULL;
+       char *home;
 
        xfunc_error_retval = 127;
 
-       if (argc < 2) bb_show_usage();
+       if (!argv[1]) {
+               bb_show_usage();
+       }
 
-       nullfd = xopen(bb_dev_null, O_WRONLY|O_APPEND);
        /* If stdin is a tty, detach from it. */
-       if (isatty(STDIN_FILENO))
-               dup2(nullfd, STDIN_FILENO);
+       if (isatty(STDIN_FILENO)) {
+               /* bb_error_msg("ignoring input"); */
+               close(STDIN_FILENO);
+               xopen(bb_dev_null, O_RDONLY); /* will be fd 0 (STDIN_FILENO) */
+       }
 
        nohupout = "nohup.out";
        /* Redirect stdout to nohup.out, either in "." or in "$HOME". */
@@ -36,24 +77,22 @@ int nohup_main(int argc, char **argv)
                        if (home) {
                                nohupout = concat_path_file(home, nohupout);
                                xopen3(nohupout, O_CREAT|O_WRONLY|O_APPEND, S_IRUSR|S_IWUSR);
+                       } else {
+                               xopen(bb_dev_null, O_RDONLY); /* will be fd 1 */
                        }
                }
-       } else dup2(nullfd, STDOUT_FILENO);
+               bb_error_msg("appending output to %s", nohupout);
+       }
 
-       /* If we have a tty on stderr, announce filename and redirect to stdout.
-        * Else redirect to /dev/null.
-        */
+       /* If we have a tty on stderr, redirect to stdout. */
        if (isatty(STDERR_FILENO)) {
-               bb_error_msg("appending to %s", nohupout);
+               /* if (stdout_wasnt_a_tty)
+                       bb_error_msg("redirecting stderr to stdout"); */
                dup2(STDOUT_FILENO, STDERR_FILENO);
-       } else dup2(nullfd, STDERR_FILENO);
+       }
 
-       if (nullfd > 2)
-               close(nullfd);
        signal(SIGHUP, SIG_IGN);
 
-       execvp(argv[1], argv+1);
-       if (ENABLE_FEATURE_CLEAN_UP && home)
-               free((char*)nohupout);
-       bb_perror_msg_and_die("%s", argv[1]);
+       argv++;
+       BB_EXECVP_or_die(argv);
 }