diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2005-08-19 13:36:51 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2005-08-19 13:36:51 +0000 |
| commit | 09d0149664da35e4c52fc6b8e452e2014a362eca (patch) | |
| tree | c84dc2b364945bf0c3e93dfde6a585bfce92c25c | |
| parent | 611ed891c12727377d533f4d69f5ce8ffde7a44c (diff) | |
do not close the entries file until all files depending on it have
been passed to the callback.
ok xsa@
| -rw-r--r-- | usr.bin/cvs/file.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c index 5774b78515b..bacda35e99c 100644 --- a/usr.bin/cvs/file.c +++ b/usr.bin/cvs/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.115 2005/08/17 16:23:19 joris Exp $ */ +/* $OpenBSD: file.c,v 1.116 2005/08/19 13:36:50 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -604,11 +604,6 @@ cvs_file_loadinfo(char *path, int flags, int (*cb)(CVSFILE *, void *), ((cvs_error = cb(base, arg)) != CVS_EX_OK)) goto fail; - if (entf != NULL) { - cvs_ent_close(entf); - entf = NULL; - } - /* * If we have a normal file, pass it as well. */ @@ -626,6 +621,11 @@ cvs_file_loadinfo(char *path, int flags, int (*cb)(CVSFILE *, void *), } } + if (entf != NULL) { + cvs_ent_close(entf); + entf = NULL; + } + return (base); fail: |