summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2015-03-06 15:12:52 -0600
committerRob Landley <rob@landley.net>2015-03-06 15:12:52 -0600
commit1e2399b91cfd9895939876c4fb47af11c13ddf89 (patch)
tree25b018e700b6f755fc18f8118ca72d3a60879836
parent1f44b5f0b236df260cee8741efce8a2887a59e36 (diff)
downloadtoybox-1e2399b91cfd9895939876c4fb47af11c13ddf89.tar.gz
toybox-1e2399b91cfd9895939876c4fb47af11c13ddf89.tar.bz2
toybox-1e2399b91cfd9895939876c4fb47af11c13ddf89.zip
The "no }" error with find | xargs sed is because toy_init() wasn't blanking the GLOBALS() block on a recursive call. (How that ever worked...)
-rw-r--r--main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main.c b/main.c
index a81cfb9..4644d19 100644
--- a/main.c
+++ b/main.c
@@ -116,6 +116,7 @@ void toy_init(struct toy_list *which, char *argv[])
if (toys.optargs != toys.argv+1) free(toys.optargs);
memset(&toys, 0, offsetof(struct toy_context, rebound));
+ if (toys.recursion > 1) memset(&this, 0, sizeof(this));
// Subset of init needed by singlemain.
toy_singleinit(which, argv);