busybox: fix unzip behavior (fixes neovim-git)

This commit is contained in:
Dylan Araps 2020-08-17 13:35:40 +03:00
parent ecf951c14f
commit e61bbf086c
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
4 changed files with 23 additions and 1 deletions

View File

@ -5,6 +5,7 @@ c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689 busybox-1.32.0
68e0c7d5e96902d3b890e89d9b018ae11d53ed3104bfedd624a1485df58b11cb print-unicode.patch
f0e17fefc0af6b10205d72b242b6ef7481a58ff07726c62890ebc5893b96a396 install-fix-chown.patch
73be7b16dcff44e88eb48696522794f529beddf9d5a139b8a76cc8685a9f6fc8 lsusb-vendor-product.patch
d70c4cd6381baeb3836c0387f53553021b48bdc851de49f1c86d836f7d0355fc unzip-usage-no-error.patch
e31d4458807b9e686bea993c19237b21dc573f5c15b313d68d474aff7d81a745 .config
6e9c7bccc102d0e8fa062c750c9d00ec6de6aa67d6b4c6f6b0539247798e6c71 .config-suid
ebd61afac770d3d9cae5c411f44002496fb18b28cf7b77520072a3909852246e acpid.run

View File

@ -0,0 +1,20 @@
diff --git a/archival/unzip.c b/archival/unzip.c
index d94bbab..f424fb0 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -592,6 +592,7 @@ int unzip_main(int argc, char **argv)
break;
default:
+ xfunc_error_retval = 0;
bb_show_usage();
}
}
@@ -615,6 +616,7 @@ int unzip_main(int argc, char **argv)
#endif
if (!src_fn) {
+ xfunc_error_retval = 0;
bb_show_usage();
}

View File

@ -5,6 +5,7 @@ patches/modprobe-kernel-version.patch
patches/print-unicode.patch
patches/install-fix-chown.patch
patches/lsusb-vendor-product.patch
patches/unzip-usage-no-error.patch
files/.config
files/.config-suid
files/acpid.run

View File

@ -1 +1 @@
1.32.0 2
1.32.0 3