===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/status.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -c -r1.62 -r1.63
*** src/usr.bin/cvs/status.c	2006/06/01 20:00:52	1.62
--- src/usr.bin/cvs/status.c	2006/06/04 14:56:09	1.63
***************
*** 1,4 ****
! /*	$OpenBSD: status.c,v 1.62 2006/06/01 20:00:52 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: status.c,v 1.63 2006/06/04 14:56:09 xsa Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 117,123 ****
  	    cf->file_ent->ce_conflict != NULL)
  		status = "File had conflicts on merge";
  
! 	cvs_printf("File: %-17s\tStatus: %s\n\n", cf->file_name, status);
  
  	if (cf->file_ent == NULL) {
  		l = snprintf(buf, sizeof(buf),
--- 117,133 ----
  	    cf->file_ent->ce_conflict != NULL)
  		status = "File had conflicts on merge";
  
! 	if (cf->file_status == FILE_LOST ||
! 	    cf->file_status == FILE_UNKNOWN ||
! 	    cf->file_rcs->rf_inattic == 1) {
! 		l = snprintf(buf, sizeof(buf), "no file %s\t", cf->file_name);
! 		if (l == -1 || l >= (int)sizeof(buf))
! 			fatal("cvs_status_local: overflow");
! 	} else
! 		if (strlcpy(buf, cf->file_name, sizeof(buf)) >= sizeof(buf))
! 			fatal("cvs_status_local: overflow");
! 
! 	cvs_printf("File: %-17s\tStatus: %s\n\n", buf, status);
  
  	if (cf->file_ent == NULL) {
  		l = snprintf(buf, sizeof(buf),