From bbadc5e14136a4a2011080c08e064108d71e1429 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 22 Jan 2019 12:52:55 -0800 Subject: Fix sigjmp_buf/jmp_buf mismatches. Broke the bionic build: external/toybox/toys/net/netcat.c:188:37: error: incompatible pointer types assigning to 'sigjmp_buf *' (aka 'long (*)[33]') from 'jmp_buf *' (aka 'long (*)[32]') [-Werror,-Wincompatible-pointer-types] if (toys.optflags&FLAG_L) NOEXIT(child = XVFORK()); ^~~~~~~~~~~~~~~~~~~~~~~~ external/toybox/lib/lib.h:375:19: note: expanded from macro 'NOEXIT' #define NOEXIT(x) WOULD_EXIT(_noexit_res, x) ^~~~~~~~~~~~~~~~~~~~~~~~~~ external/toybox/lib/lib.h:367:16: note: expanded from macro 'WOULD_EXIT' toys.rebound = &_noexit; \ ^ ~~~~~~~~ 1 error generated. --- www/code.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/code.html') 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.

-

You can intercept our exit by assigning a setjmp/longjmp buffer to +

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.

-- cgit v1.2.3