diff options
| author | Denys Vlasenko | 2009-10-05 03:03:07 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2009-10-05 03:03:07 +0200 |
| commit | dcd27abcc4471ac04d7f196905907eb9a28bf0d8 (patch) | |
| tree | 24ed60e8325dcfccc99b36b5cab663cd693f29bf | |
| parent | be168b119750beacc0d0212607c6fa3ee87f238c (diff) | |
| download | busybox-dcd27abcc4471ac04d7f196905907eb9a28bf0d8.zip busybox-dcd27abcc4471ac04d7f196905907eb9a28bf0d8.tar.gz | |
unpackers: check errors from close() too
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | archival/bbunzip.c | 10 | ||||
| -rw-r--r-- | include/libbb.h | 3 | ||||
| -rw-r--r-- | libbb/xfuncs_printf.c | 6 |
3 files changed, 14 insertions, 5 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c index d25f509..d6625e4 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c @@ -98,6 +98,7 @@ int FAST_FUNC bbunpack(char **argv, status = unpacker(&info); if (status < 0) exitcode = 1; + xclose(STDOUT_FILENO); /* with error check! */ if (filename) { char *del = new_name; @@ -108,12 +109,11 @@ int FAST_FUNC bbunpack(char **argv, times.actime = info.mtime; times.modtime = info.mtime; - /* Close first. + /* Note: we closed it first. * On some systems calling utime - * then closing resets the mtime. */ - close(STDOUT_FILENO); - /* Ignoring errors */ - utime(new_name, ×); + * then closing resets the mtime + * back to current time. */ + utime(new_name, ×); /* ignoring errors */ } /* Delete _compressed_ file */ diff --git a/include/libbb.h b/include/libbb.h index a02355c..dca14b4 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -631,6 +631,9 @@ extern void xwrite(int fd, const void *buf, size_t count) FAST_FUNC; extern void xwrite_str(int fd, const char *str) FAST_FUNC; extern void xopen_xwrite_close(const char* file, const char *str) FAST_FUNC; +/* Close fd, but check for failures (some types of write errors) */ +extern void xclose(int fd) FAST_FUNC; + /* Reads and prints to stdout till eof, then closes FILE. Exits on error: */ extern void xprint_and_close_file(FILE *file) FAST_FUNC; diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c index 5f56b36..aaf9989 100644 --- a/libbb/xfuncs_printf.c +++ b/libbb/xfuncs_printf.c @@ -213,6 +213,12 @@ void FAST_FUNC xwrite_str(int fd, const char *str) xwrite(fd, str, strlen(str)); } +void FAST_FUNC xclose(int fd) +{ + if (close(fd)) + bb_perror_msg_and_die("close failed"); +} + // Die with an error message if we can't lseek to the right spot. off_t FAST_FUNC xlseek(int fd, off_t offset, int whence) { |