emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: remove some uses of argc

Browse Source 
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>
This commit is contained in:
Denys Vlasenko
2010-01-04 14:15:38 +01:00
parent a355da0775
commit 2ec91aead5
26 changed files with 77 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
selinux/setfiles.c
View File

@ -490,7 +490,7 @@ static int process_one(char *name)
}
int setfiles_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int setfiles_main(int argc, char **argv)
int setfiles_main(int argc UNUSED_PARAM, char **argv)
{
struct stat sb;
int rc, i = 0;
@ -549,6 +549,7 @@ int setfiles_main(int argc, char **argv)
IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)
&verbose);
}
argv += optind;
#if ENABLE_FEATURE_SETFILES_CHECK_OPTION
if ((applet_name[0] == 's') && (flags & OPT_c)) {
@ -595,24 +596,20 @@ int setfiles_main(int argc, char **argv)
we can support either checking against the active policy or
checking against a binary policy file. */
set_matchpathcon_canoncon(&canoncon);
if (argc == 1)
if (!argv[0])
bb_show_usage();
if (stat(argv[optind], &sb) < 0) {
bb_simple_perror_msg_and_die(argv[optind]);
}
xstat(argv[0], &sb);
if (!S_ISREG(sb.st_mode)) {
bb_error_msg_and_die("spec file %s is not a regular file", argv[optind]);
bb_error_msg_and_die("spec file %s is not a regular file", argv[0]);
}
/* Load the file contexts configuration and check it. */
rc = matchpathcon_init(argv[optind]);
rc = matchpathcon_init(argv[0]);
if (rc < 0) {
bb_simple_perror_msg_and_die(argv[optind]);
bb_simple_perror_msg_and_die(argv[0]);
}
optind++;
if (nerr)
exit(EXIT_FAILURE);
argv++;
}
if (input_filename) {
@ -628,9 +625,9 @@ int setfiles_main(int argc, char **argv)
if (ENABLE_FEATURE_CLEAN_UP)
fclose_if_not_stdin(f);
} else {
if (optind >= argc)
if (!argv[0])
bb_show_usage();
for (i = optind; i < argc; i++) {
for (i = 0; argv[i]; i++) {
errors |= process_one(argv[i]);
}
}