===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/remove.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -c -r1.79 -r1.80
*** src/usr.bin/cvs/remove.c	2008/06/23 20:51:08	1.79
--- src/usr.bin/cvs/remove.c	2009/02/21 14:50:53	1.80
***************
*** 1,4 ****
! /*	$OpenBSD: remove.c,v 1.79 2008/06/23 20:51:08 ragge Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: remove.c,v 1.80 2009/02/21 14:50:53 joris Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   *
***************
*** 124,130 ****
  cvs_remove_force(struct cvs_file *cf)
  {
  	if (cf->file_type != CVS_DIR) {
! 		if (cf->fd != -1) {
  			if (unlink(cf->file_path) == -1)
  				fatal("cvs_remove_force: %s", strerror(errno));
  			(void)close(cf->fd);
--- 124,130 ----
  cvs_remove_force(struct cvs_file *cf)
  {
  	if (cf->file_type != CVS_DIR) {
! 		if (cf->file_flags & FILE_ON_DISK) {
  			if (unlink(cf->file_path) == -1)
  				fatal("cvs_remove_force: %s", strerror(errno));
  			(void)close(cf->fd);
***************
*** 158,164 ****
  		return;
  	}
  
! 	if (cf->fd != -1) {
  		if (verbosity > 1)
  			cvs_log(LP_ERR, "file `%s' still in working directory",
  			    cf->file_name);
--- 158,164 ----
  		return;
  	}
  
! 	if (cf->file_flags & FILE_ON_DISK) {
  		if (verbosity > 1)
  			cvs_log(LP_ERR, "file `%s' still in working directory",
  			    cf->file_name);