diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-15 00:11:22 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-15 00:11:22 +0000 |
| commit | 8f0c89e05a7b52f8c5ae7b451de6fd50732aeb45 (patch) | |
| tree | 9bf309fce9eff03da8980e84d3de5741627bf96d /archival/tar.c | |
| parent | bc7177187f6b4f32c2f9562358294dfc7b521f67 (diff) | |
| download | busybox-w32-1_13_4.tar.gz busybox-w32-1_13_4.tar.bz2 busybox-w32-1_13_4.zip | |
apply post-1.13.3 fixes, bump version to 1.13.41_13_4
Diffstat (limited to 'archival/tar.c')
| -rw-r--r-- | archival/tar.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/archival/tar.c b/archival/tar.c index 47cc39c80..b6beede0d 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
| @@ -934,8 +934,10 @@ int tar_main(int argc UNUSED_PARAM, char **argv) | |||
| 934 | tar_handle->src_fd = fileno(tar_stream); | 934 | tar_handle->src_fd = fileno(tar_stream); |
| 935 | tar_handle->seek = seek_by_read; | 935 | tar_handle->seek = seek_by_read; |
| 936 | } else { | 936 | } else { |
| 937 | if (ENABLE_FEATURE_TAR_AUTODETECT && flags == O_RDONLY) { | 937 | if (ENABLE_FEATURE_TAR_AUTODETECT |
| 938 | get_header_ptr = get_header_tar; | 938 | && get_header_ptr == get_header_tar |
| 939 | && flags == O_RDONLY | ||
| 940 | ) { | ||
| 939 | tar_handle->src_fd = open_zipped(tar_filename); | 941 | tar_handle->src_fd = open_zipped(tar_filename); |
| 940 | if (tar_handle->src_fd < 0) | 942 | if (tar_handle->src_fd < 0) |
| 941 | bb_perror_msg_and_die("can't open '%s'", tar_filename); | 943 | bb_perror_msg_and_die("can't open '%s'", tar_filename); |
