Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/nohup.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/nohup.c (modified) (1 diff)

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

@@ -1 @@
-/* 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/nohup.html
- * 
+ *
  * Copyright 2006 Rob Landley <rob@landley.net>
- * 
+ * Copyright 2006 Bernhard Fischer
+ *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
-int nohup_main(int argc, char *argv[])
+int nohup_main(int argc, char **argv);
+int nohup_main(int argc, char **argv)
 {
-    int temp, nullfd;
-    char *nohupout = "nohup.out", *home = NULL;
+    int nullfd;
+    const char *nohupout;
+    char *home = NULL;
 
-    // I have no idea why the standard cares about this.
+    xfunc_error_retval = 127;
 
-    bb_default_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);
 
-    nullfd = bb_xopen(bb_dev_null, O_WRONLY|O_APPEND);
-    // If stdin is a tty, detach from it.
-
-    if (isatty(0)) dup2(nullfd, 0);
-
-    // Redirect stdout to nohup.out, either in "." or in "$HOME".
-
-    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 dup2(nullfd, 1);
+    } else dup2(nullfd, STDOUT_FILENO);
 
-    // If we have a tty on strderr, announce filename and redirect to stdout.
-    // Else redirect to /dev/null.
+    /* If we have a tty on stderr, announce filename and redirect to stdout.
+     * Else redirect to /dev/null.
+     */
+    if (isatty(STDERR_FILENO)) {
+        bb_error_msg("appending to %s", nohupout);
+        dup2(STDOUT_FILENO, STDERR_FILENO);
+    } else dup2(nullfd, STDERR_FILENO);
 
-    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 (nullfd > 2)
+        close(nullfd);
+    signal(SIGHUP, SIG_IGN);
 
-    // Exec our new program.
-
-    execvp(argv[1],argv+1);
-    if (ENABLE_FEATURE_CLEAN_UP) free(home);
-    bb_error_msg_and_die("exec %s",argv[1]);
+    BB_EXECVP(argv[1], argv+1);
+    if (ENABLE_FEATURE_CLEAN_UP && home)
+        free((char*)nohupout);
+    bb_perror_msg_and_die("%s", argv[1]);
 }