From 50f7f446ecaadef6895a4ee601567e0b68330637 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Wed, 11 Apr 2007 23:20:53 +0000 Subject: 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 --- archival/bbunzip.c | 9 ++------- archival/tar.c | 5 ++--- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'archival') 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 { static int open_to_or_warn(int to_fd, const char *filename, int flags, int mode) { - int fd = open(filename, flags, mode); + int fd = open3_or_warn(filename, flags, mode); if (fd < 0) { - bb_perror_msg("%s", filename); return 1; } - if (fd != to_fd) { - if (dup2(fd, to_fd) < 0) - bb_perror_msg_and_die("cannot dup"); - close(fd); - } + xmove_fd(fd, to_fd); return 0; } 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, /* Is this a regular file? */ if (tbInfo->hlInfo == NULL && S_ISREG(statbuf->st_mode)) { /* open the file we want to archive, and make sure all is well */ - inputFileFd = open(fileName, O_RDONLY); + inputFileFd = open_or_warn(fileName, O_RDONLY); if (inputFileFd < 0) { - bb_perror_msg("%s: cannot open", fileName); return FALSE; } } @@ -455,7 +454,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, /* If it was a regular file, write out the body */ if (inputFileFd >= 0) { size_t readSize; - /* Wwrite the file to the archive. */ + /* Write the file to the archive. */ /* We record size into header first, */ /* and then write out file. If file shrinks in between, */ /* tar will be corrupted. So we don't allow for that. */ -- cgit v1.2.3