X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=selinux%2Fsetfiles.c;h=ca3fd93618b8e6e92f80f6927be4ae504e38edc3;hb=cfbd31a7fb0a2e76864432823da1aa956fbdfa25;hp=0a46437840b04c55a017dcbf41a08668c4ff069d;hpb=8131eea3dce5fba0dfb78e6083d1730423fad20b;p=oweals%2Fbusybox.git

diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index 0a4643784..ca3fd9361 100644
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -4,6 +4,46 @@
   Port to BusyBox (c) 2007 by Yuichi Nakamura <ynakam@hitachisoft.jp>
 */
 
+//usage:#define setfiles_trivial_usage
+//usage:       "[-dnpqsvW] [-e DIR]... [-o FILE] [-r alt_root_path]"
+//usage:	IF_FEATURE_SETFILES_CHECK_OPTION(
+//usage:       " [-c policyfile] spec_file"
+//usage:	)
+//usage:       " pathname"
+//usage:#define setfiles_full_usage "\n\n"
+//usage:       "Reset file contexts under pathname according to spec_file\n"
+//usage:	IF_FEATURE_SETFILES_CHECK_OPTION(
+//usage:     "\n	-c FILE	Check the validity of the contexts against the specified binary policy"
+//usage:	)
+//usage:     "\n	-d	Show which specification matched each file"
+//usage:     "\n	-l	Log changes in file labels to syslog"
+//usage:     "\n	-n	Don't change any file labels"
+//usage:     "\n	-q	Suppress warnings"
+//usage:     "\n	-r DIR	Use an alternate root path"
+//usage:     "\n	-e DIR	Exclude DIR"
+//usage:     "\n	-F	Force reset of context to match file_context for customizable files"
+//usage:     "\n	-o FILE	Save list of files with incorrect context"
+//usage:     "\n	-s	Take a list of files from stdin (instead of command line)"
+//usage:     "\n	-v	Show changes in file labels, if type or role are changing"
+//usage:     "\n	-vv	Show changes in file labels, if type, role, or user are changing"
+//usage:     "\n	-W	Display warnings about entries that had no matching files"
+//usage:
+//usage:#define restorecon_trivial_usage
+//usage:       "[-iFnRv] [-e EXCLUDEDIR]... [-o FILE] [-f FILE]"
+//usage:#define restorecon_full_usage "\n\n"
+//usage:       "Reset security contexts of files in pathname\n"
+//usage:     "\n	-i	Ignore files that don't exist"
+//usage:     "\n	-f FILE	File with list of files to process"
+//usage:     "\n	-e DIR	Directory to exclude"
+//usage:     "\n	-R,-r	Recurse"
+//usage:     "\n	-n	Don't change any file labels"
+//usage:     "\n	-o FILE	Save list of files with incorrect context"
+//usage:     "\n	-v	Verbose"
+//usage:     "\n	-vv	Show changed labels"
+//usage:     "\n	-F	Force reset of context to match file_context"
+//usage:     "\n		for customizable files, or the user section,"
+//usage:     "\n		if it has changed"
+
 #include "libbb.h"
 #if ENABLE_FEATURE_SETFILES_CHECK_OPTION
 #include <sepol/sepol.h>
@@ -35,8 +75,7 @@ struct globals {
 	dev_t dev_id; /* Device id where target file exists */
 	int nerr;
 	struct edir excludeArray[MAX_EXCLUDES];
-};
-
+} FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 void BUG_setfiles_globals_too_big(void);
 #define INIT_G() do { \
@@ -119,7 +158,6 @@ static void add_exclude(const char *directory)
 
 	if (directory == NULL || directory[0] != '/') {
 		bb_error_msg_and_die("full path required for exclude: %s", directory);
-
 	}
 	if (lstat(directory, &sb)) {
 		bb_error_msg("directory \"%s\" not found, ignoring", directory);
@@ -490,7 +528,7 @@ static int process_one(char *name)
 }
 
 int setfiles_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int setfiles_main(int argc, char **argv)
+int setfiles_main(int argc UNUSED_PARAM, char **argv)
 {
 	struct stat sb;
 	int rc, i = 0;
@@ -549,6 +587,7 @@ int setfiles_main(int argc, char **argv)
 				 IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)
 			&verbose);
 	}
+	argv += optind;
 
 #if ENABLE_FEATURE_SETFILES_CHECK_OPTION
 	if ((applet_name[0] == 's') && (flags & OPT_c)) {
@@ -595,24 +634,20 @@ int setfiles_main(int argc, char **argv)
 		   we can support either checking against the active policy or
 		   checking against a binary policy file. */
 		set_matchpathcon_canoncon(&canoncon);
-		if (argc == 1)
+		if (!argv[0])
 			bb_show_usage();
-		if (stat(argv[optind], &sb) < 0) {
-			bb_simple_perror_msg_and_die(argv[optind]);
-		}
+		xstat(argv[0], &sb);
 		if (!S_ISREG(sb.st_mode)) {
-			bb_error_msg_and_die("spec file %s is not a regular file", argv[optind]);
+			bb_error_msg_and_die("spec file %s is not a regular file", argv[0]);
 		}
 		/* Load the file contexts configuration and check it. */
-		rc = matchpathcon_init(argv[optind]);
+		rc = matchpathcon_init(argv[0]);
 		if (rc < 0) {
-			bb_simple_perror_msg_and_die(argv[optind]);
+			bb_simple_perror_msg_and_die(argv[0]);
 		}
-
-		optind++;
-
 		if (nerr)
 			exit(EXIT_FAILURE);
+		argv++;
 	}
 
 	if (input_filename) {
@@ -628,9 +663,9 @@ int setfiles_main(int argc, char **argv)
 		if (ENABLE_FEATURE_CLEAN_UP)
 			fclose_if_not_stdin(f);
 	} else {
-		if (optind >= argc)
+		if (!argv[0])
 			bb_show_usage();
-		for (i = optind; i < argc; i++) {
+		for (i = 0; argv[i]; i++) {
 			errors |= process_one(argv[i]);
 		}
 	}