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

- make pre SUSv3 option handling dependant on INCLUDE_SUSv2

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer 2007-01-20 21:32:20 +00:00
parent 8b1ae45037
commit 1118a1de46
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
coreutils/tty.c
View File

@ -18,12 +18,12 @@
int tty_main(int argc, char **argv) int tty_main(int argc, char **argv)
{ {
const char *s; const char *s;
int silent; /* Note: No longer relevant in SUSv3. */ USE_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */
int retval; int retval;
xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */ xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */
silent = getopt32(argc, argv, "s"); USE_INCLUDE_SUSv2(silent = getopt32(argc, argv, "s");)
/* gnu tty outputs a warning that it is ignoring all args. */ /* gnu tty outputs a warning that it is ignoring all args. */
bb_warn_ignoring_args(argc - optind); bb_warn_ignoring_args(argc - optind);
@ -36,10 +36,8 @@ int tty_main(int argc, char **argv)
s = "not a tty"; s = "not a tty";
retval = 1; retval = 1;
} }
USE_INCLUDE_SUSv2(if (!silent) puts(s);)
if (!silent) { SKIP_INCLUDE_SUSv2(puts(s);)
puts(s);
}
fflush_stdout_and_exit(retval); fflush_stdout_and_exit(retval);
} }