===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sendbug/sendbug.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -c -r1.39 -r1.40
*** src/usr.bin/sendbug/sendbug.c	2007/04/06 21:51:09	1.39
--- src/usr.bin/sendbug/sendbug.c	2007/04/07 00:24:59	1.40
***************
*** 1,4 ****
! /*	$OpenBSD: sendbug.c,v 1.39 2007/04/06 21:51:09 ray Exp $	*/
  
  /*
   * Written by Ray Lai <ray@cyth.net>.
--- 1,4 ----
! /*	$OpenBSD: sendbug.c,v 1.40 2007/04/07 00:24:59 ray Exp $	*/
  
  /*
   * Written by Ray Lai <ray@cyth.net>.
***************
*** 33,39 ****
  void	dmesg(FILE *);
  int	editit(char *);
  void	init(void);
! int	matchline(const char *, const unsigned char *, size_t);
  int	prompt(void);
  int	send_file(const char *, int);
  int	sendmail(const char *);
--- 33,39 ----
  void	dmesg(FILE *);
  int	editit(char *);
  void	init(void);
! int	matchline(const char *, const char *, size_t);
  int	prompt(void);
  int	send_file(const char *, int);
  int	sendmail(const char *);
***************
*** 468,476 ****
  
  /*
   * Does line start with `s' and end with non-comment and non-whitespace?
   */
  int
! matchline(const char *s, const unsigned char *line, size_t linelen)
  {
  	size_t slen;
  	int comment;
--- 468,477 ----
  
  /*
   * Does line start with `s' and end with non-comment and non-whitespace?
+  * Note: Does not treat `line' as a C string.
   */
  int
! matchline(const char *s, const char *line, size_t linelen)
  {
  	size_t slen;
  	int comment;
***************
*** 492,498 ****
  				comment = 0;
  		} else if (*line == '<')
  			comment = 1;
! 		else if (!isspace(*line))
  			return (1);
  		++line;
  		--linelen;
--- 493,499 ----
  				comment = 0;
  		} else if (*line == '<')
  			comment = 1;
! 		else if (!isspace((unsigned char)*line))
  			return (1);
  		++line;
  		--linelen;