emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: merge some common strings

Browse Source 
text   data    bss    dec    hexfilename
 838650   8009      0 846659  ceb43busybox_old
 838519   8009      0 846528  ceac0busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-03-23 16:25:17 +01:00
parent 37a658c4c8
commit 651a2697f7
22 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
selinux/chcon.c
View File

@@ -90,13 +90,13 @@ static int FAST_FUNC change_filedir_context(
if ((option_mask32 & OPT_VERBOSE) || ((option_mask32 & OPT_CHANHES) && !fail)) {
printf(!fail
? "context of %s changed to %s\n"
: "failed to change context of %s to %s\n",
: "can't change context of %s to %s\n",
fname, context_string);
}
if (!fail) {
rc = TRUE;
} else if ((option_mask32 & OPT_QUIET) == 0) {
bb_error_msg("failed to change context of %s to %s",
bb_error_msg("can't change context of %s to %s",
fname, context_string);
}
} else if (option_mask32 & OPT_VERBOSE) {

8
selinux/runcon.c
View File

@@ -59,13 +59,13 @@ static context_t runcon_compute_new_context(char *user, char *role, char *type,
if (!con)
bb_error_msg_and_die("'%s' is not a valid context", cur_context);
if (user && context_user_set(con, user))
bb_error_msg_and_die("failed to set new user '%s'", user);
bb_error_msg_and_die("can't set new user '%s'", user);
if (type && context_type_set(con, type))
bb_error_msg_and_die("failed to set new type '%s'", type);
bb_error_msg_and_die("can't set new type '%s'", type);
if (range && context_range_set(con, range))
bb_error_msg_and_die("failed to set new range '%s'", range);
bb_error_msg_and_die("can't set new range '%s'", range);
if (role && context_role_set(con, role))
bb_error_msg_and_die("failed to set new role '%s'", role);
bb_error_msg_and_die("can't set new role '%s'", role);
return con;
}