diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-08-05 13:10:34 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-08-05 13:10:34 +0000 |
| commit | e9ad84dfd4c7eb2936374f02989dacf7026a7276 (patch) | |
| tree | 37412d21c0a2ccec7c162e0fb42833058f5934e3 /include | |
| parent | 9b44613202a6f2f080ec23746d0680dcef88628d (diff) | |
*: refactor handling of archived files. "tar f file.tar.lzma" now works too.
function old new delta
unpack_Z_stream - 1229 +1229
open_zipped - 176 +176
unpack_bz2_stream_prime - 60 +60
tar_main 642 677 +35
find_main 406 418 +12
sv_main 1222 1233 +11
decode_format_string 829 837 +8
cmp_main 641 649 +8
popstring 134 140 +6
filter_accept_list_reassign 120 125 +5
parse_and_put_prompt 800 804 +4
passwd_main 1053 1049 -4
make_new_name_gunzip 119 114 -5
rpm_main 1688 1670 -18
prepare 302 283 -19
xmalloc_open_zipped_read_close 135 61 -74
uncompress 1229 - -1229
------------------------------------------------------------------------------
(add/remove: 3/1 grow/shrink: 8/5 up/down: 1554/-1349) Total: 205 bytes
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 5 | ||||
| -rw-r--r-- | include/unarchive.h | 19 | ||||
| -rw-r--r-- | include/usage.h | 14 |
3 files changed, 20 insertions, 18 deletions
diff --git a/include/libbb.h b/include/libbb.h index 9cbab4f1d..3996846b5 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -597,6 +597,7 @@ extern void *xmalloc_read(int fd, size_t *maxsz_p) FAST_FUNC; /* Returns NULL if file can't be opened */ extern void *xmalloc_open_read_close(const char *filename, size_t *maxsz_p) FAST_FUNC; /* Autodetects .gz etc */ +extern int open_zipped(const char *fname) FAST_FUNC; extern void *xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p) FAST_FUNC; /* Never returns NULL */ extern void *xmalloc_xopen_read_close(const char *filename, size_t *maxsz_p) FAST_FUNC; @@ -1039,10 +1040,6 @@ const char *bb_basename(const char *name) FAST_FUNC; char *last_char_is(const char *s, int c) FAST_FUNC; -USE_DESKTOP(long long) int uncompress(int fd_in, int fd_out) FAST_FUNC; -int inflate(int in, int out) FAST_FUNC; - - int bb_make_directory(char *path, long mode, int flags) FAST_FUNC; int get_signum(const char *name) FAST_FUNC; diff --git a/include/unarchive.h b/include/unarchive.h index cf23d98bf..7ff791be5 100644 --- a/include/unarchive.h +++ b/include/unarchive.h @@ -98,9 +98,9 @@ extern void header_verbose_list(const file_header_t *file_header) FAST_FUNC; extern char get_header_ar(archive_handle_t *archive_handle) FAST_FUNC; extern char get_header_cpio(archive_handle_t *archive_handle) FAST_FUNC; extern char get_header_tar(archive_handle_t *archive_handle) FAST_FUNC; +extern char get_header_tar_gz(archive_handle_t *archive_handle) FAST_FUNC; extern char get_header_tar_bz2(archive_handle_t *archive_handle) FAST_FUNC; extern char get_header_tar_lzma(archive_handle_t *archive_handle) FAST_FUNC; -extern char get_header_tar_gz(archive_handle_t *archive_handle) FAST_FUNC; extern void seek_by_jump(const archive_handle_t *archive_handle, unsigned amount) FAST_FUNC; extern void seek_by_read(const archive_handle_t *archive_handle, unsigned amount) FAST_FUNC; @@ -120,17 +120,22 @@ typedef struct inflate_unzip_result { uint32_t crc; } inflate_unzip_result; -extern USE_DESKTOP(long long) int unpack_bz2_stream(int src_fd, int dst_fd) FAST_FUNC; -extern USE_DESKTOP(long long) int inflate_unzip(inflate_unzip_result *res, off_t compr_size, int src_fd, int dst_fd) FAST_FUNC; -extern USE_DESKTOP(long long) int unpack_gz_stream(int src_fd, int dst_fd) FAST_FUNC; -extern USE_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd) FAST_FUNC; +USE_DESKTOP(long long) int inflate_unzip(inflate_unzip_result *res, off_t compr_size, int src_fd, int dst_fd) FAST_FUNC; +/* lzma unpacker takes .lzma stream from offset 0 */ +USE_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 */ +USE_DESKTOP(long long) int unpack_bz2_stream(int src_fd, int dst_fd) FAST_FUNC; +USE_DESKTOP(long long) int unpack_gz_stream(int src_fd, int dst_fd) FAST_FUNC; +USE_DESKTOP(long long) int unpack_Z_stream(int fd_in, int fd_out) FAST_FUNC; +/* wrapper which checks first two bytes to be "BZ" */ +USE_DESKTOP(long long) int unpack_bz2_stream_prime(int src_fd, int dst_fd) FAST_FUNC; #if BB_MMU -extern void open_transformer(int fd, +void open_transformer(int fd, USE_DESKTOP(long long) int FAST_FUNC (*transformer)(int src_fd, int dst_fd)) FAST_FUNC; #define open_transformer(fd, transformer, transform_prog) open_transformer(fd, transformer) #else -extern void open_transformer(int src_fd, const char *transform_prog) FAST_FUNC; +void open_transformer(int src_fd, const char *transform_prog) FAST_FUNC; #define open_transformer(fd, transformer, transform_prog) open_transformer(fd, transform_prog) #endif diff --git a/include/usage.h b/include/usage.h index ae6d2bcb6..78f40367e 100644 --- a/include/usage.h +++ b/include/usage.h @@ -3943,9 +3943,9 @@ "nameserver 10.0.0.1\n" #define tar_trivial_usage \ - "-[" USE_FEATURE_TAR_CREATE("c") USE_FEATURE_TAR_GZIP("z") \ - USE_FEATURE_TAR_BZIP2("j") USE_FEATURE_TAR_LZMA("a") \ - USE_FEATURE_TAR_COMPRESS("Z") "xtvO] " \ + "-[" USE_FEATURE_TAR_CREATE("c") USE_FEATURE_SEAMLESS_GZ("z") \ + USE_FEATURE_SEAMLESS_BZ2("j") USE_FEATURE_SEAMLESS_LZMA("a") \ + USE_FEATURE_SEAMLESS_Z("Z") "xtvO] " \ USE_FEATURE_TAR_FROM("[-X FILE] ") \ "[-f TARFILE] [-C DIR] [FILE(s)]..." #define tar_full_usage "\n\n" \ @@ -3956,16 +3956,16 @@ "\n x Extract" \ "\n t List" \ "\nArchive format selection:" \ - USE_FEATURE_TAR_GZIP( \ + USE_FEATURE_SEAMLESS_GZ( \ "\n z Filter the archive through gzip" \ ) \ - USE_FEATURE_TAR_BZIP2( \ + USE_FEATURE_SEAMLESS_BZ2( \ "\n j Filter the archive through bzip2" \ ) \ - USE_FEATURE_TAR_LZMA( \ + USE_FEATURE_SEAMLESS_LZMA( \ "\n a Filter the archive through lzma" \ ) \ - USE_FEATURE_TAR_COMPRESS( \ + USE_FEATURE_SEAMLESS_Z( \ "\n Z Filter the archive through compress" \ ) \ "\nFile selection:" \ |