aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2014-01-30 18:22:30 +0100
committerAndreas Schwab2014-01-30 18:22:30 +0100
commit507a173f5077b86152feb665421f5e6d47b7c85c (patch)
tree977bd9712369b7d556ba775c8943c6ce690c08dd /src
parentdf1834593692c4103f89de90aaa882a2fb404eb6 (diff)
downloademacs-507a173f5077b86152feb665421f5e6d47b7c85c.tar.gz
emacs-507a173f5077b86152feb665421f5e6d47b7c85c.zip
Don't ignore SIGPROF in subprocesses
* process.c (create_process): Reset SIGPROF handler in the child. * callproc.c (call_process): Likewise.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/callproc.c4
-rw-r--r--src/process.c3
3 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ea9db78185f..f020386dc61 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-01-30 Andreas Schwab <schwab@linux-m68k.org>
2
3 * process.c (create_process): Reset SIGPROF handler in the child.
4 * callproc.c (call_process): Likewise.
5
12014-01-29 Paul Eggert <eggert@cs.ucla.edu> 62014-01-29 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * xmenu.c (create_and_show_popup_menu): Port comment to C89. 8 * xmenu.c (create_and_show_popup_menu): Port comment to C89.
diff --git a/src/callproc.c b/src/callproc.c
index 886bfcedb00..2ce4a7dcc0d 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -677,6 +677,10 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
677 677
678 /* Emacs ignores SIGPIPE, but the child should not. */ 678 /* Emacs ignores SIGPIPE, but the child should not. */
679 signal (SIGPIPE, SIG_DFL); 679 signal (SIGPIPE, SIG_DFL);
680 /* Likewise for SIGPROF. */
681#ifdef SIGPROF
682 signal (SIGPROF, SIG_DFL);
683#endif
680 684
681 child_setup (filefd, fd_output, fd_error, new_argv, 0, current_dir); 685 child_setup (filefd, fd_output, fd_error, new_argv, 0, current_dir);
682 } 686 }
diff --git a/src/process.c b/src/process.c
index 94033fa7ee3..85470b66c3e 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1841,6 +1841,9 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
1841 1841
1842 signal (SIGINT, SIG_DFL); 1842 signal (SIGINT, SIG_DFL);
1843 signal (SIGQUIT, SIG_DFL); 1843 signal (SIGQUIT, SIG_DFL);
1844#ifdef SIGPROF
1845 signal (SIGPROF, SIG_DFL);
1846#endif
1844 1847
1845 /* Emacs ignores SIGPIPE, but the child should not. */ 1848 /* Emacs ignores SIGPIPE, but the child should not. */
1846 signal (SIGPIPE, SIG_DFL); 1849 signal (SIGPIPE, SIG_DFL);