Merge branch 'busybox' into merge

1 files changed, 8 insertions, 6 deletions

diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index 8da47d274..740eaf8fb 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;