===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/logging.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/sudo/Attic/logging.c	2003/03/15 21:23:54	1.9
--- src/usr.bin/sudo/Attic/logging.c	2003/03/20 02:06:58	1.10
***************
*** 65,71 ****
  #include "sudo.h"
  
  #ifndef lint
! static const char rcsid[] = "$Sudo: logging.c,v 1.157 2003/03/15 20:31:02 millert Exp $";
  #endif /* lint */
  
  static void do_syslog		__P((int, char *));
--- 65,71 ----
  #include "sudo.h"
  
  #ifndef lint
! static const char rcsid[] = "$Sudo: logging.c,v 1.158 2003/03/20 02:04:32 millert Exp $";
  #endif /* lint */
  
  static void do_syslog		__P((int, char *));
***************
*** 547,556 ****
  	get_timestr(), user_name, line);
      fclose(mail);
  
!     /* If mailer is done, wait for it now.  If not reapchild will get it.  */
! #ifdef sudo_waitpid
!     (void) sudo_waitpid(pid, &status, WNOHANG);
! #endif
      (void) sigprocmask(SIG_SETMASK, &oset, NULL);
  }
  
--- 547,554 ----
  	get_timestr(), user_name, line);
      fclose(mail);
  
!     /* If mailer is done, wait for it now.  If not, we'll get it later.  */
!     reapchild(SIGCHLD);
      (void) sigprocmask(SIG_SETMASK, &oset, NULL);
  }
  
***************
*** 592,598 ****
      int status, serrno = errno;
  
  #ifdef sudo_waitpid
!     while (sudo_waitpid(-1, &status, WNOHANG) != -1 && errno == EINTR)
  	;
  #else
      (void) wait(&status);
--- 590,596 ----
      int status, serrno = errno;
  
  #ifdef sudo_waitpid
!     while (sudo_waitpid(-1, &status, WNOHANG) != -1 || errno == EINTR)
  	;
  #else
      (void) wait(&status);