===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/popen.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -c -r1.33 -r1.34
*** src/usr.bin/mail/popen.c	2003/06/03 02:56:11	1.33
--- src/usr.bin/mail/popen.c	2004/09/15 22:21:11	1.34
***************
*** 1,4 ****
! /*	$OpenBSD: popen.c,v 1.33 2003/06/03 02:56:11 millert Exp $	*/
  /*	$NetBSD: popen.c,v 1.6 1997/05/13 06:48:42 mikel Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: popen.c,v 1.34 2004/09/15 22:21:11 deraadt Exp $	*/
  /*	$NetBSD: popen.c,v 1.6 1997/05/13 06:48:42 mikel Exp $	*/
  
  /*
***************
*** 34,40 ****
  #if 0
  static const char sccsid[] = "@(#)popen.c	8.1 (Berkeley) 6/6/93";
  #else
! static const char rcsid[] = "$OpenBSD: popen.c,v 1.33 2003/06/03 02:56:11 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 34,40 ----
  #if 0
  static const char sccsid[] = "@(#)popen.c	8.1 (Berkeley) 6/6/93";
  #else
! static const char rcsid[] = "$OpenBSD: popen.c,v 1.34 2004/09/15 22:21:11 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 344,349 ****
--- 344,350 ----
  	child_freelist = cp;
  }
  
+ /* ARGSUSED */
  void
  sigchild(int signo)
  {
***************
*** 352,359 ****
  	struct child *cp;
  	int save_errno = errno;
  
! 	while ((pid =
! 	    waitpid((pid_t)-1, &status, WNOHANG)) > 0) {
  		cp = findchild(pid, 1);
  		if (!cp)
  			continue;
--- 353,359 ----
  	struct child *cp;
  	int save_errno = errno;
  
! 	while ((pid = waitpid((pid_t)-1, &status, WNOHANG)) > 0) {
  		cp = findchild(pid, 1);
  		if (!cp)
  			continue;
***************
*** 430,436 ****
  handle_spool_locks(int action)
  {
  	static FILE *lockfp = NULL;
- 	static pid_t lock_pid;
  
  	if (action == 0) {
  		/* Clear the lock */
--- 430,435 ----
***************
*** 462,468 ****
  			lockfp = NULL;
  			return(0);
  		}
- 		lock_pid = fp_head->pid;	/* new entries added at head */
  	} else {
  		(void)fprintf(stderr, "handle_spool_locks: unknown action %d\n",
  		    action);
--- 461,466 ----