[prev in list] [next in list] [prev in thread] [next in thread]
List: busybox-cvs
Subject: svn commit: trunk/busybox: include selinux
From: vda () busybox ! net (vda at busybox ! net)
Date: 2007-07-24 6:17:44
Message-ID: 20070724061744.7A336A4645 () busybox ! net
[Download RAW message or body]
Author: vda
Date: 2007-07-23 23:17:43 -0700 (Mon, 23 Jul 2007)
New Revision: 19242
Log:
setfiles: small tweaks to usage text and code
Modified:
trunk/busybox/include/usage.h
trunk/busybox/selinux/setfiles.c
Changeset:
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h 2007-07-23 22:44:15 UTC (rev 19241)
+++ trunk/busybox/include/usage.h 2007-07-24 06:17:43 UTC (rev 19242)
@@ -2978,7 +2978,7 @@
"\n -d Show which specification matched each file" \
"\n -l Log changes in file labels to syslog" \
"\n -n Don't change any file labels" \
- "\n -q Suppress no-error output" \
+ "\n -q Suppress warnings" \
"\n -r dir Use an altenate root path" \
"\n -e dir Exclude directory" \
"\n -F Force reset of context to match file_context for customizable files" \
Modified: trunk/busybox/selinux/setfiles.c
===================================================================
--- trunk/busybox/selinux/setfiles.c 2007-07-23 22:44:15 UTC (rev 19241)
+++ trunk/busybox/selinux/setfiles.c 2007-07-24 06:17:43 UTC (rev 19242)
@@ -128,10 +128,10 @@
}
}
-static int add_exclude(const char *directory)
+static bool add_exclude(const char *const directory)
{
struct stat sb;
- size_t len = 0;
+ size_t len;
if (directory == NULL || directory[0] != '/') {
bb_error_msg("full path required for exclude: %s", directory);
@@ -161,7 +161,7 @@
return 0;
}
-static int exclude(const char *file)
+static bool exclude(const char *file)
{
int i = 0;
for (i = 0; i < excludeCtr; i++) {
@@ -268,7 +268,7 @@
/* Compare two contexts to see if their differences are "significant",
* or whether the only difference is in the user. */
-static int only_changed_user(const char *a, const char *b)
+static bool only_changed_user(const char *a, const char *b)
{
if (FLAG_F_force)
return 0;
@@ -289,7 +289,7 @@
int i, j, ret;
char *context = NULL;
char *newcon = NULL;
- int user_only_changed = 0;
+ bool user_only_changed = 0;
size_t len = strlen(my_file);
int retval = 0;
@@ -561,7 +561,7 @@
set_matchpathcon_flags(matchpathcon_flags);
- opt_complementary = "e::vv:v--p:p--v";
+ opt_complementary = "e::vv:v--p:p--v:v--q:q--v";
/* Option order must match OPT_x definitions! */
if (applet_name[0] == 'r') { /* restorecon */
flags = getopt32(argc, argv, "de:f:ilnpqrsvo:FWR",
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic