X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Ftty.c;h=c28aa33d7144c371994cf2e1aa22740186ab8e10;hb=ec1a4b5a521b5adf295bc757c25231910f8c854b;hp=b2ab862ec0842cbd9311c4ce37bde31f39e6c2a0;hpb=f0ed376eda5d5c25d270e5100a881fb2d801bee6;p=oweals%2Fbusybox.git diff --git a/coreutils/tty.c b/coreutils/tty.c index b2ab862ec..c28aa33d7 100644 --- a/coreutils/tty.c +++ b/coreutils/tty.c @@ -15,15 +15,16 @@ #include #include "busybox.h" +int tty_main(int argc, char **argv); int tty_main(int argc, char **argv) { const char *s; - int silent; /* Note: No longer relevant in SUSv3. */ + USE_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */ int retval; 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. */ bb_warn_ignoring_args(argc - optind); @@ -36,10 +37,8 @@ int tty_main(int argc, char **argv) s = "not a tty"; retval = 1; } - - if (!silent) { - puts(s); - } + USE_INCLUDE_SUSv2(if (!silent) puts(s);) + SKIP_INCLUDE_SUSv2(puts(s);) fflush_stdout_and_exit(retval); }