summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2008-03-13 19:54:35 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2008-03-13 19:54:35 +0000
commitafc3a1f8cc136b5c2bb3cab1a62e18b21e787951 (patch)
tree1e6fa6f31eeabab3c11e4ac43a3fa9669e968eb7 /usr.bin
parent7f82c5d4a68a1343e168143c43d9d2e756897731 (diff)
when a file was locally removed and a diff was done against
an opencvs server (with either gnu or opencvs as the client), no actual diff output was produced. traced to the typo fixed in this diff. ok joris
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cvs/diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index 21a84a0187a..9a734327786 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.133 2008/03/02 19:05:34 tobias Exp $ */
+/* $OpenBSD: diff.c,v 1.134 2008/03/13 19:54:34 sthen Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -445,7 +445,7 @@ cvs_diff_local(struct cvs_file *cf)
xfree(p2);
close(fd2);
(void)xasprintf(&p2, "%s", CVS_PATH_DEVNULL);
- if ((fd1 = open(p2, O_RDONLY)) == -1)
+ if ((fd2 = open(p2, O_RDONLY)) == -1)
fatal("cvs_diff_local: cannot open %s",
CVS_PATH_DEVNULL);
}