* heap.cc: Remove spurious getpagesize declaration.

* exceptions.cc (ctrl_c_handler): Distinguish CTRL-BREAK from CTRL-C in some
cases.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e28d437..36d2311 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-25  Christopher Faylor  <cgf@timesys.com>
+
+       * heap.cc: Remove spurious getpagesize declaration.
+
+2005-11-25  Christian Franke  <Christian.Franke@t-online.de>
+
+       * exceptions.cc (ctrl_c_handler): Distinguish CTRL-BREAK from CTRL-C in
+       some cases.
+
 2005-11-23  Christopher Faylor  <cgf@timesys.com>
 
        * fhandler_tty.cc (fhandler_tty_slave::open): Reset the current windows

diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 1bb3aea..0988851 100644 (file)
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -923,8 +923,13 @@ ctrl_c_handler (DWORD type)
        that we have handled the signal).  At this point, type should be
        a CTRL_C_EVENT or CTRL_BREAK_EVENT. */
     {
+      int sig = SIGINT;
+      /* If intr and quit are both mapped to ^C, send SIGQUIT on ^BREAK */
+      if (type == CTRL_BREAK_EVENT
+          && t->ti.c_cc[VINTR] == 3 && t->ti.c_cc[VQUIT] == 3)
+        sig = SIGQUIT;
       t->last_ctrl_c = GetTickCount ();
-      killsys (-myself->pid, SIGINT);
+      killsys (-myself->pid, sig);
       t->last_ctrl_c = GetTickCount ();
       return TRUE;
     }

diff --git a/winsup/cygwin/heap.cc b/winsup/cygwin/heap.cc
index 8e420b3..b450199 100644 (file)
--- a/winsup/cygwin/heap.cc
+++ b/winsup/cygwin/heap.cc
@@ -26,8 +26,6 @@ details. */
 
 static unsigned page_const;
 
-extern "C" size_t getpagesize ();
-
 #define MINHEAP_SIZE (4 * 1024 * 1024)
 
 /* Initialize the heap at process start up.  */