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/libunarchive | |
| parent | 8e858e2700651a0e973169b579622cd3dcd0defd (diff) | |
| download | busybox-ab9eef21a57c23567505e8fbceb8e5ea76306ce1.tar.gz | |
bunzip2/gunzip/uncompress/unlzma: merge into common code -
fix few corner cases, reduce size by 450 bytes. Update testsuite.
Diffstat (limited to 'archival/libunarchive')
| -rw-r--r-- | archival/libunarchive/check_header_gzip.c | 9 | ||||
| -rw-r--r-- | archival/libunarchive/get_header_tar_gz.c | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/archival/libunarchive/check_header_gzip.c b/archival/libunarchive/check_header_gzip.c index 0cfa94454..09cd6a94e 100644 --- a/archival/libunarchive/check_header_gzip.c +++ b/archival/libunarchive/check_header_gzip.c @@ -2,12 +2,11 @@ /* * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdlib.h> -#include <unistd.h> + #include "libbb.h" -#include "unarchive.h" /* for external decl of check_header_gzip */ +#include "unarchive.h" /* for external decl of check_header_gzip_or_die */ -void check_header_gzip(int src_fd) +void check_header_gzip_or_die(int src_fd) { union { unsigned char raw[8]; @@ -57,6 +56,4 @@ void check_header_gzip(int src_fd) xread_char(src_fd); xread_char(src_fd); } - - return; } diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c index 41c02e16a..1f07e4e64 100644 --- a/archival/libunarchive/get_header_tar_gz.c +++ b/archival/libunarchive/get_header_tar_gz.c @@ -20,7 +20,7 @@ char get_header_tar_gz(archive_handle_t *archive_handle) bb_error_msg_and_die("invalid gzip magic"); } - check_header_gzip(archive_handle->src_fd); + check_header_gzip_or_die(archive_handle->src_fd); archive_handle->src_fd = open_transformer(archive_handle->src_fd, inflate_gunzip); archive_handle->offset = 0; |