Merge branch 'busybox' into merge

5 files changed, 47 insertions, 65 deletions

diff --git a/selinux/chcon.c b/selinux/chcon.c
index ae87fb554..3ddb2dd46 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -13,11 +13,6 @@
 //config:       depends on SELINUX
 //config:       help
 //config:       Enable support to change the security context of file.
-//config:
-//config:config FEATURE_CHCON_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on CHCON && LONG_OPTS
 
 //applet:IF_CHCON(APPLET(chcon, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -26,34 +21,24 @@
 //usage:#define chcon_trivial_usage
 //usage:       "[OPTIONS] CONTEXT FILE..."
 //usage:       "\n      chcon [OPTIONS] [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE..."
-//usage:        IF_FEATURE_CHCON_LONG_OPTIONS(
+//usage:        IF_LONG_OPTS(
 //usage:       "\n      chcon [OPTIONS] --reference=RFILE FILE..."
 //usage:        )
+//usage:
 //usage:#define chcon_full_usage "\n\n"
 //usage:       "Change the security context of each FILE to CONTEXT\n"
-//usage:        IF_FEATURE_CHCON_LONG_OPTIONS(
-//usage:     "\n        -v,--verbose            Verbose"
-//usage:     "\n        -c,--changes            Report changes made"
-//usage:     "\n        -h,--no-dereference     Affect symlinks instead of their targets"
-//usage:     "\n        -f,--silent,--quiet     Suppress most error messages"
-//usage:     "\n        --reference RFILE       Use RFILE's group instead of using a CONTEXT value"
-//usage:     "\n        -u,--user USER          Set user/role/type/range in the target"
-//usage:     "\n        -r,--role ROLE          security context"
-//usage:     "\n        -t,--type TYPE"
-//usage:     "\n        -l,--range RANGE"
-//usage:     "\n        -R,--recursive          Recurse"
-//usage:        )
-//usage:        IF_NOT_FEATURE_CHCON_LONG_OPTIONS(
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -c      Report changes made"
 //usage:     "\n        -h      Affect symlinks instead of their targets"
 //usage:     "\n        -f      Suppress most error messages"
+//usage:        IF_LONG_OPTS(
+//usage:     "\n        --reference RFILE Use RFILE's group instead of using a CONTEXT value"
+//usage:        )
 //usage:     "\n        -u USER Set user/role/type/range in the target security context"
 //usage:     "\n        -r ROLE"
 //usage:     "\n        -t TYPE"
 //usage:     "\n        -l RNG"
 //usage:     "\n        -R      Recurse"
-//usage:        )
 
 #include <selinux/context.h>
 
@@ -68,7 +53,7 @@
 #define OPT_TYPE                (1<<6)  /* 't' */
 #define OPT_RANGE               (1<<7)  /* 'l' */
 #define OPT_VERBOSE             (1<<8)  /* 'v' */
-#define OPT_REFERENCE           ((1<<9) * ENABLE_FEATURE_CHCON_LONG_OPTIONS)
+#define OPT_REFERENCE           ((1<<9) * ENABLE_LONG_OPTS)
 #define OPT_COMPONENT_SPECIFIED (OPT_USER | OPT_ROLE | OPT_TYPE | OPT_RANGE)
 
 static char *user = NULL;
@@ -157,7 +142,7 @@ skip:
         return rc;
 }
 
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
 static const char chcon_longopts[] ALIGN1 =
         "recursive\0"      No_argument       "R"
         "changes\0"        No_argument       "c"
@@ -180,20 +165,21 @@ int chcon_main(int argc UNUSED_PARAM, char **argv)
         char *fname;
         int i, errors = 0;
 
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
-        applet_long_options = chcon_longopts;
-#endif
-        opt_complementary = "-1"  /* at least 1 param */
-                ":?"  /* error if exclusivity constraints are violated */
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
+        getopt32long(argv, "^"
+                "Rchfu:r:t:l:v"
+                "\0"
+                "-1" /* at least 1 arg */
+                ":?" /* error if exclusivity constraints are violated */
+#if ENABLE_LONG_OPTS
                 ":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff"
 #endif
-                ":f--v:v--f";  /* 'verbose' and 'quiet' are exclusive */
-        getopt32(argv, "Rchfu:r:t:l:v",
-                &user, &role, &type, &range, &reference_file);
+                ":f--v:v--f"  /* 'verbose' and 'quiet' are exclusive */
+                , chcon_longopts,
+                &user, &role, &type, &range, &reference_file
+        );
         argv += optind;
 
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
         if (option_mask32 & OPT_REFERENCE) {
                 /* FIXME: lgetfilecon() should be used when '-h' is specified.
                  * But current implementation follows the original one. */
diff --git a/selinux/matchpathcon.c b/selinux/matchpathcon.c
index 3388d0857..e57120d3b 100644
--- a/selinux/matchpathcon.c
+++ b/selinux/matchpathcon.c
@@ -58,9 +58,13 @@ int matchpathcon_main(int argc UNUSED_PARAM, char **argv)
         unsigned opts;
         char *fcontext, *prefix, *path;
 
-        opt_complementary = "-1" /* at least one param reqd */
-                ":?:f--p:p--f"; /* mutually exclusive */
-        opts = getopt32(argv, "nNf:p:V", &fcontext, &prefix);
+        opts = getopt32(argv, "^"
+                        "nNf:p:V"
+                        "\0"
+                        "-1" /* at least one param reqd */
+                        ":?:f--p:p--f" /* mutually exclusive */
+                        , &fcontext, &prefix
+        );
         argv += optind;
 
         if (opts & OPT_NOT_TRANS) {
diff --git a/selinux/runcon.c b/selinux/runcon.c
index 09082d6c2..a5a394427 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -34,11 +34,6 @@
 //config:       depends on SELINUX
 //config:       help
 //config:       Enable support to run command in specified security context.
-//config:
-//config:config FEATURE_RUNCON_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on RUNCON && LONG_OPTS
 
 //applet:IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -50,20 +45,11 @@
 //usage:#define runcon_full_usage "\n\n"
 //usage:       "Run PROG in a different security context\n"
 //usage:     "\n        CONTEXT         Complete security context\n"
-//usage:        IF_FEATURE_RUNCON_LONG_OPTIONS(
-//usage:     "\n        -c,--compute    Compute process transition context before modifying"
-//usage:     "\n        -t,--type TYPE  Type (for same role as parent)"
-//usage:     "\n        -u,--user USER  User identity"
-//usage:     "\n        -r,--role ROLE  Role"
-//usage:     "\n        -l,--range RNG  Levelrange"
-//usage:        )
-//usage:        IF_NOT_FEATURE_RUNCON_LONG_OPTIONS(
 //usage:     "\n        -c      Compute process transition context before modifying"
 //usage:     "\n        -t TYPE Type (for same role as parent)"
 //usage:     "\n        -u USER User identity"
 //usage:     "\n        -r ROLE Role"
 //usage:     "\n        -l RNG  Levelrange"
-//usage:        )
 
 #include <selinux/context.h>
 /* from deprecated <selinux/flask.h>: */
@@ -108,7 +94,7 @@ static context_t runcon_compute_new_context(char *user, char *role, char *type,
         return con;
 }
 
-#if ENABLE_FEATURE_RUNCON_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
 static const char runcon_longopts[] ALIGN1 =
         "user\0"    Required_argument "u"
         "role\0"    Required_argument "r"
@@ -140,11 +126,12 @@ int runcon_main(int argc UNUSED_PARAM, char **argv)
 
         selinux_or_die();
 
-#if ENABLE_FEATURE_RUNCON_LONG_OPTIONS
-        applet_long_options = runcon_longopts;
-#endif
-        opt_complementary = "-1";
-        opts = getopt32(argv, "r:t:u:l:ch", &role, &type, &user, &range);
+        opts = getopt32long(argv, "^"
+                        "r:t:u:l:ch"
+                        "\0" "-1",
+                        runcon_longopts,
+                        &role, &type, &user, &range
+        );
         argv += optind;
 
         if (!(opts & OPTS_CONTEXT_COMPONENT)) {
diff --git a/selinux/sestatus.c b/selinux/sestatus.c
index daf4b223b..6954aca70 100644
--- a/selinux/sestatus.c
+++ b/selinux/sestatus.c
@@ -167,8 +167,7 @@ int sestatus_main(int argc UNUSED_PARAM, char **argv)
         const char *pol_path;
         int rc;
 
-        opt_complementary = "?0";  /* no arguments are required. */
-        opts = getopt32(argv, "vb");
+        opts = getopt32(argv, "^" "vb" "\0" "=0"/*no arguments*/);
 
         /* SELinux status: line */
         rc = is_selinux_enabled();
diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index 01106bd67..8da47d274 100644
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -610,17 +610,23 @@ int setfiles_main(int argc UNUSED_PARAM, char **argv)
 
         set_matchpathcon_flags(matchpathcon_flags);
 
-        opt_complementary = "vv:v--p:p--v:v--q:q--v";
         /* Option order must match OPT_x definitions! */
         if (applet_name[0] == 'r') { /* restorecon */
-                flags = getopt32(argv, "de:*f:ilnpqrsvo:FWR",
-                        &exclude_dir, &input_filename, &out_filename, &verbose);
+                flags = getopt32(argv, "^"
+                        "de:*f:ilnpqrsvo:FWR",
+                        "\0" "vv:v--p:p--v:v--q:q--v";
+                        &exclude_dir, &input_filename, &out_filename,
+                        &verbose
+                );
         } else { /* setfiles */
-                flags = getopt32(argv, "de:*f:ilnpqr:svo:FW"
-                                IF_FEATURE_SETFILES_CHECK_OPTION("c:"),
+                flags = getopt32(argv, "^"
+                        "de:*f:ilnpqr:svo:FW"
+                        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);
+                        IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)
+                        &verbose
+                );
         }
         argv += optind;
 
@@ -673,7 +679,7 @@ int setfiles_main(int argc UNUSED_PARAM, char **argv)
                         bb_show_usage();
                 xstat(argv[0], &sb);
                 if (!S_ISREG(sb.st_mode)) {
-                        bb_error_msg_and_die("spec file %s is not a regular file", argv[0]);
+                        bb_error_msg_and_die("'%s' is not a regular file", argv[0]);
                 }
                 /* Load the file contexts configuration and check it. */
                 rc = matchpathcon_init(argv[0]);