--- gforth/engine/signals.c	2003/08/20 09:23:46	1.28
+++ gforth/engine/signals.c	2007/12/16 15:22:05	1.37
@@ -1,6 +1,6 @@
 /* signal handling
 
-  Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,2000,2003,2006 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
@@ -41,7 +41,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
@@ -95,6 +95,11 @@ graceful_exit (int sig)
 
 jmp_buf throw_jmp_buf;
 
+void throw(int code)
+{
+  longjmp(throw_jmp_buf,code); /* !! or use siglongjmp ? */
+}
+
 static void 
 signal_throw(int sig)
 {
@@ -120,7 +125,7 @@ signal_throw(int sig)
     sigprocmask(SIG_SETMASK, &emptyset, NULL);
   }
 #endif
-  longjmp(throw_jmp_buf,code); /* !! or use siglongjmp ? */
+  throw(code);
 }
 
 #ifdef SA_SIGINFO
@@ -137,10 +142,10 @@ 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 */
@@ -160,7 +165,7 @@ static void fpe_handler(int sig, siginfo
 #endif
   default: code=-55; break;
   }
-  longjmp(throw_jmp_buf,code);
+  throw(code);
 }
 
 
@@ -193,7 +198,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) */
@@ -227,7 +232,7 @@ void get_winsize()
 #endif
   if (rows==0)
     rows=DEFAULTROWS;
-  if (rows==0)
+  if (cols==0)
     cols=DEFAULTCOLS;
 }
 
@@ -314,13 +319,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
@@ -336,18 +371,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
@@ -357,22 +380,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,
@@ -401,14 +410,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))
 /*
@@ -417,6 +428,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