diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-12-07 18:30:51 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-12-07 18:30:51 -0800 |
| commit | d983a10b9a070fd8f6d4f48ec44e5514b62feaa6 (patch) | |
| tree | 1b7353b39c508615eb0d2cf4475fdfabf8ef6ce0 /src/callproc.c | |
| parent | 9cdde1e2dfdd7b1a4e52294bca1467dc7a48c77a (diff) | |
| download | emacs-d983a10b9a070fd8f6d4f48ec44e5514b62feaa6.tar.gz emacs-d983a10b9a070fd8f6d4f48ec44e5514b62feaa6.tar.bz2 emacs-d983a10b9a070fd8f6d4f48ec44e5514b62feaa6.zip | |
Assume POSIX 1003.1-1988 or later for signal.h.
Exceptions: do not assume SIGCONT, SIGSTOP, SIGTSTP, SIGTTIN,
SIGTTOU, SIGUSR1, SIGUSR2, as Microsoft platforms lack these.
* admin/CPP-DEFINES (SIGALRM, SIGCHLD, SIGHUP, SIGKILL, SIGPIPE, SIGQUIT):
Remove.
(SIGTRAP): Remove this one too, as config.h no longer defines it.
* admin/merge-gnulib (GNULIB_MODULES): Add sig2str.
* configure.ac (PTY_OPEN, PTY_TTY_NAME_SPRINTF):
Use SIGCHLD rather than SIGCLD.
* lib/sig2str.c, lib/sig2str.h, m4/sig2str.m4: New files, from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BUILD)/sig2str.$(O).
* src/process.c [subprocesses]: Include <c-ctype.h>, <sig2str.h>.
(deleted_pid_list, Fdelete_process, create_process)
(record_child_status_change, handle_child_signal, deliver_child_signal)
(init_process_emacs, syms_of_process):
Assume SIGCHLD is defined.
(parse_signal): Remove. All uses removed.
(abbr_to_signal): New static function.
(Fsignal_process): Use it to convert signal names to ints.
* src/sysdep.c (sys_suspend) [!DOS_NT]: Use kill (0, ...) rather than
kill (getpgrp (), ...).
(emacs_sigaction_init): Assume SIGCHLD is defined.
(init_signals): Assume SIGALRM, SIGCHLD, SIGHUP, SIGKILL,
SIGPIPE, and SIGQUIT are defined. Do not worry about SIGCLD any more.
* src/syssignal.h (EMACS_KILLPG): Remove.
All uses replaced by 'kill' with a negative pid.
(SIGCHLD): Remove definition, as we now assume SIGCHLD.
* src/w32proc.c (sys_kill): Support negative pids compatibly with POSIX.
Fixes: debbugs:13026
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/callproc.c b/src/callproc.c index e0528a791ea..70e349d0d3a 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -87,12 +87,10 @@ static int synch_process_fd; static void block_child_signal (void) { -#ifdef SIGCHLD sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCHLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); -#endif } /* Unblock SIGCHLD. */ @@ -100,9 +98,7 @@ block_child_signal (void) static void unblock_child_signal (void) { -#ifdef SIGCHLD pthread_sigmask (SIG_SETMASK, &empty_mask, 0); -#endif } /* If P is reapable, record it as a deleted process and kill it. @@ -118,7 +114,7 @@ record_kill_process (struct Lisp_Process *p) { p->alive = 0; record_deleted_pid (p->pid); - EMACS_KILLPG (p->pid, SIGKILL); + kill (- p->pid, SIGKILL); } unblock_child_signal (); @@ -164,7 +160,7 @@ call_process_cleanup (Lisp_Object arg) if (synch_process_pid) { ptrdiff_t count = SPECPDL_INDEX (); - EMACS_KILLPG (synch_process_pid, SIGINT); + kill (-synch_process_pid, SIGINT); record_unwind_protect (call_process_kill, make_number (0)); message1 ("Waiting for process to die...(type C-g again to kill it instantly)"); immediate_quit = 1; |