aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorKaroly Lorentey2004-02-02 19:19:08 +0000
committerKaroly Lorentey2004-02-02 19:19:08 +0000
commitd3a6748c5b378a86fc8408222c7dd26e47218af9 (patch)
tree33f9334088634447425b8c926dd45d1e83fa80e2 /src/process.c
parent465fc071a1aa48e87f37bff460410eec921eaa53 (diff)
parentd83a97ab5fbcde063e4a87042cd721a23f13fbe0 (diff)
downloademacs-d3a6748c5b378a86fc8408222c7dd26e47218af9.tar.gz
emacs-d3a6748c5b378a86fc8408222c7dd26e47218af9.zip
Merged in changes from CVS HEAD
Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-57 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-58 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-59 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-60 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-61 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-62 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-63 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-64 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-65 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-66 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-67 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-68 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-69 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-71
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/process.c b/src/process.c
index 2114d333905..be6094438e9 100644
--- a/src/process.c
+++ b/src/process.c
@@ -6094,7 +6094,10 @@ kill_buffer_processes (buffer)
6094 queued and the signal-catching function will be continually 6094 queued and the signal-catching function will be continually
6095 reentered until the queue is empty". Invoking signal() causes the 6095 reentered until the queue is empty". Invoking signal() causes the
6096 kernel to reexamine the SIGCLD queue. Fred Fish, UniSoft Systems 6096 kernel to reexamine the SIGCLD queue. Fred Fish, UniSoft Systems
6097 Inc. */ 6097 Inc.
6098
6099 ** Malloc WARNING: This should never call malloc either directly or
6100 indirectly; if it does, that is a bug */
6098 6101
6099SIGTYPE 6102SIGTYPE
6100sigchld_handler (signo) 6103sigchld_handler (signo)
@@ -6212,18 +6215,7 @@ sigchld_handler (signo)
6212 if (WIFEXITED (w)) 6215 if (WIFEXITED (w))
6213 synch_process_retcode = WRETCODE (w); 6216 synch_process_retcode = WRETCODE (w);
6214 else if (WIFSIGNALED (w)) 6217 else if (WIFSIGNALED (w))
6215 { 6218 synch_process_termsig = WTERMSIG (w);
6216 int code = WTERMSIG (w);
6217 char *signame;
6218
6219 synchronize_system_messages_locale ();
6220 signame = strsignal (code);
6221
6222 if (signame == 0)
6223 signame = "unknown";
6224
6225 synch_process_death = signame;
6226 }
6227 6219
6228 /* Tell wait_reading_process_input that it needs to wake up and 6220 /* Tell wait_reading_process_input that it needs to wake up and
6229 look around. */ 6221 look around. */