From 1118a1de46cdeb166f256374568f4bc21b5d7449 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sat, 20 Jan 2007 21:32:20 +0000 Subject: - make pre SUSv3 option handling dependant on INCLUDE_SUSv2 --- coreutils/tty.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'coreutils/tty.c') diff --git a/coreutils/tty.c b/coreutils/tty.c index b2ab862ec..fee4b8b9f 100644 --- a/coreutils/tty.c +++ b/coreutils/tty.c @@ -18,12 +18,12 @@ 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 +36,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); } -- cgit v1.2.3