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/pwd_.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/pwd_.h')
-rw-r--r-- | include/pwd_.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/include/pwd_.h b/include/pwd_.h index 625b6f5a2..d086f86e3 100644 --- a/include/pwd_.h +++ b/include/pwd_.h | |||
@@ -34,20 +34,14 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN | |||
34 | #define setpwent bb_internal_setpwent | 34 | #define setpwent bb_internal_setpwent |
35 | #define endpwent bb_internal_endpwent | 35 | #define endpwent bb_internal_endpwent |
36 | #define getpwent bb_internal_getpwent | 36 | #define getpwent bb_internal_getpwent |
37 | #define fgetpwent bb_internal_fgetpwent | ||
38 | #define putpwent bb_internal_putpwent | ||
39 | #define getpwuid bb_internal_getpwuid | 37 | #define getpwuid bb_internal_getpwuid |
40 | #define getpwnam bb_internal_getpwnam | 38 | #define getpwnam bb_internal_getpwnam |
41 | #define getpwent_r bb_internal_getpwent_r | 39 | #define getpwent_r bb_internal_getpwent_r |
42 | #define getpwuid_r bb_internal_getpwuid_r | ||
43 | #define getpwnam_r bb_internal_getpwnam_r | 40 | #define getpwnam_r bb_internal_getpwnam_r |
44 | #define fgetpwent_r bb_internal_fgetpwent_r | ||
45 | |||
46 | 41 | ||
47 | /* All function names below should be remapped by #defines above | 42 | /* All function names below should be remapped by #defines above |
48 | * in order to not collide with libc names. */ | 43 | * in order to not collide with libc names. */ |
49 | 44 | ||
50 | |||
51 | /* Rewind the password-file stream. */ | 45 | /* Rewind the password-file stream. */ |
52 | extern void setpwent(void); | 46 | extern void setpwent(void); |
53 | 47 | ||
@@ -57,13 +51,6 @@ extern void endpwent(void); | |||
57 | #ifdef UNUSED_SINCE_WE_AVOID_STATIC_BUFS | 51 | #ifdef UNUSED_SINCE_WE_AVOID_STATIC_BUFS |
58 | /* Read an entry from the password-file stream, opening it if necessary. */ | 52 | /* Read an entry from the password-file stream, opening it if necessary. */ |
59 | extern struct passwd *getpwent(void); | 53 | extern struct passwd *getpwent(void); |
60 | |||
61 | /* Read an entry from STREAM. */ | ||
62 | extern struct passwd *fgetpwent(FILE *__stream); | ||
63 | |||
64 | /* Write the given entry onto the given stream. */ | ||
65 | extern int putpwent(const struct passwd *__restrict __p, | ||
66 | FILE *__restrict __f); | ||
67 | #endif | 54 | #endif |
68 | 55 | ||
69 | /* Search for an entry with a matching user ID. */ | 56 | /* Search for an entry with a matching user ID. */ |
@@ -84,23 +71,11 @@ extern int getpwent_r(struct passwd *__restrict __resultbuf, | |||
84 | char *__restrict __buffer, size_t __buflen, | 71 | char *__restrict __buffer, size_t __buflen, |
85 | struct passwd **__restrict __result); | 72 | struct passwd **__restrict __result); |
86 | 73 | ||
87 | extern int getpwuid_r(uid_t __uid, | ||
88 | struct passwd *__restrict __resultbuf, | ||
89 | char *__restrict __buffer, size_t __buflen, | ||
90 | struct passwd **__restrict __result); | ||
91 | |||
92 | extern int getpwnam_r(const char *__restrict __name, | 74 | extern int getpwnam_r(const char *__restrict __name, |
93 | struct passwd *__restrict __resultbuf, | 75 | struct passwd *__restrict __resultbuf, |
94 | char *__restrict __buffer, size_t __buflen, | 76 | char *__restrict __buffer, size_t __buflen, |
95 | struct passwd **__restrict __result); | 77 | struct passwd **__restrict __result); |
96 | 78 | ||
97 | /* Read an entry from STREAM. This function is not standardized and | ||
98 | probably never will. */ | ||
99 | extern int fgetpwent_r(FILE *__restrict __stream, | ||
100 | struct passwd *__restrict __resultbuf, | ||
101 | char *__restrict __buffer, size_t __buflen, | ||
102 | struct passwd **__restrict __result); | ||
103 | |||
104 | POP_SAVED_FUNCTION_VISIBILITY | 79 | POP_SAVED_FUNCTION_VISIBILITY |
105 | 80 | ||
106 | #endif | 81 | #endif |