diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-10-13 03:36:03 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-10-13 03:36:03 +0000 |
| commit | 77f1ec1b9bf100e6c10aa0856c7156e321511785 (patch) | |
| tree | f20e5a9062ecad82a43bde81e3041a19c4292733 /archival/libunarchive | |
| parent | 11c23d7b990eae27357e5a41a97d62b9a214f7db (diff) | |
| download | busybox-w32-77f1ec1b9bf100e6c10aa0856c7156e321511785.tar.gz busybox-w32-77f1ec1b9bf100e6c10aa0856c7156e321511785.tar.bz2 busybox-w32-77f1ec1b9bf100e6c10aa0856c7156e321511785.zip | |
bzip2: port bzip2 1.0.4 to busybox. note: bzip2 code resides
in separate directory (archival/bz/*)
and is covered by BSD-style license.
code size: 13k
Diffstat (limited to 'archival/libunarchive')
| -rw-r--r-- | archival/libunarchive/Kbuild | 14 | ||||
| -rw-r--r-- | archival/libunarchive/decompress_unzip.c | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/archival/libunarchive/Kbuild b/archival/libunarchive/Kbuild index a58a84f4b..1bc054a96 100644 --- a/archival/libunarchive/Kbuild +++ b/archival/libunarchive/Kbuild | |||
| @@ -28,8 +28,6 @@ lib-y:= \ | |||
| 28 | find_list_entry.o \ | 28 | find_list_entry.o \ |
| 29 | init_handle.o | 29 | init_handle.o |
| 30 | 30 | ||
| 31 | GUNZIP_FILES:= decompress_unzip.o | ||
| 32 | |||
| 33 | DPKG_FILES:= \ | 31 | DPKG_FILES:= \ |
| 34 | get_header_ar.o \ | 32 | get_header_ar.o \ |
| 35 | unpack_ar_archive.o \ | 33 | unpack_ar_archive.o \ |
| @@ -51,19 +49,19 @@ lib-$(CONFIG_UNLZMA) += decompress_unlzma.o | |||
| 51 | lib-$(CONFIG_CPIO) += get_header_cpio.o | 49 | lib-$(CONFIG_CPIO) += get_header_cpio.o |
| 52 | lib-$(CONFIG_DPKG) += $(DPKG_FILES) | 50 | lib-$(CONFIG_DPKG) += $(DPKG_FILES) |
| 53 | lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES) | 51 | lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES) |
| 54 | lib-$(CONFIG_FEATURE_DEB_TAR_GZ) += $(GUNZIP_FILES) get_header_tar_gz.o | 52 | lib-$(CONFIG_FEATURE_DEB_TAR_GZ) += decompress_unzip.o get_header_tar_gz.o |
| 55 | lib-$(CONFIG_FEATURE_DEB_TAR_BZ2) += decompress_bunzip2.o get_header_tar_bz2.o | 53 | lib-$(CONFIG_FEATURE_DEB_TAR_BZ2) += decompress_bunzip2.o get_header_tar_bz2.o |
| 56 | lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o | 54 | lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o |
| 57 | lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES) | 55 | lib-$(CONFIG_GUNZIP) += decompress_unzip.o |
| 58 | lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o | 56 | lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o |
| 59 | lib-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o | 57 | lib-$(CONFIG_RPM2CPIO) += decompress_unzip.o get_header_cpio.o |
| 60 | lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o | 58 | lib-$(CONFIG_RPM) += decompress_unzip.o get_header_cpio.o |
| 61 | lib-$(CONFIG_FEATURE_RPM_BZ2) += decompress_bunzip2.o | 59 | lib-$(CONFIG_FEATURE_RPM_BZ2) += decompress_bunzip2.o |
| 62 | lib-$(CONFIG_TAR) += get_header_tar.o | 60 | lib-$(CONFIG_TAR) += get_header_tar.o |
| 63 | lib-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o | 61 | lib-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o |
| 64 | lib-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o | 62 | lib-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o |
| 65 | lib-$(CONFIG_FEATURE_TAR_GZIP) += $(GUNZIP_FILES) get_header_tar_gz.o | 63 | lib-$(CONFIG_FEATURE_TAR_GZIP) += decompress_unzip.o get_header_tar_gz.o |
| 66 | lib-$(CONFIG_FEATURE_TAR_COMPRESS) += decompress_uncompress.o | 64 | lib-$(CONFIG_FEATURE_TAR_COMPRESS) += decompress_uncompress.o |
| 67 | lib-$(CONFIG_UNCOMPRESS) += decompress_uncompress.o | 65 | lib-$(CONFIG_UNCOMPRESS) += decompress_uncompress.o |
| 68 | lib-$(CONFIG_UNZIP) += $(GUNZIP_FILES) | 66 | lib-$(CONFIG_UNZIP) += decompress_unzip.o |
| 69 | lib-$(CONFIG_FEATURE_COMPRESS_USAGE) += decompress_bunzip2.o | 67 | lib-$(CONFIG_FEATURE_COMPRESS_USAGE) += decompress_bunzip2.o |
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index 52be6b25d..0572bee68 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c | |||
| @@ -323,7 +323,7 @@ static int huft_build(const unsigned *b, const unsigned n, | |||
| 323 | } while (--i); | 323 | } while (--i); |
| 324 | if (c[0] == n) { /* null input - all zero length codes */ | 324 | if (c[0] == n) { /* null input - all zero length codes */ |
| 325 | *m = 0; | 325 | *m = 0; |
| 326 | return 2; | 326 | return 2; |
| 327 | } | 327 | } |
| 328 | 328 | ||
| 329 | /* Find minimum and maximum length, bound *m by those */ | 329 | /* Find minimum and maximum length, bound *m by those */ |