summaryrefslogtreecommitdiffstats
path: root/usr.bin/cvs/annotate.c
diff options
context:
space:
mode:
authorjfb <jfb@openbsd.org>2004-12-21 18:32:09 +0000
committerjfb <jfb@openbsd.org>2004-12-21 18:32:09 +0000
commitb5f0ecd9305c8f577d16852b607ad02908e01d8b (patch)
tree496a0ed8ed1d16166efdb0e6c3d44f6dc5f6cb09 /usr.bin/cvs/annotate.c
parenton the way to `cvs remove'; ok jfb (diff)
downloadwireguard-openbsd-b5f0ecd9305c8f577d16852b607ad02908e01d8b.tar.xz
wireguard-openbsd-b5f0ecd9305c8f577d16852b607ad02908e01d8b.zip
modify the directory handling portion to behave like the one in add.c,
which does not attempt to send data when running on a local repository. This will be needed to support local repository access
Diffstat (limited to 'usr.bin/cvs/annotate.c')
-rw-r--r--usr.bin/cvs/annotate.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/usr.bin/cvs/annotate.c b/usr.bin/cvs/annotate.c
index 68923aa07ad..755b4b0f3fd 100644
--- a/usr.bin/cvs/annotate.c
+++ b/usr.bin/cvs/annotate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: annotate.c,v 1.2 2004/12/14 22:30:47 jfb Exp $ */
+/* $OpenBSD: annotate.c,v 1.3 2004/12/21 18:32:09 jfb Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -150,12 +150,15 @@ cvs_annotate_file(CVSFILE *cf, void *arg)
ret = 0;
root = CVS_DIR_ROOT(cf);
- if ((root->cr_method != CVS_METHOD_LOCAL) && (cf->cf_type == DT_DIR)) {
- if (cf->cf_cvstat == CVS_FST_UNKNOWN)
- ret = cvs_sendreq(root, CVS_REQ_QUESTIONABLE,
- CVS_FILE_NAME(cf));
- else
- ret = cvs_senddir(root, cf);
+ if (cf->cf_type == DT_DIR) {
+ if (root->cr_method != CVS_METHOD_LOCAL) {
+ if (cf->cf_cvstat == CVS_FST_UNKNOWN)
+ ret = cvs_sendreq(root, CVS_REQ_QUESTIONABLE,
+ CVS_FILE_NAME(cf));
+ else
+ ret = cvs_senddir(root, cf);
+ }
+
return (ret);
}