diff options
author | Tito Ragusa <farmatito@tiscali.it> | 2015-02-19 22:02:59 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-02-19 22:03:56 +0100 |
commit | cb6a112f09c3b5dfe94b5c365ca50df4dcc05520 (patch) | |
tree | 726f543a539dd917ab8e6e97c17ad8c4ff6c5eb0 | |
parent | d7bfee1edb551d3503c7b616702a73192ba069a9 (diff) | |
download | busybox-w32-cb6a112f09c3b5dfe94b5c365ca50df4dcc05520.tar.gz busybox-w32-cb6a112f09c3b5dfe94b5c365ca50df4dcc05520.tar.bz2 busybox-w32-cb6a112f09c3b5dfe94b5c365ca50df4dcc05520.zip |
libpwdgrp: fix thinko in getpwnam
function old new delta
parse_file - 64 +64
getXXnam_r 162 138 -24
getXXnam 90 50 -40
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/2 up/down: 64/-64) Total: 0 bytes
Signed-off-by: Tito Ragusa <farmatito@tiscali.it>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | libpwdgrp/pwd_grp.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c index 7ec704ee4..3886facf0 100644 --- a/libpwdgrp/pwd_grp.c +++ b/libpwdgrp/pwd_grp.c | |||
@@ -450,15 +450,7 @@ static void* FAST_FUNC getXXnam(const char *name, unsigned db_and_field_pos) | |||
450 | char *buf; | 450 | char *buf; |
451 | struct passdb *db = &get_S()->db[db_and_field_pos >> 2]; | 451 | struct passdb *db = &get_S()->db[db_and_field_pos >> 2]; |
452 | 452 | ||
453 | if (!db->fp) { | 453 | buf = parse_file(db, name, db_and_field_pos & 3); |
454 | db->fp = fopen_for_read(db->filename); | ||
455 | if (!db->fp) { | ||
456 | return NULL; | ||
457 | } | ||
458 | close_on_exec_on(fileno(db->fp)); | ||
459 | } | ||
460 | |||
461 | buf = parse_common(db->fp, db, name, db_and_field_pos & 3); | ||
462 | return massage_data_for_non_r_func(db, buf); | 454 | return massage_data_for_non_r_func(db, buf); |
463 | } | 455 | } |
464 | 456 | ||