libbb: password/group function helpers rewritten by Tito:
function old new delta xgetpwuid - 27 +27 uid2uname_utoa - 22 +22 gid2group_utoa - 22 +22 uid2uname - 18 +18 gid2group - 18 +18 buffer_fill_and_print 179 196 +17 print_user 12 24 +12 print_group 12 24 +12 get_cached 89 99 +10 ... print_common 134 120 -14 vlock_main 415 396 -19 logger_main 410 387 -23 crontab_main 642 609 -33 bb_getpwuid 42 - -42 bb_getgrgid 42 - -42 bb_getug 80 - -80 ------------------------------------------------------------------------------ (add/remove: 6/3 grow/shrink: 9/11 up/down: 187/-296) Total: -109 bytes
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
|
||||
|
||||
typedef struct unsigned_to_name_map_t {
|
||||
unsigned id;
|
||||
long id;
|
||||
char name[USERNAME_MAX_SIZE];
|
||||
} unsigned_to_name_map_t;
|
||||
|
||||
@@ -52,8 +52,8 @@ static int get_cached(cache_t *cp, unsigned id)
|
||||
}
|
||||
#endif
|
||||
|
||||
typedef char* FAST_FUNC ug_func(char *name, int bufsize, long uid);
|
||||
static char* get_cached(cache_t *cp, unsigned id, ug_func* fp)
|
||||
static char* get_cached(cache_t *cp, long id,
|
||||
char* FAST_FUNC x2x_utoa(long id))
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < cp->size; i++)
|
||||
@@ -63,16 +63,16 @@ static char* get_cached(cache_t *cp, unsigned id, ug_func* fp)
|
||||
cp->cache = xrealloc_vector(cp->cache, 2, i);
|
||||
cp->cache[i].id = id;
|
||||
/* Never fails. Generates numeric string if name isn't found */
|
||||
fp(cp->cache[i].name, sizeof(cp->cache[i].name), id);
|
||||
safe_strncpy(cp->cache[i].name, x2x_utoa(id), sizeof(cp->cache[i].name));
|
||||
return cp->cache[i].name;
|
||||
}
|
||||
const char* FAST_FUNC get_cached_username(uid_t uid)
|
||||
{
|
||||
return get_cached(&username, uid, bb_getpwuid);
|
||||
return get_cached(&username, uid, uid2uname_utoa);
|
||||
}
|
||||
const char* FAST_FUNC get_cached_groupname(gid_t gid)
|
||||
{
|
||||
return get_cached(&groupname, gid, bb_getgrgid);
|
||||
return get_cached(&groupname, gid, gid2group_utoa);
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user