comm: almost total rewrite; add testsuite

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

diff --git a/coreutils/nohup.c b/coreutils/nohup.c
index 21adfc1c35f3ff11c50321f317fd7d12febc4a66..7d6a51ae9d180add12fd961d6a85fb136f4112d2 100644 (file)
--- a/coreutils/nohup.c
+++ b/coreutils/nohup.c
@@ -10,20 +10,43 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#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, char **argv)
 {
-       int temp, nullfd;
-       char *nohupout, *home = NULL;
+       const char *nohupout;
+       char *home;
 
        xfunc_error_retval = 127;
 
-       if (argc<2) bb_show_usage();
+       if (argc < 2) 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". */
@@ -34,20 +57,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);
-
-       /* If we have a tty on strderr, announce filename and redirect to stdout.
-        * Else redirect to /dev/null.
-        */
-       temp = isatty(STDERR_FILENO);
-       if (temp) bb_error_msg("appending to %s", nohupout);
-       dup2(temp ? STDOUT_FILENO : nullfd, STDERR_FILENO);
-       close(nullfd);
-       signal (SIGHUP, SIG_IGN);
-
-       execvp(argv[1],argv+1);
-       if (00 && ENABLE_FEATURE_CLEAN_UP && home) free(nohupout);
-       bb_perror_msg_and_die("%s", argv[1]);
+               bb_error_msg("appending output to %s", nohupout);
+       }
+
+       /* If we have a tty on stderr, redirect to stdout. */
+       if (isatty(STDERR_FILENO)) {
+               /* if (stdout_wasnt_a_tty)
+                       bb_error_msg("redirecting stderr to stdout"); */
+               dup2(STDOUT_FILENO, STDERR_FILENO);
+       }
+
+       signal(SIGHUP, SIG_IGN);
+
+       BB_EXECVP(argv[1], argv+1);
+       bb_simple_perror_msg_and_die(argv[1]);
 }