emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- pull r15578 from busybox_scratch branch:

Browse Source 
- fix bug where it would behave wrong if ./nohup.out was not writable.
  - debloat and make it readable while at it.
$ size coreutils/nohup.o*
   text    data     bss     dec     hex filename
    362       0       0     362     16a coreutils/nohup.o.trunk
    344       0       0     344     158 coreutils/nohup.o
$ make bloatcheck
function                                             old     new   delta
nohup_main                                           324     310     -14
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-14)             Total: -14 bytes
This commit is contained in:
Bernhard Reutner-Fischer 2006-09-21 22:10:24 +00:00
parent 42f67026a1
commit 3503ff72c6
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
coreutils/nohup.c
View File

@ -5,53 +5,49 @@
* http://www.opengroup.org/onlinepubs/007904975/utilities/nohup.html * http://www.opengroup.org/onlinepubs/007904975/utilities/nohup.html
* *
* Copyright 2006 Rob Landley <rob@landley.net> * Copyright 2006 Rob Landley <rob@landley.net>
* Copyright 2006 Bernhard Fischer
* *
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
#include "busybox.h" #include "busybox.h"
int nohup_main(int argc, char *argv[]) int nohup_main(int argc, char **argv)
{ {
int temp, nullfd; 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; 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); nullfd = 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); nohupout = "nohup.out";
/* Redirect stdout to nohup.out, either in "." or in "$HOME". */
// Redirect stdout to nohup.out, either in "." or in "$HOME". if (isatty(STDOUT_FILENO)) {
close(STDOUT_FILENO);
if (isatty(1)) {
close(1);
if (open(nohupout, O_CREAT|O_WRONLY|O_APPEND, S_IRUSR|S_IWUSR) < 0) { if (open(nohupout, O_CREAT|O_WRONLY|O_APPEND, S_IRUSR|S_IWUSR) < 0) {
home = getenv("HOME"); home = getenv("HOME");
if (home) { if (home) {
home = concat_path_file(home, nohupout); nohupout = concat_path_file(home, nohupout);
xopen3(nohupout, O_CREAT|O_WRONLY|O_APPEND, S_IRUSR|S_IWUSR); 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. /* If we have a tty on strderr, announce filename and redirect to stdout.
// Else redirect to /dev/null. * Else redirect to /dev/null.
*/
temp = isatty(2); temp = isatty(STDERR_FILENO);
if (temp) fdprintf(2,"Writing to %s\n", home ? home : nohupout); if (temp) bb_error_msg("Appending to %s", nohupout);
dup2(temp ? 1 : nullfd, 2); dup2(temp ? STDOUT_FILENO : nullfd, STDERR_FILENO);
close(nullfd); close(nullfd);
signal(SIGHUP, SIG_IGN); signal (SIGHUP, SIG_IGN);
// Exec our new program.
execvp(argv[1],argv+1); execvp(argv[1],argv+1);
if (ENABLE_FEATURE_CLEAN_UP) free(home); if (00 && ENABLE_FEATURE_CLEAN_UP && home) free(nohupout);
bb_error_msg_and_die("exec %s",argv[1]); bb_perror_msg_and_die("%s",argv[1]);
} }