diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-01-20 21:32:20 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-01-20 21:32:20 +0000 |
| commit | 1118a1de46cdeb166f256374568f4bc21b5d7449 (patch) | |
| tree | abfd73cc316caaca925097f9967a45863fb5d1f0 /coreutils/tty.c | |
| parent | 8b1ae450379a837326bedcf79f966b2eab100fa3 (diff) | |
| download | busybox-w32-1118a1de46cdeb166f256374568f4bc21b5d7449.tar.gz busybox-w32-1118a1de46cdeb166f256374568f4bc21b5d7449.tar.bz2 busybox-w32-1118a1de46cdeb166f256374568f4bc21b5d7449.zip | |
- make pre SUSv3 option handling dependant on INCLUDE_SUSv2
Diffstat (limited to 'coreutils/tty.c')
| -rw-r--r-- | coreutils/tty.c | 10 |
1 files changed, 4 insertions, 6 deletions
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 @@ | |||
| 18 | int tty_main(int argc, char **argv) | 18 | int tty_main(int argc, char **argv) |
| 19 | { | 19 | { |
| 20 | const char *s; | 20 | const char *s; |
| 21 | int silent; /* Note: No longer relevant in SUSv3. */ | 21 | USE_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */ |
| 22 | int retval; | 22 | int retval; |
| 23 | 23 | ||
| 24 | xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */ | 24 | xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */ |
| 25 | 25 | ||
| 26 | silent = getopt32(argc, argv, "s"); | 26 | USE_INCLUDE_SUSv2(silent = getopt32(argc, argv, "s");) |
| 27 | 27 | ||
| 28 | /* gnu tty outputs a warning that it is ignoring all args. */ | 28 | /* gnu tty outputs a warning that it is ignoring all args. */ |
| 29 | bb_warn_ignoring_args(argc - optind); | 29 | bb_warn_ignoring_args(argc - optind); |
| @@ -36,10 +36,8 @@ int tty_main(int argc, char **argv) | |||
| 36 | s = "not a tty"; | 36 | s = "not a tty"; |
| 37 | retval = 1; | 37 | retval = 1; |
| 38 | } | 38 | } |
| 39 | 39 | USE_INCLUDE_SUSv2(if (!silent) puts(s);) | |
| 40 | if (!silent) { | 40 | SKIP_INCLUDE_SUSv2(puts(s);) |
| 41 | puts(s); | ||
| 42 | } | ||
| 43 | 41 | ||
| 44 | fflush_stdout_and_exit(retval); | 42 | fflush_stdout_and_exit(retval); |
| 45 | } | 43 | } |