7a8e920bb9
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
109 lines
4.0 KiB
C
109 lines
4.0 KiB
C
/*-
|
|
* Copyright (c) 1991, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Kenneth Almquist.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)error.h 8.2 (Berkeley) 5/4/95
|
|
* $Id: error.h,v 1.7 1997/02/22 13:58:23 peter Exp $
|
|
*/
|
|
|
|
/*
|
|
* Types of operations (passed to the errmsg routine).
|
|
*/
|
|
|
|
#define E_OPEN 01 /* opening a file */
|
|
#define E_CREAT 02 /* creating a file */
|
|
#define E_EXEC 04 /* executing a program */
|
|
|
|
|
|
/*
|
|
* We enclose jmp_buf in a structure so that we can declare pointers to
|
|
* jump locations. The global variable handler contains the location to
|
|
* jump to when an exception occurs, and the global variable exception
|
|
* contains a code identifying the exeception. To implement nested
|
|
* exception handlers, the user should save the value of handler on entry
|
|
* to an inner scope, set handler to point to a jmploc structure for the
|
|
* inner scope, and restore handler on exit from the scope.
|
|
*/
|
|
|
|
#include <setjmp.h>
|
|
#include <signal.h>
|
|
|
|
struct jmploc {
|
|
jmp_buf loc;
|
|
};
|
|
|
|
extern struct jmploc *handler;
|
|
extern int exception;
|
|
|
|
/* exceptions */
|
|
#define EXINT 0 /* SIGINT received */
|
|
#define EXERROR 1 /* a generic error */
|
|
#define EXSHELLPROC 2 /* execute a shell procedure */
|
|
#define EXEXEC 3 /* command execution failed */
|
|
|
|
|
|
/*
|
|
* These macros allow the user to suspend the handling of interrupt signals
|
|
* over a period of time. This is similar to SIGHOLD to or sigblock, but
|
|
* much more efficient and portable. (But hacking the kernel is so much
|
|
* more fun than worrying about efficiency and portability. :-))
|
|
*/
|
|
|
|
extern volatile sig_atomic_t suppressint;
|
|
extern volatile sig_atomic_t intpending;
|
|
extern char *commandname; /* name of command--printed on error */
|
|
|
|
#define INTOFF suppressint++
|
|
#define INTON { if (--suppressint == 0 && intpending) onint(); }
|
|
#define FORCEINTON {suppressint = 0; if (intpending) onint();}
|
|
#define CLEAR_PENDING_INT intpending = 0
|
|
#define int_pending() intpending
|
|
|
|
void exraise __P((int));
|
|
void onint __P((void));
|
|
void error __P((char *, ...));
|
|
void exerror __P((int, char *, ...));
|
|
char *errmsg __P((int, int));
|
|
|
|
|
|
/*
|
|
* BSD setjmp saves the signal mask, which violates ANSI C and takes time,
|
|
* so we use _setjmp instead.
|
|
*/
|
|
|
|
#ifdef BSD
|
|
#define setjmp(jmploc) _setjmp(jmploc)
|
|
#define longjmp(jmploc, val) _longjmp(jmploc, val)
|
|
#endif
|