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 /e2fsprogs | |
parent | 647553a4fcbbc169b4390d9ef8e4657f0ffe1a5f (diff) | |
download | busybox-w32-a7ccdeef396700d1ed78b9f97de0d10c706b169f.tar.gz busybox-w32-a7ccdeef396700d1ed78b9f97de0d10c706b169f.tar.bz2 busybox-w32-a7ccdeef396700d1ed78b9f97de0d10c706b169f.zip |
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 'e2fsprogs')
-rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/read.c | 4 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/save.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/e2fsprogs/old_e2fsprogs/blkid/read.c b/e2fsprogs/old_e2fsprogs/blkid/read.c index 67bc8ee44..f795a5d14 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/read.c +++ b/e2fsprogs/old_e2fsprogs/blkid/read.c | |||
@@ -374,9 +374,7 @@ void blkid_read_cache(blkid_cache cache) | |||
374 | DBG(DEBUG_CACHE, printf("reading cache file %s\n", | 374 | DBG(DEBUG_CACHE, printf("reading cache file %s\n", |
375 | cache->bic_filename)); | 375 | cache->bic_filename)); |
376 | 376 | ||
377 | file = fdopen(fd, "r"); | 377 | file = xfdopen_for_read(fd); |
378 | if (!file) | ||
379 | goto errout; | ||
380 | 378 | ||
381 | while (fgets(buf, sizeof(buf), file)) { | 379 | while (fgets(buf, sizeof(buf), file)) { |
382 | blkid_dev dev; | 380 | blkid_dev dev; |
diff --git a/e2fsprogs/old_e2fsprogs/blkid/save.c b/e2fsprogs/old_e2fsprogs/blkid/save.c index 3600260e2..e60cca445 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/save.c +++ b/e2fsprogs/old_e2fsprogs/blkid/save.c | |||
@@ -95,7 +95,7 @@ int blkid_flush_cache(blkid_cache cache) | |||
95 | sprintf(tmp, "%s-XXXXXX", filename); | 95 | sprintf(tmp, "%s-XXXXXX", filename); |
96 | fd = mkstemp(tmp); | 96 | fd = mkstemp(tmp); |
97 | if (fd >= 0) { | 97 | if (fd >= 0) { |
98 | file = fdopen(fd, "w"); | 98 | file = xfdopen_for_write(fd); |
99 | opened = tmp; | 99 | opened = tmp; |
100 | } | 100 | } |
101 | fchmod(fd, 0644); | 101 | fchmod(fd, 0644); |