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

libpwdgrp: rewritten to use malloced implementation

Browse Source 
This removed buffer size limitations.

function                                             old     new   delta
convert_to_struct                                      -     269    +269
getXXnam_r                                             -     204    +204
parse_common                                           -     185    +185
getXXnam                                               -     164    +164
tokenize                                               -     126    +126
bb_internal_getpwent_r                               102     167     +65
get_S                                                 30      88     +58
getgrouplist_internal                                195     240     +45
const_sp_db                                            -      20     +20
const_pw_db                                            -      20     +20
const_gr_db                                            -      20     +20
bb_internal_endpwent                                  27      36      +9
bb_internal_endgrent                                  27      36      +9
decode_one_format                                    726     734      +8
bb_internal_setpwent                                  17      24      +7
volume_id_probe_iso9660                              319     322      +3
scriptreplay_main                                    204     207      +3
mkfs_minix_main                                     2684    2687      +3
id_main                                              478     480      +2
hash_find                                            233     235      +2
pstree_main                                          321     322      +1
gr_off                                                 3       4      +1
expand_one_var                                      1579    1578      -1
pwf                                                    4       -      -4
grf                                                    4       -      -4
pack_gzip                                           1787    1780      -7
addattr32                                             67      56     -11
buffer_fill_and_print                                191     178     -13
dpkg_main                                           2944    2927     -17
bb_internal_setgrent                                  17       -     -17
bb_internal_getpwuid                                  38      19     -19
bb_internal_getgrgid                                  44      19     -25
bb_internal_getpwnam                                  38      11     -27
bb_internal_getgrnam                                  44      14     -30
bb_internal_fgetpwent_r                               51       -     -51
bb_internal_fgetgrent_r                               51       -     -51
bb_internal_getspnam_r                               121      42     -79
bb_internal_getpwnam_r                               121      39     -82
bb_internal_getgrent_r                               102       -    -102
bb__parsepwent                                       110       -    -110
bb_internal_getpwuid_r                               113       -    -113
bb_internal_getgrgid_r                               113       -    -113
bb__parsespent                                       120       -    -120
bb_internal_getgrnam_r                               121       -    -121
bb__pgsreader                                        213       -    -213
bb__parsegrent                                       226       -    -226
------------------------------------------------------------------------------
(add/remove: 8/13 grow/shrink: 14/11 up/down: 1224/-1556)    Total: -332 bytes
   text	   data	    bss	    dec	    hex	filename
 923471	    928	  17684	 942083	  e6003	busybox_old
 923167	    928	  17676	 941771	  e5ecb	busybox_unstripped

Signed-off-by: Tito Ragusa <farmatito@tiscali.it>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Tito Ragusa
2015-01-02 21:37:59 +01:00
committed by Denys Vlasenko
parent 78854520eb
commit 1da09cfacf
5 changed files with 394 additions and 1102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
libbb/bb_pwd.c
View File

@ -110,51 +110,3 @@ unsigned long FAST_FUNC get_ug_id(const char *s,
return xname2id(s);
return r;
}
/* Experimental "mallocing" API.
* The goal is nice: "we want to support a case when "guests" group is very large"
* but the code is butt-ugly.
*/
#if 0
static char *find_latest(char last, char *cp)
{
if (!cp)
return last;
cp += strlen(cp) + 1;
if (last < cp)
last = cp;
return last;
}
struct group* FAST_FUNC xmalloc_getgrnam(const char *name)
{
struct {
struct group gr;
// May still be not enough!
char buf[64*1024 - sizeof(struct group) - 16];
} *s;
struct group *grp;
int r;
char *last;
char **gr_mem;
s = xmalloc(sizeof(*s));
r = getgrnam_r(name, &s->gr, s->buf, sizeof(s->buf), &grp);
if (!grp) {
free(s);
return grp;
}
last = find_latest(s->buf, grp->gr_name);
last = find_latest(last, grp->gr_passwd);
gr_mem = grp->gr_mem;
while (*gr_mem)
last = find_latest(last, *gr_mem++);
gr_mem++; /* points past NULL */
if (last < (char*)gr_mem)
last = (char*)gr_mem;
//FIXME: what if we get not only truncated, but also moved here?
// grp->gr_name pointer and friends are invalid now!!!
s = xrealloc(s, last - (char*)s);
return grp;
}
#endif