[git commit] *: fix fallout from opt_complementary conversion

Denys Vlasenko vda.linux at googlemail.com
Wed Aug 23 13:08:25 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=8b77a9ea81a0bd89ee69e7742d9b920dd1562763
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/ntpd.c  |  2 +-
 selinux/setfiles.c | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/networking/ntpd.c b/networking/ntpd.c
index 25fa443..4f881ea 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -2235,7 +2235,7 @@ static NOINLINE void ntp_init(char **argv)
 			"wp:*S:"IF_FEATURE_NTPD_SERVER("l") /* NOT compat */
 			IF_FEATURE_NTPD_SERVER("I:") /* compat */
 			"d" /* compat */
-			"46aAbgL", /* compat, ignored */
+			"46aAbgL" /* compat, ignored */
 				"\0"
 				"dd:wn"  /* -d: counter; -p: list; -w implies -n */
 				IF_FEATURE_NTPD_SERVER(":Il") /* -I implies -l */
diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index 8da47d2..740eaf8 100644
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -613,19 +613,21 @@ int setfiles_main(int argc UNUSED_PARAM, char **argv)
 	/* Option order must match OPT_x definitions! */
 	if (applet_name[0] == 'r') { /* restorecon */
 		flags = getopt32(argv, "^"
-			"de:*f:ilnpqrsvo:FWR",
-			"\0" "vv:v--p:p--v:v--q:q--v";
+			"de:*f:ilnpqrsvo:FWR"
+				"\0"
+				"vv:v--p:p--v:v--q:q--v",
 			&exclude_dir, &input_filename, &out_filename,
-			&verbose
+				&verbose
 		);
 	} else { /* setfiles */
 		flags = getopt32(argv, "^"
 			"de:*f:ilnpqr:svo:FW"
-			IF_FEATURE_SETFILES_CHECK_OPTION("c:"),
-			"\0" "vv:v--p:p--v:v--q:q--v";
+			IF_FEATURE_SETFILES_CHECK_OPTION("c:")
+				"\0"
+				"vv:v--p:p--v:v--q:q--v",
 			&exclude_dir, &input_filename, &rootpath, &out_filename,
 			IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)
-			&verbose
+				&verbose
 		);
 	}
 	argv += optind;


More information about the busybox-cvs mailing list