From c0a9bffd03e62822959ba8cb0e8b083f1ec4b871 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Mon, 1 Sep 2003 02:05:32 +0000
Subject: * cygheap.cc (cygheap_init): Allocate space for sigaction array in
 cygheap. * cygheap.h (cygheap_types): Add HEAP_SIGS. * exceptions.cc
 (signal_fixup_after_exec): Remove from this file. * pinfo.h (pinfo::getsig):
 Just return global_sigs array. (pinfo::sigs): Delete. * sigproc.cc
 (signal_fixup_after_exec): Move it here. (global_sigs): New global array,
 moved from pinfo structure. (sigalloc): New function.  Allocate global
 sigaction array here. (proc_subproc): Remove copysigs call.  It's automatic
 now. * include/sys/cygwin.h (PID_NOCLDSTOP): New value. * signal.cc
 (sigaction): Set myself->PID_NODCLDSTOP when appropriate. * sigproc.h
 (sigalloc): Declare. * fnmatch.c (fnmatch): Use C90 parameters. (rangematch):
 Ditto. * fhandler.cc (fhandler_base::raw_read): Use right coercion to avoid a
 compiler warning.

---
 winsup/cygwin/sigproc.cc | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

(limited to 'winsup/cygwin/sigproc.cc')

diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
index af2054112..b14fbac1b 100644
--- a/winsup/cygwin/sigproc.cc
+++ b/winsup/cygwin/sigproc.cc
@@ -17,6 +17,7 @@ details. */
 #include <stdlib.h>
 #include <sys/cygwin.h>
 #include <assert.h>
+#include <sys/signal.h>
 #include "cygerrno.h"
 #include "sync.h"
 #include "sigproc.h"
@@ -48,12 +49,35 @@ details. */
 
 #define NZOMBIES	256
 
-LONG local_sigtodo[TOTSIGS];
-inline LONG* getlocal_sigtodo (int sig)
+static LONG local_sigtodo[TOTSIGS];
+struct sigaction *global_sigs;
+
+inline LONG *
+getlocal_sigtodo (int sig)
 {
   return local_sigtodo + __SIGOFFSET + sig;
 }
 
+void __stdcall
+sigalloc ()
+{
+  cygheap->sigs = global_sigs =
+    (struct sigaction *) ccalloc (HEAP_SIGS, NSIG, sizeof (struct sigaction));
+}
+
+void __stdcall
+signal_fixup_after_exec ()
+{
+  global_sigs = cygheap->sigs;
+  /* Set up child's signal handlers */
+  for (int i = 0; i < NSIG; i++)
+    {
+      myself->getsig (i).sa_mask = 0;
+      if (myself->getsig (i).sa_handler != SIG_IGN)
+	myself->getsig (i).sa_handler = SIG_DFL;
+    }
+}
+
 /*
  * Global variables
  */
@@ -300,7 +324,6 @@ proc_subproc (DWORD what, DWORD val)
       vchild->sid = myself->sid;
       vchild->ctty = myself->ctty;
       vchild->process_state |= PID_INITIALIZING | (myself->process_state & PID_USETTY);
-      vchild->copysigs (myself);
 
       sigproc_printf ("added pid %d to wait list, slot %d, winpid %p, handle %p",
 		  vchild->pid, nchildren, vchild->dwProcessId,
-- 
cgit v1.2.3