diff options
Diffstat (limited to 'coreutils/tty.c')
-rw-r--r-- | coreutils/tty.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/coreutils/tty.c b/coreutils/tty.c index b0a50ff61..48e15117c 100644 --- a/coreutils/tty.c +++ b/coreutils/tty.c | |||
@@ -13,7 +13,7 @@ | |||
13 | #include "libbb.h" | 13 | #include "libbb.h" |
14 | 14 | ||
15 | int tty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 15 | int tty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
16 | int tty_main(int argc, char **argv) | 16 | int tty_main(int argc, char **argv SKIP_INCLUDE_SUSv2(ATTRIBUTE_UNUSED)) |
17 | { | 17 | { |
18 | const char *s; | 18 | const char *s; |
19 | USE_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */ | 19 | USE_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */ |
@@ -22,15 +22,17 @@ int tty_main(int argc, char **argv) | |||
22 | xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */ | 22 | xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */ |
23 | 23 | ||
24 | USE_INCLUDE_SUSv2(silent = getopt32(argv, "s");) | 24 | USE_INCLUDE_SUSv2(silent = getopt32(argv, "s");) |
25 | USE_INCLUDE_SUSv2(argc -= optind;) | ||
26 | SKIP_INCLUDE_SUSv2(argc -= 1;) | ||
25 | 27 | ||
26 | /* gnu tty outputs a warning that it is ignoring all args. */ | 28 | /* gnu tty outputs a warning that it is ignoring all args. */ |
27 | bb_warn_ignoring_args(argc - optind); | 29 | bb_warn_ignoring_args(argc); |
28 | 30 | ||
29 | retval = 0; | 31 | retval = 0; |
30 | 32 | ||
31 | s = ttyname(0); | 33 | s = ttyname(0); |
32 | if (s == NULL) { | 34 | if (s == NULL) { |
33 | /* According to SUSv3, ttyname can on fail with EBADF or ENOTTY. | 35 | /* According to SUSv3, ttyname can fail with EBADF or ENOTTY. |
34 | * We know the file descriptor is good, so failure means not a tty. */ | 36 | * We know the file descriptor is good, so failure means not a tty. */ |
35 | s = "not a tty"; | 37 | s = "not a tty"; |
36 | retval = 1; | 38 | retval = 1; |