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-77f1ec1b9bf100e6c10aa0856c7156e321511785.tar.gz | |
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:= \ find_list_entry.o \ init_handle.o -GUNZIP_FILES:= decompress_unzip.o - DPKG_FILES:= \ get_header_ar.o \ unpack_ar_archive.o \ @@ -51,19 +49,19 @@ lib-$(CONFIG_UNLZMA) += decompress_unlzma.o lib-$(CONFIG_CPIO) += get_header_cpio.o lib-$(CONFIG_DPKG) += $(DPKG_FILES) lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES) -lib-$(CONFIG_FEATURE_DEB_TAR_GZ) += $(GUNZIP_FILES) get_header_tar_gz.o +lib-$(CONFIG_FEATURE_DEB_TAR_GZ) += decompress_unzip.o get_header_tar_gz.o lib-$(CONFIG_FEATURE_DEB_TAR_BZ2) += decompress_bunzip2.o get_header_tar_bz2.o lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o -lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES) +lib-$(CONFIG_GUNZIP) += decompress_unzip.o lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o -lib-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o -lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o +lib-$(CONFIG_RPM2CPIO) += decompress_unzip.o get_header_cpio.o +lib-$(CONFIG_RPM) += decompress_unzip.o get_header_cpio.o lib-$(CONFIG_FEATURE_RPM_BZ2) += decompress_bunzip2.o lib-$(CONFIG_TAR) += get_header_tar.o lib-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o lib-$(CONFIG_FEATURE_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o -lib-$(CONFIG_FEATURE_TAR_GZIP) += $(GUNZIP_FILES) get_header_tar_gz.o +lib-$(CONFIG_FEATURE_TAR_GZIP) += decompress_unzip.o get_header_tar_gz.o lib-$(CONFIG_FEATURE_TAR_COMPRESS) += decompress_uncompress.o lib-$(CONFIG_UNCOMPRESS) += decompress_uncompress.o -lib-$(CONFIG_UNZIP) += $(GUNZIP_FILES) +lib-$(CONFIG_UNZIP) += decompress_unzip.o 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, } while (--i); if (c[0] == n) { /* null input - all zero length codes */ *m = 0; - return 2; + return 2; } /* Find minimum and maximum length, bound *m by those */ |