svn commit: branches/busybox_scratch/coreutils
aldot at busybox.net
aldot at busybox.net
Sun Jul 2 15:07:34 UTC 2006
Author: aldot
Date: 2006-07-02 08:07:32 -0700 (Sun, 02 Jul 2006)
New Revision: 15578
Log:
- fix bug where it would behave wrong if ./nohup.out was not writable.
- debloat and make it readable while at it.
text data bss dec hex filename
320 0 0 320 140 coreutils/nohup.o.oorig
304 0 0 304 130 coreutils/nohup.o
Modified:
branches/busybox_scratch/coreutils/nohup.c
Changeset:
Modified: branches/busybox_scratch/coreutils/nohup.c
===================================================================
--- branches/busybox_scratch/coreutils/nohup.c 2006-07-02 10:33:10 UTC (rev 15577)
+++ branches/busybox_scratch/coreutils/nohup.c 2006-07-02 15:07:32 UTC (rev 15578)
@@ -1,11 +1,12 @@
-/* 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 at landley.net>
- *
+ * Copyright 2006 Bernhard Fischer
+ *
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
@@ -14,47 +15,42 @@
#include <unistd.h>
#include "busybox.h"
-int nohup_main(int argc, char *argv[])
+int nohup_main(int argc, char **argv)
{
int temp, nullfd;
- char *nohupout = "nohup.out", *home = NULL;
+ char *nohupout, *home = NULL;
- // I have no idea why the standard cares about this.
-
bb_default_error_retval = 127;
if (argc<2) bb_show_usage();
nullfd = bb_xopen(bb_dev_null, O_WRONLY|O_APPEND);
- // If stdin is a tty, detach from it.
+ /* If stdin is a tty, detach from it. */
+ if (isatty(STDIN_FILENO)) dup2(nullfd, STDIN_FILENO);
- 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);
+ nohupout = concat_path_file(home, nohupout);
bb_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.
-
- temp = isatty(2);
- if (temp) fdprintf(2,"Writing to %s\n", home ? home : nohupout);
- dup2(temp ? 1 : nullfd, 2);
+ /* 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);
- // 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]);
+ if (00 && ENABLE_FEATURE_CLEAN_UP && home) free(nohupout);
+ bb_perror_msg_and_die("%s",argv[1]);
}
More information about the busybox-cvs
mailing list