diff options
author | Tito Ragusa <farmatito@tiscali.it> | 2015-01-02 21:37:59 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-01-02 21:37:59 +0100 |
commit | 1da09cfacf1c4789cc74322857a098c2ddb06e31 (patch) | |
tree | 0121bddf6ed1d159ca76f2b350832e400bf83c26 /include/grp_.h | |
parent | 78854520ebecfd24d5c80a266d6779bd1e069016 (diff) | |
download | busybox-w32-1da09cfacf1c4789cc74322857a098c2ddb06e31.tar.gz busybox-w32-1da09cfacf1c4789cc74322857a098c2ddb06e31.tar.bz2 busybox-w32-1da09cfacf1c4789cc74322857a098c2ddb06e31.zip |
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 <farmatito@tiscali.it>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include/grp_.h')
-rw-r--r-- | include/grp_.h | 54 |
1 files changed, 1 insertions, 53 deletions
diff --git a/include/grp_.h b/include/grp_.h index e5075e5a0..f7b8d836f 100644 --- a/include/grp_.h +++ b/include/grp_.h | |||
@@ -30,17 +30,9 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN | |||
30 | * so that function calls are directed to bb_internal_XXX replacements | 30 | * so that function calls are directed to bb_internal_XXX replacements |
31 | */ | 31 | */ |
32 | #undef endgrent | 32 | #undef endgrent |
33 | #define setgrent bb_internal_setgrent | ||
34 | #define endgrent bb_internal_endgrent | 33 | #define endgrent bb_internal_endgrent |
35 | #define getgrent bb_internal_getgrent | ||
36 | #define fgetgrent bb_internal_fgetgrent | ||
37 | #define putgrent bb_internal_putgrent | ||
38 | #define getgrgid bb_internal_getgrgid | 34 | #define getgrgid bb_internal_getgrgid |
39 | #define getgrnam bb_internal_getgrnam | 35 | #define getgrnam bb_internal_getgrnam |
40 | #define getgrent_r bb_internal_getgrent_r | ||
41 | #define getgrgid_r bb_internal_getgrgid_r | ||
42 | #define getgrnam_r bb_internal_getgrnam_r | ||
43 | #define fgetgrent_r bb_internal_fgetgrent_r | ||
44 | #define getgrouplist bb_internal_getgrouplist | 36 | #define getgrouplist bb_internal_getgrouplist |
45 | #define initgroups bb_internal_initgroups | 37 | #define initgroups bb_internal_initgroups |
46 | 38 | ||
@@ -48,60 +40,16 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN | |||
48 | /* All function names below should be remapped by #defines above | 40 | /* All function names below should be remapped by #defines above |
49 | * in order to not collide with libc names. */ | 41 | * in order to not collide with libc names. */ |
50 | 42 | ||
51 | |||
52 | /* Rewind the group-file stream. */ | ||
53 | extern void setgrent(void); | ||
54 | |||
55 | /* Close the group-file stream. */ | 43 | /* Close the group-file stream. */ |
56 | extern void endgrent(void); | 44 | extern void endgrent(void); |
57 | 45 | ||
58 | #ifdef UNUSED_SINCE_WE_AVOID_STATIC_BUFS | ||
59 | /* Read an entry from the group-file stream, opening it if necessary. */ | ||
60 | extern struct group *getgrent(void); | ||
61 | |||
62 | /* Read a group entry from STREAM. */ | ||
63 | extern struct group *fgetgrent(FILE *__stream); | ||
64 | |||
65 | /* Write the given entry onto the given stream. */ | ||
66 | extern int putgrent(const struct group *__restrict __p, | ||
67 | FILE *__restrict __f); | ||
68 | #endif | ||
69 | |||
70 | /* Search for an entry with a matching group ID. */ | 46 | /* Search for an entry with a matching group ID. */ |
71 | extern struct group *getgrgid(gid_t __gid); | 47 | extern struct group *getgrgid(gid_t __gid); |
72 | 48 | ||
73 | /* Search for an entry with a matching group name. */ | 49 | /* Search for an entry with a matching group name. */ |
74 | extern struct group *getgrnam(const char *__name); | 50 | extern struct group *getgrnam(const char *__name); |
75 | 51 | ||
76 | /* Reentrant versions of some of the functions above. | 52 | /* Reentrant versions of some of the functions above. */ |
77 | |||
78 | PLEASE NOTE: the `getgrent_r' function is not (yet) standardized. | ||
79 | The interface may change in later versions of this library. But | ||
80 | the interface is designed following the principals used for the | ||
81 | other reentrant functions so the chances are good this is what the | ||
82 | POSIX people would choose. */ | ||
83 | |||
84 | extern int getgrent_r(struct group *__restrict __resultbuf, | ||
85 | char *__restrict __buffer, size_t __buflen, | ||
86 | struct group **__restrict __result); | ||
87 | |||
88 | /* Search for an entry with a matching group ID. */ | ||
89 | extern int getgrgid_r(gid_t __gid, struct group *__restrict __resultbuf, | ||
90 | char *__restrict __buffer, size_t __buflen, | ||
91 | struct group **__restrict __result); | ||
92 | |||
93 | /* Search for an entry with a matching group name. */ | ||
94 | extern int getgrnam_r(const char *__restrict __name, | ||
95 | struct group *__restrict __resultbuf, | ||
96 | char *__restrict __buffer, size_t __buflen, | ||
97 | struct group **__restrict __result); | ||
98 | |||
99 | /* Read a group entry from STREAM. This function is not standardized | ||
100 | an probably never will. */ | ||
101 | extern int fgetgrent_r(FILE *__restrict __stream, | ||
102 | struct group *__restrict __resultbuf, | ||
103 | char *__restrict __buffer, size_t __buflen, | ||
104 | struct group **__restrict __result); | ||
105 | 53 | ||
106 | /* Store at most *NGROUPS members of the group set for USER into | 54 | /* Store at most *NGROUPS members of the group set for USER into |
107 | *GROUPS. Also include GROUP. The actual number of groups found is | 55 | *GROUPS. Also include GROUP. The actual number of groups found is |