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
100 lines
3.8 KiB
C
100 lines
3.8 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.
|
|
*
|
|
* @(#)jobs.h 8.2 (Berkeley) 5/4/95
|
|
* $Id: jobs.h,v 1.6 1997/08/18 02:53:20 steve Exp $
|
|
*/
|
|
|
|
/* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */
|
|
#define FORK_FG 0
|
|
#define FORK_BG 1
|
|
#define FORK_NOJOB 2
|
|
|
|
#include <signal.h> /* For sig_atomic_t */
|
|
|
|
/*
|
|
* A job structure contains information about a job. A job is either a
|
|
* single process or a set of processes contained in a pipeline. In the
|
|
* latter case, pidlist will be non-NULL, and will point to a -1 terminated
|
|
* array of pids.
|
|
*/
|
|
|
|
struct procstat {
|
|
pid_t pid; /* process id */
|
|
int status; /* status flags (defined above) */
|
|
char *cmd; /* text of command being run */
|
|
};
|
|
|
|
|
|
/* states */
|
|
#define JOBSTOPPED 1 /* all procs are stopped */
|
|
#define JOBDONE 2 /* all procs are completed */
|
|
|
|
|
|
struct job {
|
|
struct procstat ps0; /* status of process */
|
|
struct procstat *ps; /* status or processes when more than one */
|
|
short nprocs; /* number of processes */
|
|
short pgrp; /* process group of this job */
|
|
char state; /* true if job is finished */
|
|
char used; /* true if this entry is in used */
|
|
char changed; /* true if status has changed */
|
|
#if JOBS
|
|
char jobctl; /* job running under job control */
|
|
#endif
|
|
};
|
|
|
|
extern pid_t backgndpid; /* pid of last background process */
|
|
extern int job_warning; /* user was warned about stopped jobs */
|
|
extern int in_waitcmd; /* Are we in wait? */
|
|
extern volatile sig_atomic_t breakwaitcmd; /* Should wait be terminated? */
|
|
|
|
void setjobctl __P((int));
|
|
int fgcmd __P((int, char **));
|
|
int bgcmd __P((int, char **));
|
|
int jobscmd __P((int, char **));
|
|
void showjobs __P((int));
|
|
int waitcmd __P((int, char **));
|
|
int jobidcmd __P((int, char **));
|
|
struct job *makejob __P((union node *, int));
|
|
int forkshell __P((struct job *, union node *, int));
|
|
int waitforjob __P((struct job *));
|
|
int stoppedjobs __P((void));
|
|
char *commandtext __P((union node *));
|
|
|
|
#if ! JOBS
|
|
#define setjobctl(on) /* do nothing */
|
|
#endif
|