From 1da09cfacf1c4789cc74322857a098c2ddb06e31 Mon Sep 17 00:00:00 2001 From: Tito Ragusa Date: Fri, 2 Jan 2015 21:37:59 +0100 Subject: libpwdgrp: rewritten to use malloced implementation 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 Signed-off-by: Denys Vlasenko Signed-off-by: Denys Vlasenko --- libpwdgrp/pwd_grp_internal.c | 61 -------------------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 libpwdgrp/pwd_grp_internal.c (limited to 'libpwdgrp/pwd_grp_internal.c') diff --git a/libpwdgrp/pwd_grp_internal.c b/libpwdgrp/pwd_grp_internal.c deleted file mode 100644 index d6483be84..000000000 --- a/libpwdgrp/pwd_grp_internal.c +++ /dev/null @@ -1,61 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* Copyright (C) 2003 Manuel Novoa III - * - * Licensed under GPLv2 or later, see file LICENSE in this source tree. - */ - -/* Nov 6, 2003 Initial version. - * - * NOTE: This implementation is quite strict about requiring all - * field seperators. It also does not allow leading whitespace - * except when processing the numeric fields. glibc is more - * lenient. See the various glibc difference comments below. - * - * TODO: - * Move to dynamic allocation of (currently statically allocated) - * buffers; especially for the group-related functions since - * large group member lists will cause error returns. - */ - -#ifndef GETXXKEY_R_FUNC -#error GETXXKEY_R_FUNC is not defined! -#endif - -int GETXXKEY_R_FUNC(GETXXKEY_R_KEYTYPE key, - GETXXKEY_R_ENTTYPE *__restrict resultbuf, - char *__restrict buffer, size_t buflen, - GETXXKEY_R_ENTTYPE **__restrict result) -{ - FILE *stream; - int rv; - - *result = NULL; - - stream = fopen_for_read(GETXXKEY_R_PATHNAME); - if (!stream) - return errno; - while (1) { - rv = bb__pgsreader(GETXXKEY_R_PARSER, resultbuf, buffer, buflen, stream); - if (!rv) { - if (GETXXKEY_R_TEST(resultbuf)) { /* found key? */ - *result = resultbuf; - break; - } - } else { - if (rv == ENOENT) { /* EOF encountered */ - rv = 0; - } - break; - } - } - fclose(stream); - - return rv; -} - -#undef GETXXKEY_R_FUNC -#undef GETXXKEY_R_PARSER -#undef GETXXKEY_R_ENTTYPE -#undef GETXXKEY_R_TEST -#undef GETXXKEY_R_KEYTYPE -#undef GETXXKEY_R_PATHNAME -- cgit v1.2.3