Merge branch 'busybox' into merge

1 files changed, 9 insertions, 8 deletions

diff --git a/archival/unzip.c b/archival/unzip.c
index 233487697..c5fb6a3ed 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -56,7 +56,7 @@
 //kbuild:lib-$(CONFIG_UNZIP) += unzip.o
 
 //usage:#define unzip_trivial_usage
-//usage:       "[-lnopq] FILE[.zip] [FILE]... [-x FILE...] [-d DIR]"
+//usage:       "[-lnojpq] FILE[.zip] [FILE]... [-x FILE...] [-d DIR]"
 //usage:#define unzip_full_usage "\n\n"
 //usage:       "Extract FILEs from ZIP archive\n"
 //usage:     "\n        -l      List contents (with -q for short form)"
@@ -808,13 +808,6 @@ int unzip_main(int argc, char **argv)
                 /* Guard against "/abspath", "/../" and similar attacks */
                 overlapping_strcpy(dst_fn, strip_unsafe_prefix(dst_fn));
 
-                if (opts & OPT_j) /* Strip paths? */
-                        overlapping_strcpy(dst_fn, bb_basename(dst_fn));
-
-                /* Did this strip everything ("DIR/" case)? Then skip */
-                if (!dst_fn[0])
-                        goto skip_cmpsize;
-
                 /* Filter zip entries */
                 if (find_list_entry(zreject, dst_fn)
                  || (zaccept && !find_list_entry(zaccept, dst_fn))
@@ -879,6 +872,14 @@ int unzip_main(int argc, char **argv)
                         /* Extracting to STDOUT */
                         goto do_extract;
                 }
+
+                /* Strip paths (after -l: unzip -lj a.zip lists full names) */
+                if (opts & OPT_j)
+                        overlapping_strcpy(dst_fn, bb_basename(dst_fn));
+                /* Did this strip everything ("DIR/" case)? Then skip */
+                if (!dst_fn[0])
+                        goto skip_cmpsize;
+
                 if (last_char_is(dst_fn, '/')) {
                         int mode;