aboutsummaryrefslogtreecommitdiff
path: root/archival/unzip.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2015-07-14 14:12:05 +0100
committerRon Yorston <rmy@pobox.com>2015-07-14 14:12:05 +0100
commit895a1533781ca4713ef92113ab6ac5f2584ddd9d (patch)
tree49c8602e9cd733e6f6c105e94e614b8236677853 /archival/unzip.c
parent535ec990c50206697852d5c25e94a959f24d86bc (diff)
parent072fc60f29ee3a4ff38f095a9ef149b2e820c8c0 (diff)
downloadbusybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.tar.gz
busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.tar.bz2
busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'archival/unzip.c')
-rw-r--r--archival/unzip.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/archival/unzip.c b/archival/unzip.c
index d370203e8..203073434 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -607,7 +607,6 @@ int unzip_main(int argc, char **argv)
607 || (zaccept && !find_list_entry(zaccept, dst_fn)) 607 || (zaccept && !find_list_entry(zaccept, dst_fn))
608 ) { /* Skip entry */ 608 ) { /* Skip entry */
609 i = 'n'; 609 i = 'n';
610
611 } else { 610 } else {
612 if (listing) { 611 if (listing) {
613 /* List entry */ 612 /* List entry */
@@ -669,7 +668,6 @@ int unzip_main(int argc, char **argv)
669 } 668 }
670 } 669 }
671 i = 'n'; 670 i = 'n';
672
673 } else { 671 } else {
674 /* Extract file */ 672 /* Extract file */
675 check_file: 673 check_file: