diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-07 22:02:23 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-07 22:02:23 +0000 |
commit | ab9eef21a57c23567505e8fbceb8e5ea76306ce1 (patch) | |
tree | 800845b64d0e9a204743656c4d267cc6c9917cde /archival/rpm.c | |
parent | 8e858e2700651a0e973169b579622cd3dcd0defd (diff) | |
download | busybox-w32-ab9eef21a57c23567505e8fbceb8e5ea76306ce1.tar.gz busybox-w32-ab9eef21a57c23567505e8fbceb8e5ea76306ce1.tar.bz2 busybox-w32-ab9eef21a57c23567505e8fbceb8e5ea76306ce1.zip |
bunzip2/gunzip/uncompress/unlzma: merge into common code -
fix few corner cases, reduce size by 450 bytes. Update testsuite.
Diffstat (limited to 'archival/rpm.c')
-rw-r--r-- | archival/rpm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archival/rpm.c b/archival/rpm.c index 9ab12df2d..a48dda3bc 100644 --- a/archival/rpm.c +++ b/archival/rpm.c | |||
@@ -203,7 +203,7 @@ static void extract_cpio_gz(int fd) { | |||
203 | if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { | 203 | if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { |
204 | bb_error_msg_and_die("invalid gzip magic"); | 204 | bb_error_msg_and_die("invalid gzip magic"); |
205 | } | 205 | } |
206 | check_header_gzip(archive_handle->src_fd); | 206 | check_header_gzip_or_die(archive_handle->src_fd); |
207 | xchdir("/"); /* Install RPM's to root */ | 207 | xchdir("/"); /* Install RPM's to root */ |
208 | 208 | ||
209 | archive_handle->src_fd = open_transformer(archive_handle->src_fd, inflate_gunzip); | 209 | archive_handle->src_fd = open_transformer(archive_handle->src_fd, inflate_gunzip); |