emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb: open_zipped() should not fail on non-compressed files

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2014-01-27 13:02:18 +01:00
parent bf2f2229bb
commit b664f740d9
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archival/libarchive/open_transformer.c
View File

@ -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;