--- gforth/engine/signals.c	2003/02/17 22:42:09	1.25
+++ gforth/engine/signals.c	2012/03/16 20:34:23	1.43
@@ -1,12 +1,12 @@
 /* signal handling
 
-  Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,2000,2003,2006,2007,2011 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
   Gforth is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License
-  as published by the Free Software Foundation; either version 2
+  as published by the Free Software Foundation, either version 3
   of the License, or (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+  along with this program; if not, see http://www.gnu.org/licenses/.
 
 */
 
@@ -30,9 +29,9 @@
 #if !defined(apollo) && !defined(MSDOS)
 #include <sys/ioctl.h>
 #endif
-/* #include <asm/signal.h> */
 #include <sys/types.h>
 #include <signal.h>
+#include <termios.h>
 #include "io.h"
 
 #ifndef HAVE_STACK_T
@@ -41,7 +40,7 @@ typedef struct sigaltstack stack_t;
 #endif
 
 #define DEFAULTCOLS 80
-#if defined(MSDOS) || defined (_WIN32)
+#if defined(MSDOS) || defined (_WIN32) || defined (__CYGWIN__)
 #define DEFAULTROWS 25
 #else
 #define DEFAULTROWS 24
@@ -93,7 +92,12 @@ graceful_exit (int sig)
   exit (0x80|sig);
 }
 
-jmp_buf throw_jmp_buf;
+__thread jmp_buf throw_jmp_buf;
+
+void throw(int code)
+{
+  longjmp(throw_jmp_buf,code); /* !! or use siglongjmp ? */
+}
 
 static void 
 signal_throw(int sig)
@@ -112,7 +116,15 @@ signal_throw(int sig)
 #endif
   default: code=-256-sig; break;
   }
-  longjmp(throw_jmp_buf,code); /* !! or use siglongjmp ? */
+#ifdef __CYGWIN__
+  /* the SA_NODEFER apparently does not work on Cygwin 1.3.18(0.69/3/2) */
+  {
+    sigset_t emptyset;
+    sigemptyset(&emptyset);
+    sigprocmask(SIG_SETMASK, &emptyset, NULL);
+  }
+#endif
+  throw(code);
 }
 
 #ifdef SA_SIGINFO
@@ -129,22 +141,30 @@ static void fpe_handler(int sig, siginfo
 
   switch(info->si_code) {
 #ifdef FPE_INTDIV
-  case FPE_INTDIV: code=-10; break; /* integer divide by zero */
+  case FPE_INTDIV: code=BALL_DIVZERO; break;
 #endif
 #ifdef FPE_INTOVF
-  case FPE_INTOVF: code=-11; break; /* integer overflow */
+  case FPE_INTOVF: code=BALL_RESULTRANGE; break; /* integer overflow */
 #endif
+#ifdef FPE_FLTDIV
   case FPE_FLTDIV: code=-42; break; /* floating point divide by zero */
+#endif
+#ifdef FPE_FLTOVF
   case FPE_FLTOVF: code=-43; break; /* floating point overflow  */
+#endif
+#ifdef FPE_FLTUND
   case FPE_FLTUND: code=-54; break; /* floating point underflow  */
+#endif
+#ifdef FPE_FLTRES
   case FPE_FLTRES: code=-41; break; /* floating point inexact result  */
+#endif
 #if 0 /* defined by Unix95, but unnecessary */
   case FPE_FLTINV: /* invalid floating point operation  */
   case FPE_FLTSUB: /* subscript out of range  */
 #endif
   default: code=-55; break;
   }
-  longjmp(throw_jmp_buf,code);
+  throw(code);
 }
 
 
@@ -177,7 +197,7 @@ static void segv_handler(int sig, siginf
     code=-44;
   else if (JUSTOVER(addr, NEXTPAGE(h->fp_stack_base+h->fp_stack_size)))
     code=-45;
-  longjmp(throw_jmp_buf,code);
+  throw(code);
 }
 
 #endif /* defined(SA_SIGINFO) */
@@ -211,7 +231,7 @@ void get_winsize()
 #endif
   if (rows==0)
     rows=DEFAULTROWS;
-  if (rows==0)
+  if (cols==0)
     cols=DEFAULTCOLS;
 }
 
@@ -298,13 +318,43 @@ void install_signal_handlers(void)
   };
 #endif
 
+  static short async_sigs_to_throw [] = {
+#ifdef SIGINT
+    SIGINT,
+#endif
+#ifdef SIGALRM
+    SIGALRM,
+#endif
+#ifdef SIGPOLL
+    SIGPOLL,
+#endif
+#ifdef SIGPROF
+    SIGPROF,
+#endif
+#ifdef SIGURG
+    SIGURG,
+#endif
+#ifdef SIGPIPE
+    SIGPIPE,
+#endif
+#ifdef SIGUSR1
+    SIGUSR1,
+#endif
+#ifdef SIGUSR2
+    SIGUSR2,
+#endif
+#ifdef SIGVTALRM
+    SIGVTALRM,
+#endif
+#ifdef SIGXFSZ
+    SIGXFSZ,
+#endif
+  };
+
   static short sigs_to_throw [] = {
 #ifdef SIGBREAK
     SIGBREAK,
 #endif
-#ifdef SIGINT
-    SIGINT,
-#endif
 #ifdef SIGILL
     SIGILL,
 #endif
@@ -320,18 +370,6 @@ void install_signal_handlers(void)
 #ifdef SIGSEGV
     SIGSEGV,
 #endif
-#ifdef SIGALRM
-    SIGALRM,
-#endif
-#ifdef SIGPIPE
-    SIGPIPE,
-#endif
-#ifdef SIGPOLL
-    SIGPOLL,
-#endif
-#ifdef SIGPROF
-    SIGPROF,
-#endif
 #ifdef SIGBUS
     SIGBUS,
 #endif
@@ -341,22 +379,8 @@ void install_signal_handlers(void)
 #ifdef SIGTRAP
     SIGTRAP,
 #endif
-#ifdef SIGURG
-    SIGURG,
-#endif
-#ifdef SIGUSR1
-    SIGUSR1,
-#endif
-#ifdef SIGUSR2
-    SIGUSR2,
-#endif
-#ifdef SIGVTALRM
-    SIGVTALRM,
-#endif
-#ifdef SIGXFSZ
-    SIGXFSZ,
-#endif
   };
+
   static short sigs_to_quit [] = {
 #ifdef SIGQUIT
     SIGQUIT,
@@ -385,14 +409,16 @@ void install_signal_handlers(void)
      SUSv2 ss_sp should point to the start of the stack, but
      unfortunately Irix 6.5 (at least) expects ss_sp to point to the
      end, so we work around this issue by accomodating everyone. */
-  if ((sigstack.ss_sp = my_alloc(sigstack.ss_size*2)) != NULL) {
+  if ((sigstack.ss_sp = gforth_alloc(sigstack.ss_size*2)) != NULL) {
     sigstack.ss_sp += sigstack.ss_size;
     sigstack.ss_flags=0;
     sas_retval=sigaltstack(&sigstack,(stack_t *)0);
   }
+#if defined(HAS_FILE) || !defined(STANDALONE)
   if (debug)
     fprintf(stderr,"sigaltstack: %s\n",strerror(sas_retval));
 #endif
+#endif
 
 #define DIM(X)		(sizeof (X) / sizeof *(X))
 /*
@@ -401,6 +427,9 @@ void install_signal_handlers(void)
 */
   for (i = 0; i < DIM (sigs_to_throw); i++)
     bsd_signal(sigs_to_throw[i], throw_handler);
+  for (i = 0; i < DIM (async_sigs_to_throw); i++)
+    bsd_signal(async_sigs_to_throw[i], 
+               ignore_async_signals ? SIG_IGN : throw_handler);
   for (i = 0; i < DIM (sigs_to_quit); i++)
     bsd_signal(sigs_to_quit [i], graceful_exit);
 #ifdef SA_SIGINFO