diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-11 23:20:53 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-11 23:20:53 +0000 |
| commit | 50f7f446ecaadef6895a4ee601567e0b68330637 (patch) | |
| tree | a10f1d7fd192b8c7ee6cb3d5aa46a0295dd08f2a /archival | |
| parent | d7c8196c1bba74d1e27ac9cb5e2eb57413daa463 (diff) | |
| download | busybox-w32-50f7f446ecaadef6895a4ee601567e0b68330637.tar.gz busybox-w32-50f7f446ecaadef6895a4ee601567e0b68330637.tar.bz2 busybox-w32-50f7f446ecaadef6895a4ee601567e0b68330637.zip | |
bb_full_fd_action: remove potential xmalloc from NOFORK path
cat: stop using stdio.h opens
libbb: introduce & use open[3]_or_warn
function old new delta
open3_or_warn - 54 +54
bb_cat 115 144 +29
open_or_warn - 25 +25
unlzma 2404 2412 +8
chattr_main 334 339 +5
xstrtoul_range_sfx 251 255 +4
telnet_main 1514 1510 -4
static.opt 4 - -4
qgravechar 122 118 -4
fuser_add_pid 61 54 -7
fuser_add_inode 154 147 -7
writeFileToTarball 1542 1534 -8
refresh 1156 1148 -8
do_show 856 846 -10
read_leases 212 200 -12
setup_redirects 236 222 -14
iproute_list_or_flush 1582 1568 -14
read_config 427 411 -16
write_leases 284 264 -20
hash_file 338 318 -20
copy_file 1760 1740 -20
do_iproute 2610 2588 -22
bb_full_fd_action 320 269 -51
open_to_or_warn 103 49 -54
fuser_main 1660 1596 -64
.rodata 131160 131096 -64
------------------------------------------------------------------------------
(add/remove: 2/1 grow/shrink: 4/19 up/down: 125/-423) Total: -298 bytes
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/bbunzip.c | 9 | ||||
| -rw-r--r-- | archival/tar.c | 5 |
2 files changed, 4 insertions, 10 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c index 3c3cc2886..4dba498b8 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c | |||
| @@ -20,16 +20,11 @@ enum { | |||
| 20 | static | 20 | static |
| 21 | int open_to_or_warn(int to_fd, const char *filename, int flags, int mode) | 21 | int open_to_or_warn(int to_fd, const char *filename, int flags, int mode) |
| 22 | { | 22 | { |
| 23 | int fd = open(filename, flags, mode); | 23 | int fd = open3_or_warn(filename, flags, mode); |
| 24 | if (fd < 0) { | 24 | if (fd < 0) { |
| 25 | bb_perror_msg("%s", filename); | ||
| 26 | return 1; | 25 | return 1; |
| 27 | } | 26 | } |
| 28 | if (fd != to_fd) { | 27 | xmove_fd(fd, to_fd); |
| 29 | if (dup2(fd, to_fd) < 0) | ||
| 30 | bb_perror_msg_and_die("cannot dup"); | ||
| 31 | close(fd); | ||
| 32 | } | ||
| 33 | return 0; | 28 | return 0; |
| 34 | } | 29 | } |
| 35 | 30 | ||
diff --git a/archival/tar.c b/archival/tar.c index f2f1ccd06..11a74dfe9 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
| @@ -440,9 +440,8 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, | |||
| 440 | /* Is this a regular file? */ | 440 | /* Is this a regular file? */ |
| 441 | if (tbInfo->hlInfo == NULL && S_ISREG(statbuf->st_mode)) { | 441 | if (tbInfo->hlInfo == NULL && S_ISREG(statbuf->st_mode)) { |
| 442 | /* open the file we want to archive, and make sure all is well */ | 442 | /* open the file we want to archive, and make sure all is well */ |
| 443 | inputFileFd = open(fileName, O_RDONLY); | 443 | inputFileFd = open_or_warn(fileName, O_RDONLY); |
| 444 | if (inputFileFd < 0) { | 444 | if (inputFileFd < 0) { |
| 445 | bb_perror_msg("%s: cannot open", fileName); | ||
| 446 | return FALSE; | 445 | return FALSE; |
| 447 | } | 446 | } |
| 448 | } | 447 | } |
| @@ -455,7 +454,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, | |||
| 455 | /* If it was a regular file, write out the body */ | 454 | /* If it was a regular file, write out the body */ |
| 456 | if (inputFileFd >= 0) { | 455 | if (inputFileFd >= 0) { |
| 457 | size_t readSize; | 456 | size_t readSize; |
| 458 | /* Wwrite the file to the archive. */ | 457 | /* Write the file to the archive. */ |
| 459 | /* We record size into header first, */ | 458 | /* We record size into header first, */ |
| 460 | /* and then write out file. If file shrinks in between, */ | 459 | /* and then write out file. If file shrinks in between, */ |
| 461 | /* tar will be corrupted. So we don't allow for that. */ | 460 | /* tar will be corrupted. So we don't allow for that. */ |