[Emacs-diffs] trunk r117217: Port signal-handling to DragonFly BSD.

[Paul Eggert]

------------------------------------------------------------
revno: 117217
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17646
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2014-06-01 16:17:56 -0700
message:
  Port signal-handling to DragonFly BSD.
  
  * callproc.c, sysdep.c (block_child_signal, unblock_child_signal):
  Move implementations from callproc.c to sysdep.c.
  * process.h, syssignal.h (block_child_signal, unblock_child_signal):
  Move declaratations from process.h to syssignal.h.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/callproc.c                 callproc.c-20091113204419-o5vbwnq5f7feedwu-248
  src/process.h                  process.h-20091113204419-o5vbwnq5f7feedwu-272
  src/sysdep.c                   sysdep.c-20091113204419-o5vbwnq5f7feedwu-448
  src/syssignal.h                syssignal.h-20091113204419-o5vbwnq5f7feedwu-459

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-01 16:25:19 +0000
+++ b/src/ChangeLog     2014-06-01 23:17:56 +0000
@@ -1,3 +1,11 @@
+2014-06-01  Paul Eggert  <address@hidden>
+
+       Port signal-handling to DragonFly BSD (Bug#17646).
+       * callproc.c, sysdep.c (block_child_signal, unblock_child_signal):
+       Move implementations from callproc.c to sysdep.c.
+       * process.h, syssignal.h (block_child_signal, unblock_child_signal):
+       Move declaratations from process.h to syssignal.h.
+
 2014-06-01  Juanma Barranquero  <address@hidden>
 
        * callint.c (Ffuncall_interactively): Add usage.

=== modified file 'src/callproc.c'
--- a/src/callproc.c    2014-05-30 04:12:08 +0000
+++ b/src/callproc.c    2014-06-01 23:17:56 +0000
@@ -105,30 +105,6 @@
 
 static Lisp_Object call_process (ptrdiff_t, Lisp_Object *, int, ptrdiff_t);
 
-
-#ifndef MSDOS
-/* Block SIGCHLD.  */
-
-void
-block_child_signal (sigset_t *oldset)
-{
-  sigset_t blocked;
-  sigemptyset (&blocked);
-  sigaddset (&blocked, SIGCHLD);
-  sigaddset (&blocked, SIGINT);
-  pthread_sigmask (SIG_BLOCK, &blocked, oldset);
-}
-
-/* Unblock SIGCHLD.  */
-
-void
-unblock_child_signal (sigset_t const *oldset)
-{
-  pthread_sigmask (SIG_SETMASK, oldset, 0);
-}
-
-#endif /* !MSDOS */
-
 /* Return the current buffer's working directory, or the home
    directory if it's unreachable, as a string suitable for a system call.
    Signal an error if the result would not be an accessible directory.  */

=== modified file 'src/process.h'
--- a/src/process.h     2014-03-25 14:43:26 +0000
+++ b/src/process.h     2014-06-01 23:17:56 +0000
@@ -213,8 +213,6 @@
 
 /* Defined in callproc.c.  */
 
-extern void block_child_signal (sigset_t *);
-extern void unblock_child_signal (sigset_t const *);
 extern Lisp_Object encode_current_directory (void);
 extern void record_kill_process (struct Lisp_Process *, Lisp_Object);
 

=== modified file 'src/sysdep.c'
--- a/src/sysdep.c      2014-05-30 04:12:08 +0000
+++ b/src/sysdep.c      2014-06-01 23:17:56 +0000
@@ -659,7 +659,29 @@
   signal (SIGIO, SIG_IGN);
 #endif
 }
-
+
+#ifndef MSDOS
+/* Block SIGCHLD.  */
+
+void
+block_child_signal (sigset_t *oldset)
+{
+  sigset_t blocked;
+  sigemptyset (&blocked);
+  sigaddset (&blocked, SIGCHLD);
+  sigaddset (&blocked, SIGINT);
+  pthread_sigmask (SIG_BLOCK, &blocked, oldset);
+}
+
+/* Unblock SIGCHLD.  */
+
+void
+unblock_child_signal (sigset_t const *oldset)
+{
+  pthread_sigmask (SIG_SETMASK, oldset, 0);
+}
+
+#endif /* !MSDOS */
 
 /* Saving and restoring the process group of Emacs's terminal.  */
 

=== modified file 'src/syssignal.h'
--- a/src/syssignal.h   2014-03-27 22:52:14 +0000
+++ b/src/syssignal.h   2014-06-01 23:17:56 +0000
@@ -20,6 +20,8 @@
 #include <signal.h>
 
 extern void init_signals (bool);
+extern void block_child_signal (sigset_t *);
+extern void unblock_child_signal (sigset_t const *);
 extern void block_tty_out_signal (sigset_t *);
 extern void unblock_tty_out_signal (sigset_t const *);