diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-04 14:15:38 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-04 14:15:38 +0100 |
commit | 2ec91aead52d6ea6a42420005119ebb281a76cdc (patch) | |
tree | 115804c56ff172f96c0138bcabcc7d5e56e5dae0 /init | |
parent | a355da07756e529c112249653ed5af0e2d910728 (diff) | |
download | busybox-w32-2ec91aead52d6ea6a42420005119ebb281a76cdc.tar.gz busybox-w32-2ec91aead52d6ea6a42420005119ebb281a76cdc.tar.bz2 busybox-w32-2ec91aead52d6ea6a42420005119ebb281a76cdc.zip |
*: remove some uses of argc
function old new delta
whoami_main 34 37 +3
logname_main 60 63 +3
hostid_main 35 38 +3
ttysize_main 136 135 -1
nmeter_main 673 672 -1
logger_main 387 386 -1
uuencode_main 330 328 -2
ifupdown_main 2125 2123 -2
mesg_main 158 155 -3
free_main 333 330 -3
cal_main 902 899 -3
acpid_main 443 440 -3
ar_main 196 189 -7
find_main 476 467 -9
ifconfig_main 1235 1221 -14
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/12 up/down: 9/-49) Total: -40 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'init')
-rw-r--r-- | init/mesg.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/init/mesg.c b/init/mesg.c index ca230f363..2e8b16e5d 100644 --- a/init/mesg.c +++ b/init/mesg.c | |||
@@ -16,21 +16,23 @@ | |||
16 | #endif | 16 | #endif |
17 | 17 | ||
18 | int mesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 18 | int mesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
19 | int mesg_main(int argc, char **argv) | 19 | int mesg_main(int argc UNUSED_PARAM, char **argv) |
20 | { | 20 | { |
21 | struct stat sb; | 21 | struct stat sb; |
22 | const char *tty; | 22 | const char *tty; |
23 | char c = 0; | 23 | char c = 0; |
24 | 24 | ||
25 | if (--argc == 0 | 25 | argv++; |
26 | || (argc == 1 && ((c = **++argv) == 'y' || c == 'n')) | 26 | |
27 | if (!argv[0] | ||
28 | || (!argv[1] && ((c = argv[0][0]) == 'y' || c == 'n')) | ||
27 | ) { | 29 | ) { |
28 | tty = xmalloc_ttyname(STDERR_FILENO); | 30 | tty = xmalloc_ttyname(STDERR_FILENO); |
29 | if (tty == NULL) { | 31 | if (tty == NULL) { |
30 | tty = "ttyname"; | 32 | tty = "ttyname"; |
31 | } else if (stat(tty, &sb) == 0) { | 33 | } else if (stat(tty, &sb) == 0) { |
32 | mode_t m; | 34 | mode_t m; |
33 | if (argc == 0) { | 35 | if (c == 0) { |
34 | puts((sb.st_mode & (S_IWGRP|S_IWOTH)) ? "is y" : "is n"); | 36 | puts((sb.st_mode & (S_IWGRP|S_IWOTH)) ? "is y" : "is n"); |
35 | return EXIT_SUCCESS; | 37 | return EXIT_SUCCESS; |
36 | } | 38 | } |