===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/ci.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/rcs/ci.c	2005/10/08 14:09:18	1.6
--- src/usr.bin/rcs/ci.c	2005/10/08 14:18:35	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: ci.c,v 1.6 2005/10/08 14:09:18 niallo Exp $	*/
  /*
   * Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: ci.c,v 1.7 2005/10/08 14:18:35 niallo Exp $	*/
  /*
   * Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org>
   * All rights reserved.
***************
*** 136,147 ****
  			exit(1);
  		}
  
- 
  		if (dflag) {
  			/* XXX */
  		}
  
- 
  		/*
  		 * Load file contents
  		 */
--- 136,145 ----
***************
*** 183,189 ****
  		 * Current head revision gets the RCS patch as rd_text
  		 */
  		if (rcs_deltatext_set(file, file->rf_head, deltatext) == -1) {
! 			cvs_log(LP_ERR, "failed to set new rd_text for head rev");
  			exit (1);
  		}
  		/*
--- 181,188 ----
  		 * Current head revision gets the RCS patch as rd_text
  		 */
  		if (rcs_deltatext_set(file, file->rf_head, deltatext) == -1) {
! 			cvs_log(LP_ERR,
! 			    "failed to set new rd_text for head rev");
  			exit (1);
  		}
  		/*
***************
*** 286,291 ****
--- 285,291 ----
  	BUF    *logbuf;
  	RCSNUM *tmprev;
  
+ 	rcs_msg = NULL;
  	tmprev = rcsnum_alloc();
  	rcsnum_cpy(rev, tmprev, 16);
  	rcsnum_tostr(rev, prev, sizeof(prev));
***************
*** 293,305 ****
  	rcsnum_free(tmprev);
  
  	if ((logbuf = cvs_buf_alloc(64, BUF_AUTOEXT)) == NULL) {
! 		cvs_log(LP_ERR,
! 		    "failed to allocate log buffer");
  		return (NULL);
  	}
  	cvs_printf("%s  <--  %s\n", rcsfile, workingfile);
! 	cvs_printf("new revision: %s; previous revision: %s\n",
! 	    nrev, prev);
  	cvs_printf("enter log message, terminated with single "
  	    "'.' or end of file:\n");
  	cvs_printf(">> ");
--- 293,303 ----
  	rcsnum_free(tmprev);
  
  	if ((logbuf = cvs_buf_alloc(64, BUF_AUTOEXT)) == NULL) {
! 		cvs_log(LP_ERR, "failed to allocate log buffer");
  		return (NULL);
  	}
  	cvs_printf("%s  <--  %s\n", rcsfile, workingfile);
! 	cvs_printf("new revision: %s; previous revision: %s\n", nrev, prev);
  	cvs_printf("enter log message, terminated with single "
  	    "'.' or end of file:\n");
  	cvs_printf(">> ");