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

setpriv: code shrink

Browse Source 
function                                             old     new   delta
parse_cap                                            125     117      -8
setpriv_main                                         949     933     -16
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-24)             Total: -24 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2017-08-20 20:21:31 +02:00
parent 20c0d07e95
commit ec2482e966
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
util-linux/setpriv.c
View File

@ -211,7 +211,7 @@ static void getcaps(struct caps *caps)
bb_simple_perror_msg_and_die("capget"); bb_simple_perror_msg_and_die("capget");
} }
static void parse_cap(unsigned long *index, const char *cap) static unsigned long parse_cap(const char *cap)
{ {
unsigned long i; unsigned long i;
@ -229,8 +229,7 @@ static void parse_cap(unsigned long *index, const char *cap)
if ((sscanf(cap, "cap_%lu", &i)) == 1) { if ((sscanf(cap, "cap_%lu", &i)) == 1) {
if (!cap_valid(i)) if (!cap_valid(i))
bb_error_msg_and_die("unsupported capability '%s'", cap); bb_error_msg_and_die("unsupported capability '%s'", cap);
*index = i; return i;
return;
} }
# if ENABLE_FEATURE_SETPRIV_CAPABILITY_NAMES # if ENABLE_FEATURE_SETPRIV_CAPABILITY_NAMES
@ -240,8 +239,7 @@ static void parse_cap(unsigned long *index, const char *cap)
if (!cap_valid(i)) if (!cap_valid(i))
bb_error_msg_and_die("unsupported capability '%s'", cap); bb_error_msg_and_die("unsupported capability '%s'", cap);
*index = i; return i;
return;
} }
# endif # endif
@ -258,7 +256,7 @@ static void set_inh_caps(char *capstring)
while (capstring) { while (capstring) {
unsigned long cap; unsigned long cap;
parse_cap(&cap, capstring); cap = parse_cap(capstring);
if (CAP_TO_INDEX(cap) >= caps.u32s) if (CAP_TO_INDEX(cap) >= caps.u32s)
bb_error_msg_and_die("invalid capability cap"); bb_error_msg_and_die("invalid capability cap");
@ -284,7 +282,7 @@ static void set_ambient_caps(char *string)
while (cap) { while (cap) {
unsigned long index; unsigned long index;
parse_cap(&index, cap); index = parse_cap(cap);
if (cap[0] == '+') { if (cap[0] == '+') {
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, index, 0, 0) < 0) if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, index, 0, 0) < 0)
bb_perror_msg("cap_ambient_raise"); bb_perror_msg("cap_ambient_raise");
@ -421,8 +419,8 @@ int setpriv_main(int argc UNUSED_PARAM, char **argv)
int opts; int opts;
IF_FEATURE_SETPRIV_CAPABILITIES(char *inh_caps, *ambient_caps;) IF_FEATURE_SETPRIV_CAPABILITIES(char *inh_caps, *ambient_caps;)
opts = getopt32long(argv, opts = getopt32long(argv, "+"
"+"IF_FEATURE_SETPRIV_DUMP("d") IF_FEATURE_SETPRIV_DUMP("d")
IF_FEATURE_SETPRIV_CAPABILITIES("\xfe:\xfd:"), IF_FEATURE_SETPRIV_CAPABILITIES("\xfe:\xfd:"),
setpriv_longopts setpriv_longopts
IF_FEATURE_SETPRIV_CAPABILITIES(, &inh_caps, &ambient_caps) IF_FEATURE_SETPRIV_CAPABILITIES(, &inh_caps, &ambient_caps)