ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*: fix fallout from opt_complementary conversion

Browse source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-23 15:08:25 +02:00
parent 12ffefb549
commit 8b77a9ea81
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
networking/ntpd.c
View file

@ -2235,7 +2235,7 @@ static NOINLINE void ntp_init(char **argv)
"wp:*S:"IF_FEATURE_NTPD_SERVER("l") /* NOT compat */ "wp:*S:"IF_FEATURE_NTPD_SERVER("l") /* NOT compat */
IF_FEATURE_NTPD_SERVER("I:") /* compat */ IF_FEATURE_NTPD_SERVER("I:") /* compat */
"d" /* compat */ "d" /* compat */
"46aAbgL", /* compat, ignored */ "46aAbgL" /* compat, ignored */
"\0" "\0"
"dd:wn" /* -d: counter; -p: list; -w implies -n */ "dd:wn" /* -d: counter; -p: list; -w implies -n */
IF_FEATURE_NTPD_SERVER(":Il") /* -I implies -l */ IF_FEATURE_NTPD_SERVER(":Il") /* -I implies -l */

14
selinux/setfiles.c
View file

@ -613,19 +613,21 @@ int setfiles_main(int argc UNUSED_PARAM, char **argv)
/* Option order must match OPT_x definitions! */ /* Option order must match OPT_x definitions! */
if (applet_name[0] == 'r') { /* restorecon */ if (applet_name[0] == 'r') { /* restorecon */
flags = getopt32(argv, "^" flags = getopt32(argv, "^"
"de:*f:ilnpqrsvo:FWR", "de:*f:ilnpqrsvo:FWR"
"\0" "vv:v--p:p--v:v--q:q--v"; "\0"
"vv:v--p:p--v:v--q:q--v",
&exclude_dir, &input_filename, &out_filename, &exclude_dir, &input_filename, &out_filename,
&verbose &verbose
); );
} else { /* setfiles */ } else { /* setfiles */
flags = getopt32(argv, "^" flags = getopt32(argv, "^"
"de:*f:ilnpqr:svo:FW" "de:*f:ilnpqr:svo:FW"
IF_FEATURE_SETFILES_CHECK_OPTION("c:"), IF_FEATURE_SETFILES_CHECK_OPTION("c:")
"\0" "vv:v--p:p--v:v--q:q--v"; "\0"
"vv:v--p:p--v:v--q:q--v",
&exclude_dir, &input_filename, &rootpath, &out_filename, &exclude_dir, &input_filename, &rootpath, &out_filename,
IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,) IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)
&verbose &verbose
); );
} }
argv += optind; argv += optind;