===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/status.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -c -r1.51 -r1.52
*** src/usr.bin/cvs/status.c	2006/01/02 08:11:56	1.51
--- src/usr.bin/cvs/status.c	2006/01/25 08:15:05	1.52
***************
*** 1,4 ****
! /*	$OpenBSD: status.c,v 1.51 2006/01/02 08:11:56 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: status.c,v 1.52 2006/01/25 08:15:05 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
***************
*** 154,160 ****
  static int
  cvs_status_local(CVSFILE *cf, void *arg)
  {
- 	int len;
  	size_t n;
  	char buf[MAXNAMLEN], fpath[MAXPATHLEN], rcspath[MAXPATHLEN];
  	char numbuf[64], timebuf[32];
--- 154,159 ----
***************
*** 191,203 ****
  	    buf, cvs_statstr[cf->cf_cvstat]);
  
  	if (cf->cf_cvstat == CVS_FST_UNKNOWN) {
! 		len = snprintf(buf, sizeof(buf), "No entry for %s",
! 		    cf->cf_name);
  	} else if (cf->cf_cvstat == CVS_FST_ADDED) {
! 		len = snprintf(buf, sizeof(buf), "New file!");
  	} else {
  		rcsnum_tostr(cf->cf_lrev, numbuf, sizeof(numbuf));
! 		len = snprintf(buf, sizeof(buf), "%s", numbuf);
  
  		/* Display etime in local mode only. */
  		if (cvs_cmdop != CVS_OP_SERVER) {
--- 190,202 ----
  	    buf, cvs_statstr[cf->cf_cvstat]);
  
  	if (cf->cf_cvstat == CVS_FST_UNKNOWN) {
! 		strlcpy(buf, "No entry for ", sizeof(buf));
! 		strlcat(buf, cf->cf_name, sizeof(buf));
  	} else if (cf->cf_cvstat == CVS_FST_ADDED) {
! 		strlcpy(buf, "New file!", sizeof(buf));
  	} else {
  		rcsnum_tostr(cf->cf_lrev, numbuf, sizeof(numbuf));
! 		strlcpy(buf, numbuf, sizeof(buf));
  
  		/* Display etime in local mode only. */
  		if (cvs_cmdop != CVS_OP_SERVER) {
***************
*** 212,238 ****
  		}
  	}
  
- 	if (len == -1 || len >= (int)sizeof(buf)) {
- 		if (rf != NULL)
- 			rcs_close(rf);
- 		return (CVS_EX_DATA);
- 	}
- 
  	cvs_printf("   Working revision:\t%s\n", buf);
  
  	if (cf->cf_cvstat == CVS_FST_UNKNOWN ||
  	    cf->cf_cvstat == CVS_FST_ADDED) {
! 		len = snprintf(buf, sizeof(buf), "No revision control file");
  	} else {
! 		len = snprintf(buf, sizeof(buf), "%s\t%s",
! 		    rcsnum_tostr(rf->rf_head, numbuf, sizeof(numbuf)),
! 		    rcspath);
! 	}
! 
! 	if (len == -1 || len >= (int)sizeof(buf)) {
! 		if (rf != NULL)
! 			rcs_close(rf);
! 		return (CVS_EX_DATA);
  	}
  
  	cvs_printf("   Repository revision:\t%s\n", buf);
--- 211,226 ----
  		}
  	}
  
  	cvs_printf("   Working revision:\t%s\n", buf);
  
  	if (cf->cf_cvstat == CVS_FST_UNKNOWN ||
  	    cf->cf_cvstat == CVS_FST_ADDED) {
! 		strlcpy(buf, "No revision control file", sizeof(buf));
  	} else {
! 		strlcpy(buf, rcsnum_tostr(rf->rf_head, numbuf, sizeof(numbuf)),
! 		    sizeof(buf));
! 		strlcat(buf, "\t", sizeof(buf));
! 		strlcat(buf, rcspath, sizeof(buf));
  	}
  
  	cvs_printf("   Repository revision:\t%s\n", buf);