aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-02-08 18:34:03 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2011-02-08 18:34:03 +0100
commit92e531458a6c0e6464fbdc1463f91edc7fb752c7 (patch)
tree72062fc0e07619658d45b88172f230fc0ab34422 /archival
parent12d97b66805f87e535962963e858fc2422ffdbc7 (diff)
downloadbusybox-w32-1_18_3.tar.gz
busybox-w32-1_18_3.tar.bz2
busybox-w32-1_18_3.zip
Apply post-1.18.2 fixes, bump version to 1.18.31_18_3
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r--archival/tar.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/archival/tar.c b/archival/tar.c
index 82caec770..c0b92615d 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -1037,8 +1037,10 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
1037 tar_handle->src_fd = tar_fd; 1037 tar_handle->src_fd = tar_fd;
1038 tar_handle->seek = seek_by_read; 1038 tar_handle->seek = seek_by_read;
1039 } else { 1039 } else {
1040 if (ENABLE_FEATURE_TAR_AUTODETECT && flags == O_RDONLY) { 1040 if (ENABLE_FEATURE_TAR_AUTODETECT
1041 get_header_ptr = get_header_tar; 1041 && flags == O_RDONLY
1042 && get_header_ptr == get_header_tar
1043 ) {
1042 tar_handle->src_fd = open_zipped(tar_filename); 1044 tar_handle->src_fd = open_zipped(tar_filename);
1043 if (tar_handle->src_fd < 0) 1045 if (tar_handle->src_fd < 0)
1044 bb_perror_msg_and_die("can't open '%s'", tar_filename); 1046 bb_perror_msg_and_die("can't open '%s'", tar_filename);