--- gforth/engine/signals.c	2000/09/23 15:06:08	1.10
+++ gforth/engine/signals.c	2002/01/05 22:59:00	1.13
@@ -16,7 +16,7 @@
 
   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., 675 Mass Ave, Cambridge, MA 02139, USA.
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 */
 
@@ -174,6 +174,7 @@ void get_winsize()
 {
 #ifdef TIOCGWINSZ
   struct winsize size;
+  size.ws_row = size.ws_col = 0;
   
   if (ioctl (1, TIOCGWINSZ, (char *) &size) >= 0) {
     rows = size.ws_row;
@@ -183,15 +184,15 @@ void get_winsize()
   char *s;
   if ((s=getenv("LINES"))) {
     rows=atoi(s);
-    if (rows==0)
-      rows=DEFAULTROWS;
   }
   if ((s=getenv("COLUMNS"))) {
     rows=atoi(s);
-    if (rows==0)
-      cols=DEFAULTCOLS;
   }
 #endif
+  if (rows==0)
+    rows=DEFAULTROWS;
+  if (rows==0)
+    cols=DEFAULTCOLS;
 }
 
 #ifdef SIGWINCH
@@ -366,8 +367,8 @@ void install_signal_handlers(void)
   for (i = 0; i < DIM (sigs_to_quit); i++)
     bsd_signal(sigs_to_quit [i], graceful_exit);
 #ifdef SA_SIGINFO
-  install_signal_handler(SIGFPE, fpe_handler);
-  install_signal_handler(SIGSEGV, segv_handler);
+  install_signal_handler(SIGFPE, die_on_signal ? graceful_exit : fpe_handler);
+  install_signal_handler(SIGSEGV, die_on_signal ? graceful_exit : segv_handler);
 #endif
 #ifdef SIGCONT
     bsd_signal(SIGCONT, termprep);