diff options
author | Ron Yorston <rmy@pobox.com> | 2015-05-18 09:36:27 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-05-18 09:36:27 +0100 |
commit | 60063627a6d540871061854a362047e6517f821c (patch) | |
tree | 0de228630450c64e085f2e3f5141b5ba17eccab3 /findutils | |
parent | ec39cb770ddd5c0e085d5c4ee10be65bab5e7a44 (diff) | |
parent | 9a595bb36ded308e6d4336aef2c1cd3ac738a398 (diff) | |
download | busybox-w32-60063627a6d540871061854a362047e6517f821c.tar.gz busybox-w32-60063627a6d540871061854a362047e6517f821c.tar.bz2 busybox-w32-60063627a6d540871061854a362047e6517f821c.zip |
Merge branch 'busybox' into mergeFRP
Diffstat (limited to 'findutils')
-rw-r--r-- | findutils/find.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/findutils/find.c b/findutils/find.c index 83aa63f92..ced8922e7 100644 --- a/findutils/find.c +++ b/findutils/find.c | |||
@@ -1460,12 +1460,10 @@ int find_main(int argc UNUSED_PARAM, char **argv) | |||
1460 | NULL, /* user data */ | 1460 | NULL, /* user data */ |
1461 | 0) /* depth */ | 1461 | 0) /* depth */ |
1462 | ) { | 1462 | ) { |
1463 | status = EXIT_FAILURE; | 1463 | status |= EXIT_FAILURE; |
1464 | goto out; | ||
1465 | } | 1464 | } |
1466 | } | 1465 | } |
1467 | 1466 | ||
1468 | IF_FEATURE_FIND_EXEC_PLUS(status = flush_exec_plus();) | 1467 | IF_FEATURE_FIND_EXEC_PLUS(status |= flush_exec_plus();) |
1469 | out: | ||
1470 | return status; | 1468 | return status; |
1471 | } | 1469 | } |