===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rlog.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -c -r1.36 -r1.37
*** src/usr.bin/rcs/rlog.c	2006/03/30 06:11:03	1.36
--- src/usr.bin/rcs/rlog.c	2006/04/06 10:04:40	1.37
***************
*** 1,4 ****
! /*	$OpenBSD: rlog.c,v 1.36 2006/03/30 06:11:03 ray Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: rlog.c,v 1.37 2006/04/06 10:04:40 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
***************
*** 81,93 ****
  		case 'q':
  			verbose = 0;
  			break;
  		case 'r':
  			rflag = 1;
  			revisions = rcs_optarg;
  			break;
- 		case 'R':
- 			Rflag = 1;
- 			break;
  		case 's':
  			slist = rcs_optarg;
  			break;
--- 81,93 ----
  		case 'q':
  			verbose = 0;
  			break;
+ 		case 'R':
+ 			Rflag = 1;
+ 			break;
  		case 'r':
  			rflag = 1;
  			revisions = rcs_optarg;
  			break;
  		case 's':
  			slist = rcs_optarg;
  			break;
***************
*** 355,374 ****
  		if (revrange->argv[0] == NULL)
  			/* should not happen */
  			fatal("invalid revision range: %s", revargv->argv[i]);
! 		else if (revrange->argv[1] == NULL) {
  			lstr = rstr = revrange->argv[0];
! 		} else {
  			if (revrange->argv[2] != NULL)
  				fatal("invalid revision range: %s", 
  					revargv->argv[i]);
  			lstr = revrange->argv[0];
  			rstr = revrange->argv[1];
! 			if (strcmp(lstr, "") == 0) {
  				lstr = NULL;
! 			}
! 			if (strcmp(rstr, "") == 0) {
  				rstr = NULL;
- 			}
  		}
  
  		if (lstr == NULL)
--- 355,372 ----
  		if (revrange->argv[0] == NULL)
  			/* should not happen */
  			fatal("invalid revision range: %s", revargv->argv[i]);
! 		else if (revrange->argv[1] == NULL)
  			lstr = rstr = revrange->argv[0];
! 		else {
  			if (revrange->argv[2] != NULL)
  				fatal("invalid revision range: %s", 
  					revargv->argv[i]);
  			lstr = revrange->argv[0];
  			rstr = revrange->argv[1];
! 			if (strcmp(lstr, "") == 0)
  				lstr = NULL;
! 			if (strcmp(rstr, "") == 0)
  				rstr = NULL;
  		}
  
  		if (lstr == NULL)
***************
*** 380,386 ****
  			if (rcsnum_aton(rstr, &ep, &rnum) == 0 || (*ep != '\0'))
  				fatal("invalid revision: %s", rstr);
  		} else
! 			(void)rcsnum_cpy(file->rf_head, &rnum, 0);
  		cvs_argv_destroy(revrange);
  
  		TAILQ_FOREACH(rdp, &file->rf_delta, rd_list)
--- 378,385 ----
  			if (rcsnum_aton(rstr, &ep, &rnum) == 0 || (*ep != '\0'))
  				fatal("invalid revision: %s", rstr);
  		} else
! 			rcsnum_cpy(file->rf_head, &rnum, 0);
! 
  		cvs_argv_destroy(revrange);
  
  		TAILQ_FOREACH(rdp, &file->rf_delta, rd_list)