===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diffreg.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -c -r1.81 -r1.82
*** src/usr.bin/diff/diffreg.c	2012/05/22 12:30:24	1.81
--- src/usr.bin/diff/diffreg.c	2012/07/08 15:48:56	1.82
***************
*** 1,4 ****
! /*	$OpenBSD: diffreg.c,v 1.81 2012/05/22 12:30:24 millert Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diffreg.c,v 1.82 2012/07/08 15:48:56 stsp Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 1288,1304 ****
  asciifile(FILE *f)
  {
  	unsigned char buf[BUFSIZ];
! 	size_t i, cnt;
  
  	if (f == NULL)
  		return (1);
  
  	rewind(f);
  	cnt = fread(buf, 1, sizeof(buf), f);
! 	for (i = 0; i < cnt; i++)
! 		if (!isprint(buf[i]) && !isspace(buf[i]))
! 			return (0);
! 	return (1);
  }
  
  #define begins_with(s, pre) (strncmp(s, pre, sizeof(pre)-1) == 0)
--- 1288,1301 ----
  asciifile(FILE *f)
  {
  	unsigned char buf[BUFSIZ];
! 	size_t cnt;
  
  	if (f == NULL)
  		return (1);
  
  	rewind(f);
  	cnt = fread(buf, 1, sizeof(buf), f);
! 	return (memchr(buf, '\0', cnt) == NULL);
  }
  
  #define begins_with(s, pre) (strncmp(s, pre, sizeof(pre)-1) == 0)