diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-21 23:05:26 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-21 23:05:26 +0000 |
| commit | 5415c856eaccd1bc5d064022770a288f43b2e94f (patch) | |
| tree | 5973db4e6f81b5e311e8944700ded5db1083d440 /libpwdgrp | |
| parent | b74a2dba571d1c5a6127c683fb50923336d9c59f (diff) | |
| download | busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.tar.gz busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.tar.bz2 busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.zip | |
libbb: [x]fopen_for_{read,write} introduced and used.
(by Valdimir)
function old new delta
config_open2 - 41 +41
config_read 507 542 +35
find_pair 169 187 +18
fopen_for_write - 14 +14
fopen_for_read - 14 +14
find_main 406 418 +12
xfopen_for_write - 10 +10
xfopen_for_read - 10 +10
popstring 134 140 +6
parse_inittab 396 401 +5
next_token 923 928 +5
pack_gzip 1659 1661 +2
bb__parsespent 117 119 +2
fallbackSort 1719 1717 -2
evalvar 1376 1374 -2
qrealloc 36 33 -3
...
...
...
...
singlemount 4579 4569 -10
process_stdin 443 433 -10
patch_main 1111 1101 -10
ifupdown_main 2175 2165 -10
file_action_grep 90 80 -10
uuidcache_init 649 637 -12
hush_main 797 785 -12
read_config 230 217 -13
dpkg_main 3835 3820 -15
read_line_input 3134 3110 -24
sysctl_main 232 203 -29
config_open 40 10 -30
WARN_BAD_LINE 44 - -44
login_main 1714 1575 -139
------------------------------------------------------------------------------
(add/remove: 5/1 grow/shrink: 8/74 up/down: 174/-737) Total: -563 bytes
Diffstat (limited to 'libpwdgrp')
| -rw-r--r-- | libpwdgrp/pwd_grp.c | 8 | ||||
| -rw-r--r-- | libpwdgrp/pwd_grp_internal.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c index 867caf096..206519084 100644 --- a/libpwdgrp/pwd_grp.c +++ b/libpwdgrp/pwd_grp.c | |||
| @@ -464,7 +464,7 @@ int getpwent_r(struct passwd *__restrict resultbuf, | |||
| 464 | *result = NULL; /* In case of error... */ | 464 | *result = NULL; /* In case of error... */ |
| 465 | 465 | ||
| 466 | if (!pwf) { | 466 | if (!pwf) { |
| 467 | pwf = fopen(_PATH_PASSWD, "r"); | 467 | pwf = fopen_for_read(_PATH_PASSWD); |
| 468 | if (!pwf) { | 468 | if (!pwf) { |
| 469 | rv = errno; | 469 | rv = errno; |
| 470 | goto ERR; | 470 | goto ERR; |
| @@ -511,7 +511,7 @@ int getgrent_r(struct group *__restrict resultbuf, | |||
| 511 | *result = NULL; /* In case of error... */ | 511 | *result = NULL; /* In case of error... */ |
| 512 | 512 | ||
| 513 | if (!grf) { | 513 | if (!grf) { |
| 514 | grf = fopen(_PATH_GROUP, "r"); | 514 | grf = fopen_for_read(_PATH_GROUP); |
| 515 | if (!grf) { | 515 | if (!grf) { |
| 516 | rv = errno; | 516 | rv = errno; |
| 517 | goto ERR; | 517 | goto ERR; |
| @@ -558,7 +558,7 @@ int getspent_r(struct spwd *resultbuf, char *buffer, | |||
| 558 | *result = NULL; /* In case of error... */ | 558 | *result = NULL; /* In case of error... */ |
| 559 | 559 | ||
| 560 | if (!spf) { | 560 | if (!spf) { |
| 561 | spf = fopen(_PATH_SHADOW, "r"); | 561 | spf = fopen_for_read(_PATH_SHADOW); |
| 562 | if (!spf) { | 562 | if (!spf) { |
| 563 | rv = errno; | 563 | rv = errno; |
| 564 | goto ERR; | 564 | goto ERR; |
| @@ -630,7 +630,7 @@ int initgroups(const char *user, gid_t gid) | |||
| 630 | char buff[PWD_BUFFER_SIZE]; | 630 | char buff[PWD_BUFFER_SIZE]; |
| 631 | 631 | ||
| 632 | rv = -1; | 632 | rv = -1; |
| 633 | grfile = fopen(_PATH_GROUP, "r"); | 633 | grfile = fopen_for_read(_PATH_GROUP); |
| 634 | if (grfile != NULL) { | 634 | if (grfile != NULL) { |
| 635 | 635 | ||
| 636 | /* We alloc space for 8 gids at a time. */ | 636 | /* We alloc space for 8 gids at a time. */ |
diff --git a/libpwdgrp/pwd_grp_internal.c b/libpwdgrp/pwd_grp_internal.c index d55edc349..ffdc85e4e 100644 --- a/libpwdgrp/pwd_grp_internal.c +++ b/libpwdgrp/pwd_grp_internal.c | |||
| @@ -32,7 +32,7 @@ int GETXXKEY_R_FUNC(GETXXKEY_R_KEYTYPE key, | |||
| 32 | 32 | ||
| 33 | *result = NULL; | 33 | *result = NULL; |
| 34 | 34 | ||
| 35 | stream = fopen(GETXXKEY_R_PATHNAME, "r"); | 35 | stream = fopen_for_read(GETXXKEY_R_PATHNAME); |
| 36 | if (!stream) | 36 | if (!stream) |
| 37 | return errno; | 37 | return errno; |
| 38 | while (1) { | 38 | while (1) { |