===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/ident.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/rcs/ident.c	2006/03/22 17:04:52	1.14
--- src/usr.bin/rcs/ident.c	2006/04/14 01:11:07	1.15
***************
*** 1,4 ****
! /*	$OpenBSD: ident.c,v 1.14 2006/03/22 17:04:52 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: ident.c,v 1.15 2006/04/14 01:11:07 deraadt Exp $	*/
  /*
   * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
***************
*** 88,101 ****
  	else
  		filename = "standard output";
  
! 	for (c = 0; c != EOF; (c = getc(fp))) {
! 		if ((feof(fp)) || (ferror(fp)))
  			break;
  		if (c == KEYDELIM)
  			ident_line(fp);
  	}
  
! 	if ((found == 0) && (verbose == 1))
  		fprintf(stderr, "ident warning: no id keywords in %s\n",
  		    filename);
  
--- 88,101 ----
  	else
  		filename = "standard output";
  
! 	for (c = 0; c != EOF; c = getc(fp)) {
! 		if (feof(fp) || ferror(fp))
  			break;
  		if (c == KEYDELIM)
  			ident_line(fp);
  	}
  
! 	if (found == 0 && verbose == 1)
  		fprintf(stderr, "ident warning: no id keywords in %s\n",
  		    filename);
  
***************
*** 111,117 ****
  	p = linebuf;
  
  	while ((c = getc(fp)) != VALDELIM) {
! 		if ((c == EOF) && (feof(fp) | ferror(fp)))
  			return;
  
  		if (isalpha(c))
--- 111,117 ----
  	p = linebuf;
  
  	while ((c = getc(fp)) != VALDELIM) {
! 		if (c == EOF && (feof(fp) | ferror(fp)))
  			return;
  
  		if (isalpha(c))
***************
*** 123,129 ****
  	*(p++) = VALDELIM;
  
  	while ((c = getc(fp)) != KEYDELIM) {
! 		if ((c == EOF) && (feof(fp) | ferror(fp)))
  			return;
  
  		if (c == '\n')
--- 123,129 ----
  	*(p++) = VALDELIM;
  
  	while ((c = getc(fp)) != KEYDELIM) {
! 		if (c == EOF && (feof(fp) | ferror(fp)))
  			return;
  
  		if (c == '\n')