run-init: new applet

function                                             old     new   delta
switch_root_main                                     354     637    +283
drop_usermodehelper                                    -     157    +157
cap_name_to_number                                     -      77     +77
packed_usage                                       31707   31743     +36
applet_names                                        2665    2674      +9
applet_main                                         1544    1548      +4
applet_install_loc                                   193     194      +1
setpriv_main                                         933     928      -5
getcaps                                              131     122      -9
parse_cap                                            117      29     -88
------------------------------------------------------------------------------
(add/remove: 3/0 grow/shrink: 5/3 up/down: 567/-102)          Total: 465 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 5 insertions, 50 deletions

diff --git a/util-linux/setpriv.c b/util-linux/setpriv.c
index 9f2793949..12ab1bd66 100644
--- a/util-linux/setpriv.c
+++ b/util-linux/setpriv.c
@@ -124,48 +124,7 @@ enum {
 };
 
 #if ENABLE_FEATURE_SETPRIV_CAPABILITIES
-struct caps {
-        struct __user_cap_header_struct header;
-        cap_user_data_t data;
-        int u32s;
-};
-
-static void getcaps(struct caps *caps)
-{
-        static const uint8_t versions[] = {
-                _LINUX_CAPABILITY_U32S_3, /* = 2 (fits into byte) */
-                _LINUX_CAPABILITY_U32S_2, /* = 2 */
-                _LINUX_CAPABILITY_U32S_1, /* = 1 */
-        };
-        int i;
-
-        caps->header.pid = 0;
-        for (i = 0; i < ARRAY_SIZE(versions); i++) {
-                caps->header.version = versions[i];
-                if (capget(&caps->header, NULL) == 0)
-                        goto got_it;
-        }
-        bb_simple_perror_msg_and_die("capget");
- got_it:
-
-        switch (caps->header.version) {
-                case _LINUX_CAPABILITY_VERSION_1:
-                        caps->u32s = _LINUX_CAPABILITY_U32S_1;
-                        break;
-                case _LINUX_CAPABILITY_VERSION_2:
-                        caps->u32s = _LINUX_CAPABILITY_U32S_2;
-                        break;
-                case _LINUX_CAPABILITY_VERSION_3:
-                        caps->u32s = _LINUX_CAPABILITY_U32S_3;
-                        break;
-                default:
-                        bb_error_msg_and_die("unsupported capability version");
-        }
-
-        caps->data = xmalloc(sizeof(caps->data[0]) * caps->u32s);
-        if (capget(&caps->header, caps->data) < 0)
-                bb_simple_perror_msg_and_die("capget");
-}
+DEFINE_STRUCT_CAPS;
 
 static unsigned parse_cap(const char *cap)
 {
@@ -195,7 +154,7 @@ static void set_inh_caps(char *capstring)
 
                 cap = parse_cap(capstring);
                 if (CAP_TO_INDEX(cap) >= caps.u32s)
-                        bb_error_msg_and_die("invalid capability cap");
+                        bb_error_msg_and_die("invalid capability '%s'", capstring);
 
                 if (capstring[0] == '+')
                         caps.data[CAP_TO_INDEX(cap)].inheritable |= CAP_TO_MASK(cap);
@@ -204,11 +163,8 @@ static void set_inh_caps(char *capstring)
                 capstring = strtok(NULL, ",");
         }
 
-        if ((capset(&caps.header, caps.data)) < 0)
+        if (capset(&caps.header, caps.data) != 0)
                 bb_perror_msg_and_die("capset");
-
-        if (ENABLE_FEATURE_CLEAN_UP)
-                free(caps.data);
 }
 
 static void set_ambient_caps(char *string)
@@ -322,10 +278,9 @@ static int dump(void)
         bb_putchar('\n');
 # endif
 
-        if (ENABLE_FEATURE_CLEAN_UP) {
-                IF_FEATURE_SETPRIV_CAPABILITIES(free(caps.data);)
+        if (ENABLE_FEATURE_CLEAN_UP)
                 free(gids);
-        }
+
         return EXIT_SUCCESS;
 }
 #endif /* FEATURE_SETPRIV_DUMP */