diff options
author | Denys Vlasenko | 2010-05-30 04:18:13 +0200 |
---|---|---|
committer | Denys Vlasenko | 2010-05-30 04:18:13 +0200 |
commit | 6948f210ed443f8153e0ba751e77bec8a0c6c8d4 (patch) | |
tree | 134443f225a788cbb4fda7b4713ee2bc535fb126 /include | |
parent | fb6c76cb6eaade5693b7e99c33846c902689f1db (diff) | |
download | busybox-6948f210ed443f8153e0ba751e77bec8a0c6c8d4.zip busybox-6948f210ed443f8153e0ba751e77bec8a0c6c8d4.tar.gz |
*: teach tar et. al. to understand .xz by heart
function old new delta
unpack_xz_stream - 4126 +4126
setup_unzip_on_fd 80 150 +70
open_zipped 113 131 +18
unpack_unxz 5 12 +7
send_tree 360 353 -7
unpack_xz_stream_stdin 3953 - -3953
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 3/1 up/down: 4221/-3960) Total: 261 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/libbb.h | 2 | ||||
-rw-r--r-- | include/unarchive.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/libbb.h b/include/libbb.h index 2f67c7f..326179b 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -656,7 +656,7 @@ extern void *xmalloc_open_read_close(const char *filename, size_t *maxsz_p) FAST || ENABLE_FEATURE_SEAMLESS_BZ2 \ || ENABLE_FEATURE_SEAMLESS_GZ \ /* || ENABLE_FEATURE_SEAMLESS_Z */ -extern int setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/) FAST_FUNC; +extern void setup_unzip_on_fd(int fd /*, int fail_if_not_detected*/) FAST_FUNC; #else # define setup_unzip_on_fd(...) ((void)0) #endif diff --git a/include/unarchive.h b/include/unarchive.h index 14cd98e..783a943 100644 --- a/include/unarchive.h +++ b/include/unarchive.h @@ -143,14 +143,15 @@ typedef struct inflate_unzip_result { } inflate_unzip_result; IF_DESKTOP(long long) int inflate_unzip(inflate_unzip_result *res, off_t compr_size, int src_fd, int dst_fd) FAST_FUNC; -IF_DESKTOP(long long) int unpack_xz_stream_stdin(void) FAST_FUNC; +/* xz unpacker takes .xz stream from offset 0 */ +IF_DESKTOP(long long) int unpack_xz_stream(int src_fd, int dst_fd) FAST_FUNC; /* lzma unpacker takes .lzma stream from offset 0 */ IF_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd) FAST_FUNC; /* the rest wants 2 first bytes already skipped by the caller */ IF_DESKTOP(long long) int unpack_bz2_stream(int src_fd, int dst_fd) FAST_FUNC; IF_DESKTOP(long long) int unpack_gz_stream(int src_fd, int dst_fd) FAST_FUNC; IF_DESKTOP(long long) int unpack_gz_stream_with_info(int src_fd, int dst_fd, unpack_info_t *info) FAST_FUNC; -IF_DESKTOP(long long) int unpack_Z_stream(int fd_in, int fd_out) FAST_FUNC; +IF_DESKTOP(long long) int unpack_Z_stream(int src_fd, int dst_fd) FAST_FUNC; /* wrapper which checks first two bytes to be "BZ" */ IF_DESKTOP(long long) int unpack_bz2_stream_prime(int src_fd, int dst_fd) FAST_FUNC; |