Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/nohup.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/nohup.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/coreutils/nohup.c

@@ -6 +6 @@
  *
  * 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.
  */
 
 #include "libbb.h"
 
-int nohup_main(int argc, char **argv);
-int nohup_main(int argc, char **argv)
+/* 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";
@@ -38 +60 @@
                 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);
 
-    BB_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);
 }