diff options
| author | Denis Vlasenko | 2007-03-13 13:01:14 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-03-13 13:01:14 +0000 |
| commit | 5df955fce2fbdc5b2acc365a120327ff943403da (patch) | |
| tree | 41763239e81807259b7532aeef540ebc4804ce3d /libbb/lineedit.c | |
| parent | c9c893d4f59418c50c8eb42bd80390026e123dd8 (diff) | |
| download | busybox-5df955fce2fbdc5b2acc365a120327ff943403da.zip busybox-5df955fce2fbdc5b2acc365a120327ff943403da.tar.gz | |
Do not fail password check if shadow password does not exist -
fall back to ordinary one
Reduced usage of functions returning datain static buffers.
(mostly passwd/group/shadow related):
function old new delta
correct_password 143 193 +50
sulogin_main 490 533 +43
adduser_main 732 774 +42
passwd_main 1875 1915 +40
addgroup_main 330 365 +35
bb_internal_getspnam 38 - -38
bb_internal_fgetpwent 38 - -38
bb_internal_fgetgrent 38 - -38
static.resultbuf 168 88 -80
static.buffer 1872 1104 -768
------------------------------------------------------------------------------
(add/remove: 0/3 grow/shrink: 5/2 up/down: 210/-962) Total: -752 bytes
Diffstat (limited to 'libbb/lineedit.c')
| -rw-r--r-- | libbb/lineedit.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 16256f7..61b88fd 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c @@ -342,15 +342,18 @@ static void username_tab_completion(char *ud, char *with_shash_flg) } } else { /* "~[^/]*" */ - setpwent(); + /* Using _r function to avoid pulling in static buffers */ + char line_buff[PWD_BUFFER_SIZE]; + struct passwd pwd; + struct passwd *result; - while ((entry = getpwent()) != NULL) { + setpwent(); + while (!getpwent_r(&pwd, line_buff, sizeof(line_buff), &result)) { /* Null usernames should result in all users as possible completions. */ - if ( /*!userlen || */ !strncmp(ud, entry->pw_name, userlen)) { - add_match(xasprintf("~%s/", entry->pw_name)); + if (/*!userlen || */ strncmp(ud, pwd.pw_name, userlen) == 0) { + add_match(xasprintf("~%s/", pwd.pw_name)); } } - endpwent(); } } |