[Toybox] [PATCH] getenforce/setenforce cleanup

enh enh at google.com
Wed Mar 11 15:26:10 PDT 2015


getenforce/setenforce cleanup.

Fix the min/max number of arguments they'll accept.

Hide them behind TOYBOX_SELINUX.

Remove unnecessary #include. (This comes from portability.h now.)

diff --git a/toys/pending/getenforce.c b/toys/pending/getenforce.c
index ce43f52..a4dd8c8 100644
--- a/toys/pending/getenforce.c
+++ b/toys/pending/getenforce.c
@@ -2,11 +2,12 @@
  *
  * Copyright 2014 The Android Open Source Project

-USE_GETENFORCE(NEWTOY(getenforce, "", TOYFLAG_USR|TOYFLAG_SBIN))
+USE_GETENFORCE(NEWTOY(getenforce, ">0", TOYFLAG_USR|TOYFLAG_SBIN))

 config GETENFORCE
   bool "getenforce"
-  default n
+  depends on TOYBOX_SELINUX
+  default y
   help
     usage: getenforce

@@ -15,7 +16,6 @@ config GETENFORCE

 #define FOR_getenforce
 #include "toys.h"
-#include <selinux/selinux.h>

 void getenforce_main(void)
 {
diff --git a/toys/pending/setenforce.c b/toys/pending/setenforce.c
index 6953f5b..7b2a645 100644
--- a/toys/pending/setenforce.c
+++ b/toys/pending/setenforce.c
@@ -2,11 +2,12 @@
  *
  * Copyright 2014 The Android Open Source Project

-USE_SETENFORCE(NEWTOY(setenforce, "<1", TOYFLAG_USR|TOYFLAG_SBIN))
+USE_SETENFORCE(NEWTOY(setenforce, "<1>1", TOYFLAG_USR|TOYFLAG_SBIN))

 config SETENFORCE
   bool "setenforce"
-  default n
+  depends on TOYBOX_SELINUX
+  default y
   help
     usage: setenforce [enforcing|permissive|1|0]

@@ -15,7 +16,6 @@ config SETENFORCE

 #define FOR_setenforce
 #include "toys.h"
-#include <selinux/selinux.h>

 void setenforce_main(void)
 {

 1426112770.0


More information about the Toybox mailing list