===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/tty.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/mail/tty.c	1997/07/14 15:56:25	1.6
--- src/usr.bin/mail/tty.c	1997/07/22 18:54:45	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: tty.c,v 1.6 1997/07/14 15:56:25 millert Exp $	*/
  /*	$NetBSD: tty.c,v 1.7 1997/07/09 05:25:46 mikel Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: tty.c,v 1.7 1997/07/22 18:54:45 millert Exp $	*/
  /*	$NetBSD: tty.c,v 1.7 1997/07/09 05:25:46 mikel Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)tty.c	8.2 (Berkeley) 4/20/95";
  #else
! static char rcsid[] = "$OpenBSD: tty.c,v 1.6 1997/07/14 15:56:25 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)tty.c	8.2 (Berkeley) 4/20/95";
  #else
! static char rcsid[] = "$OpenBSD: tty.c,v 1.7 1997/07/22 18:54:45 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 79,91 ****
  	sig_t savetstp;
  	sig_t savettou;
  	sig_t savettin;
! 	int errs;
  #ifdef __GNUC__
  	/* Avoid siglongjmp clobbering */
  #ifdef TIOCSTI
  	(void)&extproc;
  #endif
  	(void)&saveint;
  #endif
  
  	savetstp = signal(SIGTSTP, SIG_DFL);
--- 79,92 ----
  	sig_t savetstp;
  	sig_t savettou;
  	sig_t savettin;
! 	int errs = 0;
  #ifdef __GNUC__
  	/* Avoid siglongjmp clobbering */
  #ifdef TIOCSTI
  	(void)&extproc;
  #endif
  	(void)&saveint;
+ 	(void)&errs;
  #endif
  
  	savetstp = signal(SIGTSTP, SIG_DFL);
***************
*** 117,124 ****
  			warn("TIOCEXT: off");
  	}
  # endif	/* TIOCEXT */
! 	if (sigsetjmp(intjmp, 1))
  		goto out;
  	saveint = signal(SIGINT, ttyint);
  #endif
  	if (gflags & GTO) {
--- 118,127 ----
  			warn("TIOCEXT: off");
  	}
  # endif	/* TIOCEXT */
! 	if (sigsetjmp(intjmp, 1)) {
! 		errs = SIGINT;
  		goto out;
+ 	}
  	saveint = signal(SIGINT, ttyint);
  #endif
  	if (gflags & GTO) {