summaryrefslogtreecommitdiffstats
path: root/package/utils/busybox
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-04-09 08:02:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-04-09 08:02:33 +0000
commitc99d9afff3b0863b0425fc65bb2b254bc6863556 (patch)
tree3fb2392c8b7a3a1feb3f366807e716c283144a73 /package/utils/busybox
parent2198db252ca8e865b1eac24e20a50f312b6dc6e9 (diff)
downloadmaster-31e0f0ae-c99d9afff3b0863b0425fc65bb2b254bc6863556.tar.gz
master-31e0f0ae-c99d9afff3b0863b0425fc65bb2b254bc6863556.tar.bz2
master-31e0f0ae-c99d9afff3b0863b0425fc65bb2b254bc6863556.zip
busybox: fix regression in handling non-existant find path arguments (#19439)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45321
Diffstat (limited to 'package/utils/busybox')
-rw-r--r--package/utils/busybox/patches/280-fix_find_regression.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/package/utils/busybox/patches/280-fix_find_regression.patch b/package/utils/busybox/patches/280-fix_find_regression.patch
new file mode 100644
index 0000000000..50217506af
--- /dev/null
+++ b/package/utils/busybox/patches/280-fix_find_regression.patch
@@ -0,0 +1,31 @@
+find: fix regression in status processing for path arguments
+
+Regression added in commit 14158b4127dba30466c50147b868a6a89702960b
+"find: add optional support for '-exec ... {} +'"
+
+This commit causes find to exit on the first path argument that was not
+found, which breaks existing scripts and is incompatible to other
+implementations.
+
+Instead of exiting on the first failure, return EXIT_FAILURE at the end
+if any error occurred.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/findutils/find.c
++++ b/findutils/find.c
+@@ -1460,12 +1460,10 @@ int find_main(int argc UNUSED_PARAM, cha
+ NULL, /* user data */
+ 0) /* depth */
+ ) {
+- status = EXIT_FAILURE;
+- goto out;
++ status |= EXIT_FAILURE;
+ }
+ }
+
+- IF_FEATURE_FIND_EXEC_PLUS(status = flush_exec_plus();)
+-out:
++ IF_FEATURE_FIND_EXEC_PLUS(status |= flush_exec_plus();)
+ return status;
+ }