===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/file.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/cvs/file.c	2004/08/06 20:12:15	1.24
--- src/usr.bin/cvs/file.c	2004/08/10 14:23:57	1.25
***************
*** 1,4 ****
! /*	$OpenBSD: file.c,v 1.24 2004/08/06 20:12:15 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved. 
--- 1,4 ----
! /*	$OpenBSD: file.c,v 1.25 2004/08/10 14:23:57 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved. 
***************
*** 227,232 ****
--- 227,233 ----
   * cvs_file_create()
   *
   * Create a new file whose path is specified in <path> and of type <type>.
+  * Returns the created file on success, or NULL on failure.
   */
  
  CVSFILE*
***************
*** 372,382 ****
  
  	dp = parent->cf_ddat;
  
- 	/* if the parent doesn't have an entry for that file, create it */
- 	if ((dp->cd_ent != NULL) &&
- 	    ((ent = cvs_ent_get(dp->cd_ent, file->cf_name)) == NULL)) {
- 	}
- 
  	TAILQ_INSERT_TAIL(&(dp->cd_files), file, cf_list);
  	dp->cd_nfiles++;
  	file->cf_parent = parent;
--- 373,378 ----
***************
*** 429,435 ****
  			}
  		}
  
! 		cdp->cd_ent = cvs_ent_open(cf->cf_path, O_RDONLY);
  	}
  
  	fd = open(cf->cf_path, O_RDONLY);
--- 425,431 ----
  			}
  		}
  
! 		cdp->cd_ent = cvs_ent_open(cf->cf_path, O_RDWR);
  	}
  
  	fd = open(cf->cf_path, O_RDONLY);
***************
*** 476,487 ****
  			}
  		}
  	} while (ret > 0);
- 
- 	/* we can now close our Entries file */
- 	if (cdp->cd_ent != NULL) {
- 		cvs_ent_close(cdp->cd_ent);
- 		cdp->cd_ent = NULL;
- 	}
  
  	if (flags & CF_SORT) {
  		cvs_file_sort(&(cdp->cd_files), cdp->cd_nfiles);
--- 472,477 ----