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
305 lines
7.1 KiB
C
305 lines
7.1 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.
|
|
*/
|
|
|
|
#ifndef lint
|
|
#if 0
|
|
static char sccsid[] = "@(#)error.c 8.2 (Berkeley) 5/4/95";
|
|
#endif
|
|
static const char rcsid[] =
|
|
"$Id: error.c,v 1.10 1998/05/18 06:43:32 charnier Exp $";
|
|
#endif /* not lint */
|
|
|
|
/*
|
|
* Errors and exceptions.
|
|
*/
|
|
|
|
#include "shell.h"
|
|
#include "main.h"
|
|
#include "options.h"
|
|
#include "output.h"
|
|
#include "error.h"
|
|
#include "show.h"
|
|
#include "trap.h"
|
|
#include <signal.h>
|
|
#include <unistd.h>
|
|
#include <errno.h>
|
|
|
|
|
|
/*
|
|
* Code to handle exceptions in C.
|
|
*/
|
|
|
|
struct jmploc *handler;
|
|
volatile sig_atomic_t exception;
|
|
int suppressint;
|
|
volatile sig_atomic_t intpending;
|
|
char *commandname;
|
|
|
|
|
|
static void exverror __P((int, char *, va_list));
|
|
|
|
/*
|
|
* Called to raise an exception. Since C doesn't include exceptions, we
|
|
* just do a longjmp to the exception handler. The type of exception is
|
|
* stored in the global variable "exception".
|
|
*/
|
|
|
|
void
|
|
exraise(e)
|
|
int e;
|
|
{
|
|
if (handler == NULL)
|
|
abort();
|
|
exception = e;
|
|
longjmp(handler->loc, 1);
|
|
}
|
|
|
|
|
|
/*
|
|
* Called from trap.c when a SIGINT is received. (If the user specifies
|
|
* that SIGINT is to be trapped or ignored using the trap builtin, then
|
|
* this routine is not called.) Supressint is nonzero when interrupts
|
|
* are held using the INTOFF macro. If SIGINTs are not suppressed and
|
|
* the shell is not a root shell, then we want to be terminated if we
|
|
* get here, as if we were terminated directly by a SIGINT. Arrange for
|
|
* this here.
|
|
*/
|
|
|
|
void
|
|
onint() {
|
|
sigset_t sigset;
|
|
|
|
/* The !in_dotrap is save. The only way we can arrive here with
|
|
* in_dotrap set is that a trap handler set SIGINT to default
|
|
* and killed itself.
|
|
*/
|
|
|
|
if (suppressint && !in_dotrap) {
|
|
intpending++;
|
|
return;
|
|
}
|
|
intpending = 0;
|
|
sigemptyset(&sigset);
|
|
sigprocmask(SIG_SETMASK, &sigset, NULL);
|
|
|
|
/* This doesn't seem to be needed. Note that main emit a newline
|
|
* as well.
|
|
*/
|
|
#if 0
|
|
if (tcgetpgrp(0) == getpid())
|
|
write(STDERR_FILENO, "\n", 1);
|
|
#endif
|
|
if (rootshell && iflag)
|
|
exraise(EXINT);
|
|
else {
|
|
signal(SIGINT, SIG_DFL);
|
|
kill(getpid(), SIGINT);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
* Exverror is called to raise the error exception. If the first argument
|
|
* is not NULL then error prints an error message using printf style
|
|
* formatting. It then raises the error exception.
|
|
*/
|
|
static void
|
|
exverror(cond, msg, ap)
|
|
int cond;
|
|
char *msg;
|
|
va_list ap;
|
|
{
|
|
CLEAR_PENDING_INT;
|
|
INTOFF;
|
|
|
|
#ifdef DEBUG
|
|
if (msg)
|
|
TRACE(("exverror(%d, \"%s\") pid=%d\n", cond, msg, getpid()));
|
|
else
|
|
TRACE(("exverror(%d, NULL) pid=%d\n", cond, getpid()));
|
|
#endif
|
|
if (msg) {
|
|
if (commandname)
|
|
outfmt(&errout, "%s: ", commandname);
|
|
doformat(&errout, msg, ap);
|
|
out2c('\n');
|
|
}
|
|
flushall();
|
|
exraise(cond);
|
|
}
|
|
|
|
|
|
#ifdef __STDC__
|
|
void
|
|
error(char *msg, ...)
|
|
#else
|
|
void
|
|
error(va_alist)
|
|
va_dcl
|
|
#endif
|
|
{
|
|
#ifndef __STDC__
|
|
char *msg;
|
|
#endif
|
|
va_list ap;
|
|
#ifdef __STDC__
|
|
va_start(ap, msg);
|
|
#else
|
|
va_start(ap);
|
|
msg = va_arg(ap, char *);
|
|
#endif
|
|
exverror(EXERROR, msg, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
|
|
#ifdef __STDC__
|
|
void
|
|
exerror(int cond, char *msg, ...)
|
|
#else
|
|
void
|
|
exerror(va_alist)
|
|
va_dcl
|
|
#endif
|
|
{
|
|
#ifndef __STDC__
|
|
int cond;
|
|
char *msg;
|
|
#endif
|
|
va_list ap;
|
|
#ifdef __STDC__
|
|
va_start(ap, msg);
|
|
#else
|
|
va_start(ap);
|
|
cond = va_arg(ap, int);
|
|
msg = va_arg(ap, char *);
|
|
#endif
|
|
exverror(cond, msg, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
* Table of error messages.
|
|
*/
|
|
|
|
struct errname {
|
|
short errcode; /* error number */
|
|
short action; /* operation which encountered the error */
|
|
char *msg; /* text describing the error */
|
|
};
|
|
|
|
|
|
#define ALL (E_OPEN|E_CREAT|E_EXEC)
|
|
|
|
STATIC const struct errname errormsg[] = {
|
|
{ EINTR, ALL, "interrupted" },
|
|
{ EACCES, ALL, "permission denied" },
|
|
{ EIO, ALL, "I/O error" },
|
|
{ ENOENT, E_OPEN, "no such file" },
|
|
{ ENOENT, E_CREAT,"directory nonexistent" },
|
|
{ ENOENT, E_EXEC, "not found" },
|
|
{ ENOTDIR, E_OPEN, "no such file" },
|
|
{ ENOTDIR, E_CREAT,"directory nonexistent" },
|
|
{ ENOTDIR, E_EXEC, "not found" },
|
|
{ EISDIR, ALL, "is a directory" },
|
|
#ifdef notdef
|
|
{ EMFILE, ALL, "too many open files" },
|
|
#endif
|
|
{ ENFILE, ALL, "file table overflow" },
|
|
{ ENOSPC, ALL, "file system full" },
|
|
#ifdef EDQUOT
|
|
{ EDQUOT, ALL, "disk quota exceeded" },
|
|
#endif
|
|
#ifdef ENOSR
|
|
{ ENOSR, ALL, "no streams resources" },
|
|
#endif
|
|
{ ENXIO, ALL, "no such device or address" },
|
|
{ EROFS, ALL, "read-only file system" },
|
|
{ ETXTBSY, ALL, "text busy" },
|
|
#ifdef SYSV
|
|
{ EAGAIN, E_EXEC, "not enough memory" },
|
|
#endif
|
|
{ ENOMEM, ALL, "not enough memory" },
|
|
#ifdef ENOLINK
|
|
{ ENOLINK, ALL, "remote access failed" },
|
|
#endif
|
|
#ifdef EMULTIHOP
|
|
{ EMULTIHOP, ALL, "remote access failed" },
|
|
#endif
|
|
#ifdef ECOMM
|
|
{ ECOMM, ALL, "remote access failed" },
|
|
#endif
|
|
#ifdef ESTALE
|
|
{ ESTALE, ALL, "remote access failed" },
|
|
#endif
|
|
#ifdef ETIMEDOUT
|
|
{ ETIMEDOUT, ALL, "remote access failed" },
|
|
#endif
|
|
#ifdef ELOOP
|
|
{ ELOOP, ALL, "symbolic link loop" },
|
|
#endif
|
|
{ E2BIG, E_EXEC, "argument list too long" },
|
|
#ifdef ELIBACC
|
|
{ ELIBACC, E_EXEC, "shared library missing" },
|
|
#endif
|
|
{ 0, 0, NULL },
|
|
};
|
|
|
|
|
|
/*
|
|
* Return a string describing an error. The returned string may be a
|
|
* pointer to a static buffer that will be overwritten on the next call.
|
|
* Action describes the operation that got the error.
|
|
*/
|
|
|
|
char *
|
|
errmsg(e, action)
|
|
int e;
|
|
int action;
|
|
{
|
|
struct errname const *ep;
|
|
static char buf[12];
|
|
|
|
for (ep = errormsg ; ep->errcode ; ep++) {
|
|
if (ep->errcode == e && (ep->action & action) != 0)
|
|
return ep->msg;
|
|
}
|
|
fmtstr(buf, sizeof buf, "error %d", e);
|
|
return buf;
|
|
}
|