Bump to version 1.22.1

[platform/upstream/busybox.git] / coreutils / nohup.c

diff --git a/coreutils/nohup.c b/coreutils/nohup.c
index 50f54cc..63853fd 100644 (file)
--- a/coreutils/nohup.c
+++ b/coreutils/nohup.c
@@ -1,56 +1,88 @@
-/* vi:set ts=4: */
+/* vi: set sw=4 ts=4: */
 /* nohup - invoke a utility immune to hangups.
- * 
+ *
  * Busybox version based on nohup specification at
- * http://www.opengroup.org/onlinepubs/007904975/utilities/sed.html
- * 
+ * http://www.opengroup.org/onlinepubs/007904975/utilities/nohup.html
+ *
  * Copyright 2006 Rob Landley <rob@landley.net>
- * 
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Copyright 2006 Bernhard Reutner-Fischer
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
-#include "busybox.h"
+//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 &"
 
-int nohup_main(int argc, char *argv[])
-{
-       int temp, nullfd;
-       char *nohupout = "nohup.out", *home = NULL;
+#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)
+#
+*/
 
-       if (argc<2) bb_show_usage();
+int nohup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int nohup_main(int argc UNUSED_PARAM, char **argv)
+{
+       const char *nohupout;
+       char *home;
 
-       nullfd = bb_xopen(bb_dev_null, O_WRONLY|O_APPEND);
-       // If stdin is a tty, detach from it.
+       xfunc_error_retval = 127;
 
-       if (isatty(0)) dup2(nullfd, 0);
+       if (!argv[1]) {
+               bb_show_usage();
+       }
 
-       // Redirect stdout to nohup.out, either in "." or in "$HOME".
+       /* If stdin is a tty, detach from it. */
+       if (isatty(STDIN_FILENO)) {
+               /* bb_error_msg("ignoring input"); */
+               close(STDIN_FILENO);
+               xopen(bb_dev_null, O_RDONLY); /* will be fd 0 (STDIN_FILENO) */
+       }
 
-       if (isatty(1)) {
-               close(1);
+       nohupout = "nohup.out";
+       /* Redirect stdout to nohup.out, either in "." or in "$HOME". */
+       if (isatty(STDOUT_FILENO)) {
+               close(STDOUT_FILENO);
                if (open(nohupout, O_CREAT|O_WRONLY|O_APPEND, S_IRUSR|S_IWUSR) < 0) {
                        home = getenv("HOME");
                        if (home) {
-                               home = concat_path_file(home, nohupout);
-                               bb_xopen3(nohupout, O_CREAT|O_WRONLY|O_APPEND, S_IRUSR|S_IWUSR);
+                               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, 1);
-
-       // If we have a tty on strderr, announce filename and redirect to stdout.
-       // Else redirect to /dev/null.
+               bb_error_msg("appending output to %s", nohupout);
+       }
 
-       temp = isatty(2);
-       if (temp) fdprintf(2,"Writing to %s\n", home ? home : nohupout);
-       dup2(temp ? 1 : nullfd, 2);
-       close(nullfd);
-       signal (SIGHUP, SIG_IGN);
+       /* 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);
+       }
 
-       // Exec our new program.
+       signal(SIGHUP, SIG_IGN);
 
-       execvp(argv[1],argv+1);
-       if (ENABLE_FEATURE_CLEAN_UP) free(home);
-       bb_error_msg_and_die("exec %s",argv[1]);
+       argv++;
+       BB_EXECVP_or_die(argv);
 }