summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/rcs.h
diff options
context:
space:
mode:
authorTobias Stoeckmann <tobias@cvs.openbsd.org>2010-10-20 19:53:54 +0000
committerTobias Stoeckmann <tobias@cvs.openbsd.org>2010-10-20 19:53:54 +0000
commit4bb524a26cf8dbc3f4e455b25d68b291c57a5466 (patch)
tree5f9f06acb1fa9fb2a8b326d68449b3895f59189f /usr.bin/cvs/rcs.h
parent0e7638169c58781079efc0eab384dbe94783283a (diff)
Remove the need for rp_file in parser structure, instead keep only one
FILE pointer in RCSFILE. This fixes some ugliness in closing an fdopen()ed FILE and its underlying file descriptor. Notified by Joerg Sonnenberger <joerg at britannica dot bec to de> discussed with and ok nicm
Diffstat (limited to 'usr.bin/cvs/rcs.h')
-rw-r--r--usr.bin/cvs/rcs.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/cvs/rcs.h b/usr.bin/cvs/rcs.h
index 702e13dc4e5..98b20eeae8a 100644
--- a/usr.bin/cvs/rcs.h
+++ b/usr.bin/cvs/rcs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcs.h,v 1.96 2010/09/03 08:37:52 tobias Exp $ */
+/* $OpenBSD: rcs.h,v 1.97 2010/10/20 19:53:53 tobias Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -26,6 +26,9 @@
#ifndef RCS_H
#define RCS_H
+
+#include <stdio.h>
+
#include "buf.h"
#define RCS_DIFF_DIV \
@@ -169,7 +172,7 @@ struct rcs_delta {
typedef struct rcs_file {
- int rf_fd;
+ FILE *rf_file;
int rf_dead;
char *rf_path;
mode_t rf_mode;