diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-10-05 03:03:07 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-10-05 03:03:07 +0200 |
commit | dcd27abcc4471ac04d7f196905907eb9a28bf0d8 (patch) | |
tree | 24ed60e8325dcfccc99b36b5cab663cd693f29bf /archival | |
parent | be168b119750beacc0d0212607c6fa3ee87f238c (diff) | |
download | busybox-w32-dcd27abcc4471ac04d7f196905907eb9a28bf0d8.tar.gz busybox-w32-dcd27abcc4471ac04d7f196905907eb9a28bf0d8.tar.bz2 busybox-w32-dcd27abcc4471ac04d7f196905907eb9a28bf0d8.zip |
unpackers: check errors from close() too
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r-- | archival/bbunzip.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c index d25f50939..d6625e476 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c | |||
@@ -98,6 +98,7 @@ int FAST_FUNC bbunpack(char **argv, | |||
98 | status = unpacker(&info); | 98 | status = unpacker(&info); |
99 | if (status < 0) | 99 | if (status < 0) |
100 | exitcode = 1; | 100 | exitcode = 1; |
101 | xclose(STDOUT_FILENO); /* with error check! */ | ||
101 | 102 | ||
102 | if (filename) { | 103 | if (filename) { |
103 | char *del = new_name; | 104 | char *del = new_name; |
@@ -108,12 +109,11 @@ int FAST_FUNC bbunpack(char **argv, | |||
108 | 109 | ||
109 | times.actime = info.mtime; | 110 | times.actime = info.mtime; |
110 | times.modtime = info.mtime; | 111 | times.modtime = info.mtime; |
111 | /* Close first. | 112 | /* Note: we closed it first. |
112 | * On some systems calling utime | 113 | * On some systems calling utime |
113 | * then closing resets the mtime. */ | 114 | * then closing resets the mtime |
114 | close(STDOUT_FILENO); | 115 | * back to current time. */ |
115 | /* Ignoring errors */ | 116 | utime(new_name, ×); /* ignoring errors */ |
116 | utime(new_name, ×); | ||
117 | } | 117 | } |
118 | 118 | ||
119 | /* Delete _compressed_ file */ | 119 | /* Delete _compressed_ file */ |