===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/popen.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/mail/popen.c	1996/06/11 12:53:47	1.2
--- src/usr.bin/mail/popen.c	1996/06/26 21:22:34	1.3
***************
*** 1,4 ****
! /*	$OpenBSD: popen.c,v 1.2 1996/06/11 12:53:47 deraadt Exp $	*/
  /*	$NetBSD: popen.c,v 1.4 1996/06/08 19:48:35 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: popen.c,v 1.3 1996/06/26 21:22:34 dm Exp $	*/
  /*	$NetBSD: popen.c,v 1.4 1996/06/08 19:48:35 christos Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)popen.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: popen.c,v 1.2 1996/06/11 12:53:47 deraadt Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)popen.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: popen.c,v 1.3 1996/06/26 21:22:34 dm Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 283,293 ****
  		dup2(infd, 0);
  	if (outfd >= 0)
  		dup2(outfd, 1);
! 	for (i = 1; i <= NSIG; i++)
! 		if (sigismember(nset, i))
! 			(void) signal(i, SIG_IGN);
! 	if (!sigismember(nset, SIGINT))
! 		(void) signal(SIGINT, SIG_DFL);
  	sigfillset(&fset);
  	(void) sigprocmask(SIG_UNBLOCK, &fset, NULL);
  }
--- 283,295 ----
  		dup2(infd, 0);
  	if (outfd >= 0)
  		dup2(outfd, 1);
! 	if (nset) {
! 		for (i = 1; i <= NSIG; i++)
! 			if (sigismember(nset, i))
! 				(void) signal(i, SIG_IGN);
! 		if (!sigismember(nset, SIGINT))
! 			(void) signal(SIGINT, SIG_DFL);
! 	}
  	sigfillset(&fset);
  	(void) sigprocmask(SIG_UNBLOCK, &fset, NULL);
  }