aboutsummaryrefslogtreecommitdiff
path: root/selinux
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-08-12 20:58:27 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-08-12 20:58:27 +0000
commit6ca409e0e4c198fe3081346eebbae3f068fe605a (patch)
tree060cb05d99220a1eda399194d1209c269f0e8cd8 /selinux
parent4185548984357df91311f30c8e43d95f33922576 (diff)
downloadbusybox-6ca409e0e4c198fe3081346eebbae3f068fe605a.tar.gz
busybox-6ca409e0e4c198fe3081346eebbae3f068fe605a.tar.bz2
trylink: produce even more info about final link stage
trylink: explain how to modify link and drastically decrease amount of padding (unfortunately, needs hand editing ATM). *: add ALIGN1 / ALIGN2 to global strings and arrays of bytes and shorts size saving: 0.5k
Diffstat (limited to 'selinux')
-rw-r--r--selinux/chcon.c2
-rw-r--r--selinux/runcon.c4
-rw-r--r--selinux/setfiles.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/selinux/chcon.c b/selinux/chcon.c
index 6e98c4ab9..a9552281d 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -105,7 +105,7 @@ skip:
}
#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
-static const char chcon_longopts[] =
+static const char chcon_longopts[] ALIGN1 =
"recursive\0" No_argument "R"
"changes\0" No_argument "c"
"no-dereference\0" No_argument "h"
diff --git a/selinux/runcon.c b/selinux/runcon.c
index 5f9e3fd12..6c3f518fc 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -69,7 +69,7 @@ static context_t runcon_compute_new_context(char *user, char *role, char *type,
}
#if ENABLE_FEATURE_RUNCON_LONG_OPTIONS
-static const char runcon_options[] =
+static const char runcon_longopts[] ALIGN1 =
"user\0" Required_argument "u"
"role\0" Required_argument "r"
"type\0" Required_argument "t"
@@ -101,7 +101,7 @@ int runcon_main(int argc, char **argv)
selinux_or_die();
#if ENABLE_FEATURE_RUNCON_LONG_OPTIONS
- applet_long_options = runcon_options;
+ applet_long_options = runcon_longopts;
#endif
opt_complementary = "-1";
opts = getopt32(argc, argv, "r:t:u:l:ch", &role, &type, &user, &range);
diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index df77d6053..dcc8cbb5f 100644
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -409,7 +409,7 @@ static int apply_spec(const char *file,
static int canoncon(const char *path, unsigned lineno, char **contextp)
{
- static const char err_msg[] = "%s: line %u has invalid context %s";
+ static const char err_msg[] ALIGN1 = "%s: line %u has invalid context %s";
char *tmpcon;
char *context = *contextp;