===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sendbug/sendbug.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -c -r1.41 -r1.42
*** src/usr.bin/sendbug/sendbug.c	2007/04/07 00:40:43	1.41
--- src/usr.bin/sendbug/sendbug.c	2007/04/07 04:58:50	1.42
***************
*** 1,4 ****
! /*	$OpenBSD: sendbug.c,v 1.41 2007/04/07 00:40:43 ray Exp $	*/
  
  /*
   * Written by Ray Lai <ray@cyth.net>.
--- 1,4 ----
! /*	$OpenBSD: sendbug.c,v 1.42 2007/04/07 04:58:50 ray Exp $	*/
  
  /*
   * Written by Ray Lai <ray@cyth.net>.
***************
*** 31,37 ****
  
  int	checkfile(const char *);
  void	dmesg(FILE *);
! int	editit(char *);
  void	init(void);
  int	matchline(const char *, const char *, size_t);
  int	prompt(void);
--- 31,37 ----
  
  int	checkfile(const char *);
  void	dmesg(FILE *);
! int	editit(const char *);
  void	init(void);
  int	matchline(const char *, const char *, size_t);
  int	prompt(void);
***************
*** 222,232 ****
  }
  
  int
! editit(char *pathname)
  {
  	char *argp[] = {"sh", "-c", NULL, NULL}, *ed, *p;
  	sig_t sighup, sigint, sigquit;
! 	pid_t pid, xpid;
  	int st;
  
  	ed = getenv("VISUAL");
--- 222,232 ----
  }
  
  int
! editit(const char *pathname)
  {
  	char *argp[] = {"sh", "-c", NULL, NULL}, *ed, *p;
  	sig_t sighup, sigint, sigquit;
! 	pid_t pid;
  	int st;
  
  	ed = getenv("VISUAL");
***************
*** 262,269 ****
  	}
  	free(p);
  	for (;;) {
! 		xpid = waitpid(pid, &st, WUNTRACED);
! 		if (xpid == -1) {
  			if (errno != EINTR)
  				return (-1);
  		} else if (WIFSTOPPED(st))
--- 262,268 ----
  	}
  	free(p);
  	for (;;) {
! 		if (waitpid(pid, &st, WUNTRACED) == -1) {
  			if (errno != EINTR)
  				return (-1);
  		} else if (WIFSTOPPED(st))