diff options
| -rw-r--r-- | lib/lib.h | 6 | ||||
| -rw-r--r-- | toys.h | 2 | ||||
| -rw-r--r-- | toys/pending/sh.c | 4 | ||||
| -rw-r--r-- | www/code.html | 2 |
4 files changed, 7 insertions, 7 deletions
@@ -360,12 +360,12 @@ void names_to_pid(char **names, int (*callback)(pid_t pid, char *name)); pid_t __attribute__((returns_twice)) xvforkwrap(pid_t pid); #define XVFORK() xvforkwrap(vfork()) -// Wrapper to make xfuncs() return (via longjmp) instead of exiting. +// Wrapper to make xfuncs() return (via siglongjmp) instead of exiting. // Assigns true/false "did it exit" value to first argument. -#define WOULD_EXIT(y, x) do { jmp_buf _noexit; \ +#define WOULD_EXIT(y, x) do { sigjmp_buf _noexit; \ int _noexit_res; \ toys.rebound = &_noexit; \ - _noexit_res = setjmp(_noexit); \ + _noexit_res = sigsetjmp(_noexit, 1); \ if (!_noexit_res) do {x;} while(0); \ toys.rebound = 0; \ y = _noexit_res; \ @@ -108,7 +108,7 @@ extern struct toy_context { char wasroot; // dropped setuid // This is at the end so toy_init() doesn't zero it. - sigjmp_buf *rebound; // longjmp here instead of exit when do_rebound set + sigjmp_buf *rebound; // siglongjmp here instead of exit when do_rebound struct arg_list *xexit; // atexit() functions for xexit(), set by sigatexit() void *stacktop; // nested toy_exec() call count, or 0 if vforked } toys; diff --git a/toys/pending/sh.c b/toys/pending/sh.c index 0bfd32c5..8a9e93b6 100644 --- a/toys/pending/sh.c +++ b/toys/pending/sh.c @@ -205,13 +205,13 @@ static void run_pipeline(struct pipeline *line) // Is this command a builtin that should run in this process? if (tl && (tl->flags & TOYFLAG_NOFORK)) { struct toy_context temp; - jmp_buf rebound; + sigjmp_buf rebound; // This fakes lots of what toybox_main() does. memcpy(&temp, &toys, sizeof(struct toy_context)); memset(&toys, 0, sizeof(struct toy_context)); - if (!setjmp(rebound)) { + if (!sigsetjmp(rebound, 1)) { toys.rebound = &rebound; toy_init(tl, cmd->argv); tl->toy_main(); diff --git a/www/code.html b/www/code.html index b1b17ef5..953c53bb 100644 --- a/www/code.html +++ b/www/code.html @@ -653,7 +653,7 @@ and change the exit code to indicate error, lets our toys.exit function change happen for signal exit paths and lets us remove the functions after we've called them.</p> -<p>You can intercept our exit by assigning a setjmp/longjmp buffer to +<p>You can intercept our exit by assigning a sigsetjmp/siglongjmp buffer to toys.rebound (set it back to zero to restore the default behavior). If you do this, cleaning up resource leaks is your problem.</p> |