===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/lex.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/mail/lex.c	1997/07/24 17:27:11	1.12
--- src/usr.bin/mail/lex.c	1997/07/30 06:32:40	1.13
***************
*** 1,4 ****
! /*	$OpenBSD: lex.c,v 1.12 1997/07/24 17:27:11 millert Exp $	*/
  /*	$NetBSD: lex.c,v 1.10 1997/05/17 19:55:13 pk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: lex.c,v 1.13 1997/07/30 06:32:40 millert Exp $	*/
  /*	$NetBSD: lex.c,v 1.10 1997/05/17 19:55:13 pk Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)lex.c	8.2 (Berkeley) 4/20/95";
  #else
! static char rcsid[] = "$OpenBSD: lex.c,v 1.12 1997/07/24 17:27:11 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)lex.c	8.2 (Berkeley) 4/20/95";
  #else
! static char rcsid[] = "$OpenBSD: lex.c,v 1.13 1997/07/30 06:32:40 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 220,231 ****
  
  	if (!sourcing) {
  		if (signal(SIGINT, SIG_IGN) != SIG_IGN)
! 			signal(SIGINT, intr);
  		if (signal(SIGHUP, SIG_IGN) != SIG_IGN)
! 			signal(SIGHUP, hangup);
! 		signal(SIGTSTP, stop);
! 		signal(SIGTTOU, stop);
! 		signal(SIGTTIN, stop);
  	}
  	setexit();
  	for (;;) {
--- 220,231 ----
  
  	if (!sourcing) {
  		if (signal(SIGINT, SIG_IGN) != SIG_IGN)
! 			(void)signal(SIGINT, intr);
  		if (signal(SIGHUP, SIG_IGN) != SIG_IGN)
! 			(void)signal(SIGHUP, hangup);
! 		(void)signal(SIGTSTP, stop);
! 		(void)signal(SIGTTOU, stop);
! 		(void)signal(SIGTTIN, stop);
  	}
  	setexit();
  	for (;;) {
***************
*** 577,588 ****
  	sig_t old_action = signal(s, SIG_DFL);
  	sigset_t nset;
  
! 	sigemptyset(&nset);
! 	sigaddset(&nset, s);
! 	sigprocmask(SIG_UNBLOCK, &nset, NULL);
! 	kill(0, s);
! 	sigprocmask(SIG_BLOCK, &nset, NULL);
! 	signal(s, old_action);
  	if (reset_on_stop) {
  		reset_on_stop = 0;
  		reset(0);
--- 577,588 ----
  	sig_t old_action = signal(s, SIG_DFL);
  	sigset_t nset;
  
! 	(void)sigemptyset(&nset);
! 	(void)sigaddset(&nset, s);
! 	(void)sigprocmask(SIG_UNBLOCK, &nset, NULL);
! 	(void)kill(0, s);
! 	(void)sigprocmask(SIG_BLOCK, &nset, NULL);
! 	(void)signal(s, old_action);
  	if (reset_on_stop) {
  		reset_on_stop = 0;
  		reset(0);