===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/rcs.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -c -r1.187 -r1.188
*** src/usr.bin/cvs/rcs.c	2006/08/02 03:23:40	1.187
--- src/usr.bin/cvs/rcs.c	2006/08/23 20:28:00	1.188
***************
*** 1,4 ****
! /*	$OpenBSD: rcs.c,v 1.187 2006/08/02 03:23:40 ray Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcs.c,v 1.188 2006/08/23 20:28:00 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 2417,2423 ****
  		*(bp++) = ch;
  		for (;;) {
  			ch = getc(pdp->rp_file);
! 			if (!isalnum(ch) && ch != '_' && ch != '-' &&
  			    ch != '/') {
  				ungetc(ch, pdp->rp_file);
  				break;
--- 2417,2426 ----
  		*(bp++) = ch;
  		for (;;) {
  			ch = getc(pdp->rp_file);
! 			if (ch == EOF) {
! 				type = RCS_TOK_EOF;
! 				break;
! 			} else if (!isalnum(ch) && ch != '_' && ch != '-' &&
  			    ch != '/') {
  				ungetc(ch, pdp->rp_file);
  				break;
***************
*** 2446,2452 ****
  		type = RCS_TOK_STRING;
  		for (;;) {
  			ch = getc(pdp->rp_file);
! 			if (ch == '@') {
  				ch = getc(pdp->rp_file);
  				if (ch != '@') {
  					ungetc(ch, pdp->rp_file);
--- 2449,2458 ----
  		type = RCS_TOK_STRING;
  		for (;;) {
  			ch = getc(pdp->rp_file);
! 			if (ch == EOF) {
! 				type = RCS_TOK_EOF;
! 				break;
! 			} else if (ch == '@') {
  				ch = getc(pdp->rp_file);
  				if (ch != '@') {
  					ungetc(ch, pdp->rp_file);
***************
*** 2472,2477 ****
--- 2478,2487 ----
  
  		for (;;) {
  			ch = getc(pdp->rp_file);
+ 			if (ch == EOF) {
+ 				type = RCS_TOK_EOF;
+ 				break;
+ 			}
  			if (bp == pdp->rp_bufend)
  				break;
  			if (!isdigit(ch) && ch != '.') {