aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archival/unzip.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/archival/unzip.c b/archival/unzip.c
index 604166063..1ef4406d6 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -805,13 +805,6 @@ int unzip_main(int argc, char **argv)
805 /* Guard against "/abspath", "/../" and similar attacks */ 805 /* Guard against "/abspath", "/../" and similar attacks */
806 overlapping_strcpy(dst_fn, strip_unsafe_prefix(dst_fn)); 806 overlapping_strcpy(dst_fn, strip_unsafe_prefix(dst_fn));
807 807
808 if (opts & OPT_j) /* Strip paths? */
809 overlapping_strcpy(dst_fn, bb_basename(dst_fn));
810
811 /* Did this strip everything ("DIR/" case)? Then skip */
812 if (!dst_fn[0])
813 goto skip_cmpsize;
814
815 /* Filter zip entries */ 808 /* Filter zip entries */
816 if (find_list_entry(zreject, dst_fn) 809 if (find_list_entry(zreject, dst_fn)
817 || (zaccept && !find_list_entry(zaccept, dst_fn)) 810 || (zaccept && !find_list_entry(zaccept, dst_fn))
@@ -876,6 +869,14 @@ int unzip_main(int argc, char **argv)
876 /* Extracting to STDOUT */ 869 /* Extracting to STDOUT */
877 goto do_extract; 870 goto do_extract;
878 } 871 }
872
873 /* Strip paths (after -l: unzip -lj a.zip lists full names) */
874 if (opts & OPT_j)
875 overlapping_strcpy(dst_fn, bb_basename(dst_fn));
876 /* Did this strip everything ("DIR/" case)? Then skip */
877 if (!dst_fn[0])
878 goto skip_cmpsize;
879
879 if (last_char_is(dst_fn, '/')) { 880 if (last_char_is(dst_fn, '/')) {
880 int mode; 881 int mode;
881 882