From 4cb553bb788b90c46935275cacc8c1e16805f7d3 Mon Sep 17 00:00:00 2001 From: joris Date: Thu, 26 Mar 2009 22:54:37 +0000 Subject: fix the way Attic is handled in our recursion code, so we do not skip files or run over them twice. also fixes -l and -r for checkout/update when a file in Attic exists with that tag that in HEAD is a directory in the normal repository like gnu/usr.bin/gcc/INSTALL. as a bonus, we do not run fstat() twice per file or dir anymore... spotted by deraadt@ --- usr.bin/cvs/commit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'usr.bin/cvs/commit.c') diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index 4163bdf9631..6accad5063a 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.146 2009/03/25 21:50:33 joris Exp $ */ +/* $OpenBSD: commit.c,v 1.147 2009/03/26 22:54:37 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink * Copyright (c) 2006 Xavier Santolaria @@ -420,17 +420,17 @@ next: cf->file_status != FILE_MODIFIED) return; - cvs_file_get(cf->file_path, 0, &files_affected); + cvs_file_get(cf->file_path, 0, &files_affected, CVS_FILE); switch (cf->file_status) { case FILE_ADDED: - cvs_file_get(cf->file_path, 0, &files_added); + cvs_file_get(cf->file_path, 0, &files_added, CVS_FILE); break; case FILE_REMOVED: - cvs_file_get(cf->file_path, 0, &files_removed); + cvs_file_get(cf->file_path, 0, &files_removed, CVS_FILE); break; case FILE_MODIFIED: - cvs_file_get(cf->file_path, 0, &files_modified); + cvs_file_get(cf->file_path, 0, &files_modified, CVS_FILE); break; } } -- cgit v1.2.3-59-g8ed1b