mirror of
https://github.com/sheumann/hush.git
synced 2024-12-25 18:33:06 +00:00
- make pre SUSv3 option handling dependant on INCLUDE_SUSv2
This commit is contained in:
parent
8b1ae45037
commit
1118a1de46
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user