Merge remote-tracking branch 'upstream/master'

2 files changed, 5 insertions, 6 deletions

diff --git a/selinux/runcon.c b/selinux/runcon.c
index b70a5e396..54349b25c 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -132,6 +132,5 @@ int runcon_main(int argc UNUSED_PARAM, char **argv)
                 bb_error_msg_and_die("can't set up security context '%s'",
                                      context_str(con));
 
-        execvp(argv[0], argv);
-        bb_perror_msg_and_die("can't execute '%s'", argv[0]);
+        BB_EXECVP_or_die(argv);
 }
diff --git a/selinux/sestatus.c b/selinux/sestatus.c
index 7fb2b470b..aa12e806c 100644
--- a/selinux/sestatus.c
+++ b/selinux/sestatus.c
@@ -12,10 +12,10 @@
 
 extern char *selinux_mnt;
 
-#define OPT_VERBOSE     (1 << 0)
-#define OPT_BOOLEAN     (1 << 1)
+#define OPT_VERBOSE  (1 << 0)
+#define OPT_BOOLEAN  (1 << 1)
 
-#define COL_FMT         "%-31s "
+#define COL_FMT  "%-31s "
 
 static void display_boolean(void)
 {
@@ -151,7 +151,7 @@ int sestatus_main(int argc UNUSED_PARAM, char **argv)
         const char *pol_path;
         int rc;
 
-        opt_complementary = "?0";       /* no arguments are required. */
+        opt_complementary = "?0";  /* no arguments are required. */
         opts = getopt32(argv, "vb");
 
         /* SELinux status: line */