diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2014-02-02 02:06:38 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2014-02-02 02:06:38 +0100 |
commit | 640ce3de07807133796bccd0bdfa146bbfc788c7 (patch) | |
tree | 0d17e53405b8cbf71aed4d8ba6c9dc27df14814a /include | |
parent | f1999b5a9d2788cdc120b1ee2ab1de18e95b38f2 (diff) | |
download | busybox-w32-640ce3de07807133796bccd0bdfa146bbfc788c7.tar.gz busybox-w32-640ce3de07807133796bccd0bdfa146bbfc788c7.tar.bz2 busybox-w32-640ce3de07807133796bccd0bdfa146bbfc788c7.zip |
zcat: complain if input is not compressed
function old new delta
buffer_fill_and_print 178 191 +13
varvalue 735 743 +8
bbunpack 747 755 +8
open_zipped 85 89 +4
xmalloc_open_zipped_read_close 61 63 +2
get_addr_1 240 242 +2
fbsplash_main 1228 1230 +2
pstree_main 322 321 -1
builtin_type 121 119 -2
do_load 954 926 -28
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 7/3 up/down: 39/-31) Total: 8 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/libbb.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/libbb.h b/include/libbb.h index 64167bba3..96f33340e 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -736,12 +736,12 @@ extern void *xmalloc_xopen_read_close(const char *filename, size_t *maxsz_p) FAS | |||
736 | 736 | ||
737 | #if SEAMLESS_COMPRESSION | 737 | #if SEAMLESS_COMPRESSION |
738 | /* Autodetects gzip/bzip2 formats. fd may be in the middle of the file! */ | 738 | /* Autodetects gzip/bzip2 formats. fd may be in the middle of the file! */ |
739 | extern int setup_unzip_on_fd(int fd, int fail_if_not_detected) FAST_FUNC; | 739 | extern int setup_unzip_on_fd(int fd, int fail_if_not_compressed) FAST_FUNC; |
740 | /* Autodetects .gz etc */ | 740 | /* Autodetects .gz etc */ |
741 | extern int open_zipped(const char *fname) FAST_FUNC; | 741 | extern int open_zipped(const char *fname, int fail_if_not_compressed) FAST_FUNC; |
742 | #else | 742 | #else |
743 | # define setup_unzip_on_fd(...) (0) | 743 | # define setup_unzip_on_fd(...) (0) |
744 | # define open_zipped(fname) open((fname), O_RDONLY); | 744 | # define open_zipped(fname, fail_if_not_compressed) open((fname), O_RDONLY); |
745 | #endif | 745 | #endif |
746 | extern void *xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; | 746 | extern void *xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; |
747 | 747 | ||