diff options
| -rw-r--r-- | usr.bin/rcs/co.c | 10 | ||||
| -rw-r--r-- | usr.bin/rcs/rcs.c | 6 | ||||
| -rw-r--r-- | usr.bin/rcs/rcs.h | 8 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsutil.c | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c index 914880d8904..5052024e0da 100644 --- a/usr.bin/rcs/co.c +++ b/usr.bin/rcs/co.c @@ -1,4 +1,4 @@ -/* $OpenBSD: co.c,v 1.92 2006/05/27 05:49:14 ray Exp $ */ +/* $OpenBSD: co.c,v 1.93 2006/05/27 08:12:29 ray Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -369,8 +369,8 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags, /* * File inherits permissions from its ,v file */ - if (file->fd != -1) { - if (fstat(file->fd, &st) == -1) + if (file->rf_fd != -1) { + if (fstat(file->rf_fd, &st) == -1) err(1, "%s", file->rf_path); mode = st.st_mode; } @@ -385,7 +385,7 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags, } /* Strip all write bits from mode */ - if (file->fd != -1) { + if (file->rf_fd != -1) { mode = st.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH|S_IRUSR|S_IRGRP|S_IROTH); } @@ -406,7 +406,7 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags, } /* Strip all write bits from mode */ - if (file->fd != -1) { + if (file->rf_fd != -1) { mode = st.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH|S_IRUSR|S_IRGRP|S_IROTH); } diff --git a/usr.bin/rcs/rcs.c b/usr.bin/rcs/rcs.c index cfeff4dc281..98c73aaac18 100644 --- a/usr.bin/rcs/rcs.c +++ b/usr.bin/rcs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.9 2006/05/11 07:34:26 xsa Exp $ */ +/* $OpenBSD: rcs.c,v 1.10 2006/05/27 08:12:29 ray Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -262,7 +262,7 @@ rcs_open(const char *path, int fd, int flags, ...) rfp->rf_path = xstrdup(path); rfp->rf_flags = flags | RCS_SLOCK | RCS_SYNCED; rfp->rf_mode = fmode; - rfp->fd = fd; + rfp->rf_fd = fd; TAILQ_INIT(&(rfp->rf_delta)); TAILQ_INIT(&(rfp->rf_access)); @@ -1720,7 +1720,7 @@ rcs_parse_init(RCSFILE *rfp) pdp->rp_lines = 0; pdp->rp_pttype = RCS_TOK_ERR; - if ((pdp->rp_file = fdopen(rfp->fd, "r")) == NULL) + if ((pdp->rp_file = fdopen(rfp->rf_fd, "r")) == NULL) err(1, "fopen: `%s'", rfp->rf_path); pdp->rp_buf = xmalloc((size_t)RCS_BUFSIZE); diff --git a/usr.bin/rcs/rcs.h b/usr.bin/rcs/rcs.h index 725bb40447d..cf9b05cc884 100644 --- a/usr.bin/rcs/rcs.h +++ b/usr.bin/rcs/rcs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.h,v 1.3 2006/05/11 07:34:26 xsa Exp $ */ +/* $OpenBSD: rcs.h,v 1.4 2006/05/27 08:12:29 ray Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -161,13 +161,13 @@ struct rcs_lock { char *rl_name; RCSNUM *rl_num; - TAILQ_ENTRY(rcs_lock) rl_list; + TAILQ_ENTRY(rcs_lock) rl_list; }; struct rcs_branch { RCSNUM *rb_num; - TAILQ_ENTRY(rcs_branch) rb_list; + TAILQ_ENTRY(rcs_branch) rb_list; }; TAILQ_HEAD(rcs_dlist, rcs_delta); @@ -190,7 +190,7 @@ struct rcs_delta { typedef struct rcs_file { - int fd; + int rf_fd; char *rf_path; mode_t rf_mode; u_int rf_flags; diff --git a/usr.bin/rcs/rcsutil.c b/usr.bin/rcs/rcsutil.c index b8542fa1959..cb97e08f3d4 100644 --- a/usr.bin/rcs/rcsutil.c +++ b/usr.bin/rcs/rcsutil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsutil.c,v 1.12 2006/05/27 05:49:14 ray Exp $ */ +/* $OpenBSD: rcsutil.c,v 1.13 2006/05/27 08:12:29 ray Exp $ */ /* * Copyright (c) 2005, 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -43,7 +43,7 @@ rcs_get_mtime(RCSFILE *file) struct stat st; time_t mtime; - if (fstat(file->fd, &st) == -1) { + if (fstat(file->rf_fd, &st) == -1) { warn("%s", file->rf_path); return (-1); } @@ -69,7 +69,7 @@ rcs_set_mtime(RCSFILE *file, time_t mtime) tv[0].tv_sec = mtime; tv[1].tv_sec = tv[0].tv_sec; - if (futimes(file->fd, tv) == -1) + if (futimes(file->rf_fd, tv) == -1) err(1, "utimes"); } |