aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2014-10-26 13:34:33 -0500
committerRob Landley <rob@landley.net>2014-10-26 13:34:33 -0500
commitd4bae7ddb771d32d35cc953a3fedbcc622820dbe (patch)
tree1b5d04d5562d8eba24c00eb2abff2b6650af6014
parentd3f335d2cf64eb6c556ee5ba6e4a9315766e3c6e (diff)
downloadtoybox-d4bae7ddb771d32d35cc953a3fedbcc622820dbe.tar.gz
xexec() recursion limiter has to go after rebound or toy_init() zeroes it.
-rw-r--r--toys.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/toys.h b/toys.h
index 2e5c6b0f..ed1fa811 100644
--- a/toys.h
+++ b/toys.h
@@ -132,10 +132,10 @@ extern struct toy_context {
int toycount; // Total number of commands in this build
int signal; // generic_signal() records what signal it saw here
int signalfd; // and writes signal to this fd, if set
- int recursion; // How many nested calls to toy_exec()
// This is at the end so toy_init() doesn't zero it.
jmp_buf *rebound; // longjmp here instead of exit when do_rebound set
+ int recursion; // How many nested calls to toy_exec()
} toys;
// Two big temporary buffers: one for use by commands, one for library functions