From: Denys Vlasenko Date: Mon, 27 Jan 2014 12:02:18 +0000 (+0100) Subject: libbb: open_zipped() should not fail on non-compressed files X-Git-Tag: 1_23_0~203 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b664f740d90880560ce46b11f766625341342e80;p=oweals%2Fbusybox.git libbb: open_zipped() should not fail on non-compressed files Signed-off-by: Denys Vlasenko --- diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c index 1aeba13bc..27854af21 100644 --- a/archival/libarchive/open_transformer.c +++ b/archival/libarchive/open_transformer.c @@ -200,7 +200,16 @@ int FAST_FUNC open_zipped(const char *fname) || (ENABLE_FEATURE_SEAMLESS_BZ2) || (ENABLE_FEATURE_SEAMLESS_XZ) ) { - setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1); + /* + * Do we want to fail_if_not_detected? + * In most cases, no: think "insmod non_compressed_module". + * A case which would like to fail is "zcat uncompressed_file": + * otherwise, it happily outputs uncompressed_file as-is, + * which is, strictly speaking, not what is expected. + * If this ever becomes a problem, we can add + * fail_if_not_detected bool argument to open_zipped(). + */ + setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 0); } return fd;