diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-15 23:28:11 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-15 23:28:11 +0100 |
| commit | a7ccdeef396700d1ed78b9f97de0d10c706b169f (patch) | |
| tree | 4ef45efdaaac81d2a4c31b16d9cc36ba2d3a22e1 /libbb | |
| parent | 647553a4fcbbc169b4390d9ef8e4657f0ffe1a5f (diff) | |
| download | busybox-a7ccdeef396700d1ed78b9f97de0d10c706b169f.tar.gz | |
libbb: added xfdopen_for_read/write
function old new delta
xfdopen_helper - 40 +40
logdir_open 1163 1184 +21
process_stdin 433 443 +10
xfdopen_for_write - 9 +9
doCommands 2465 2474 +9
patch_main 1214 1222 +8
bbunpack 457 465 +8
xfdopen_for_read - 7 +7
scan_tree 258 262 +4
xstrtoul_range_sfx 230 231 +1
sendmail_main 957 955 -2
passwd_main 1027 1023 -4
parse 969 964 -5
test_main 253 247 -6
sed_main 655 649 -6
dos2unix_main 437 429 -8
fbsplash_main 950 938 -12
handle_dir_common 371 354 -17
expand_vars_to_list 2197 2169 -28
update_passwd 1275 1246 -29
------------------------------------------------------------------------------
(add/remove: 3/0 grow/shrink: 7/10 up/down: 117/-117) Total: 0 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/update_passwd.c | 7 | ||||
| -rw-r--r-- | libbb/wfopen.c | 16 |
2 files changed, 17 insertions, 6 deletions
diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c index ba773fcb2..301893be1 100644 --- a/libbb/update_passwd.c +++ b/libbb/update_passwd.c @@ -137,12 +137,7 @@ int FAST_FUNC update_passwd(const char *filename, fchown(new_fd, sb.st_uid, sb.st_gid); } errno = 0; - new_fp = fdopen(new_fd, "w"); - if (!new_fp) { - bb_perror_nomsg(); - close(new_fd); - goto unlink_new; - } + new_fp = xfdopen_for_write(new_fd); /* Backup file is "/etc/passwd-" */ *sfx_char = '-'; diff --git a/libbb/wfopen.c b/libbb/wfopen.c index 1cb871ef5..deec79a28 100644 --- a/libbb/wfopen.c +++ b/libbb/wfopen.c @@ -38,3 +38,19 @@ FILE* FAST_FUNC xfopen_for_write(const char *path) { return xfopen(path, "w"); } + +static FILE* xfdopen_helper(unsigned fd_and_rw_bit) +{ + FILE* fp = fdopen(fd_and_rw_bit >> 1, fd_and_rw_bit & 1 ? "w" : "r"); + if (!fp) + bb_error_msg_and_die(bb_msg_memory_exhausted); + return fp; +} +FILE* FAST_FUNC xfdopen_for_read(int fd) +{ + return xfdopen_helper(fd << 1); +} +FILE* FAST_FUNC xfdopen_for_write(int fd) +{ + return xfdopen_helper((fd << 1) + 1); +} |