diff options
author | cracauer <cracauer@FreeBSD.org> | 1998-08-24 10:20:37 +0000 |
---|---|---|
committer | cracauer <cracauer@FreeBSD.org> | 1998-08-24 10:20:37 +0000 |
commit | 8a3c521f04ee9ad807d4c737f050230cb04ce36d (patch) | |
tree | 8ccf28d7f10330488ab5bce78116d30f74886c79 /bin/sh/error.h | |
parent | f3d290b0b53aa55bf027aba6c54dd0e5b1d101f3 (diff) | |
download | FreeBSD-src-8a3c521f04ee9ad807d4c737f050230cb04ce36d.zip FreeBSD-src-8a3c521f04ee9ad807d4c737f050230cb04ce36d.tar.gz |
Do not exit on SIGINT in non-interactive shells, fixes PR 1206,
i.e. this makes emacs usable from system(3). Programs called from
shellscripts are now required to exit with proper signal status. That
means, they have to kill themself. Exiting with faked numerical exit
code is not sufficient.
Exit with proper signal status if script exits on signal.
Make the wait builtin interruptable, both with and without traps set.
Use volatile sig_atomic_t where (and only where) appropriate.
(Almost) fix printing of newlines on SIGINT.
Make traps setable from trap handlers. This is needed for shellscripts
that catch SIGINT for cleanup work but intend to exit on it, hance
have to kill themself from a trap handler. I.e. mkdep.
While I'm at it, make it -Wall clean. -Wall is not enabled in
Makefile, since vararg warnx() macro calls in usr.bin/printf/printf.c
are not -Wall-able.
PR: 1206
Obtained from: Basic SIGINT fix from Bruce Evans
Diffstat (limited to 'bin/sh/error.h')
-rw-r--r-- | bin/sh/error.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/sh/error.h b/bin/sh/error.h index bb3eafe..eb0f523 100644 --- a/bin/sh/error.h +++ b/bin/sh/error.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)error.h 8.2 (Berkeley) 5/4/95 - * $Id$ + * $Id: error.h,v 1.7 1997/02/22 13:58:23 peter Exp $ */ /* @@ -57,6 +57,7 @@ */ #include <setjmp.h> +#include <signal.h> struct jmploc { jmp_buf loc; @@ -79,8 +80,8 @@ extern int exception; * more fun than worrying about efficiency and portability. :-)) */ -extern volatile int suppressint; -extern volatile int intpending; +extern volatile sig_atomic_t suppressint; +extern volatile sig_atomic_t intpending; extern char *commandname; /* name of command--printed on error */ #define INTOFF suppressint++ |