aboutsummaryrefslogtreecommitdiff
path: root/toys/posix/find.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2014-11-22 00:36:45 -0600
committerRob Landley <rob@landley.net>2014-11-22 00:36:45 -0600
commitf6c28b6e0017ac36190ee31132721a1c9e30f2b6 (patch)
treec242e6d66c112c46ec1a0010758ff00df29f2e87 /toys/posix/find.c
parentea6fc27fc8853b317a78c402e290bdc0142792e8 (diff)
downloadtoybox-f6c28b6e0017ac36190ee31132721a1c9e30f2b6.tar.gz
As long as Android's going to require fortify, fixup the warnings it generates.
Diffstat (limited to 'toys/posix/find.c')
-rw-r--r--toys/posix/find.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/toys/posix/find.c b/toys/posix/find.c
index caec80e9..370220e8 100644
--- a/toys/posix/find.c
+++ b/toys/posix/find.c
@@ -72,7 +72,7 @@ static int flush_exec(struct dirtree *new, struct exec_range *aa)
{
struct double_list **dl;
char **newargs;
- int rc;
+ int rc = 0;
if (!aa->namecount) return 0;
@@ -82,8 +82,13 @@ static int flush_exec(struct dirtree *new, struct exec_range *aa)
// switch to directory for -execdir, or back to top if we have an -execdir
// _and_ a normal -exec, or are at top of tree in -execdir
- if (aa->dir && new->parent) fchdir(new->parent->data);
- else if (TT.topdir != -1) fchdir(TT.topdir);
+ if (aa->dir && new->parent) rc = fchdir(new->parent->data);
+ else if (TT.topdir != -1) rc = fchdir(TT.topdir);
+ if (rc) {
+ perror_msg("%s", new->name);
+
+ return rc;
+ }
// execdir: accumulated execs in this directory's children.
newargs = xmalloc(sizeof(char *)*(aa->arglen+aa->namecount+1));