summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cvs/getlog.c3
-rw-r--r--usr.bin/cvs/rcs.h4
-rw-r--r--usr.bin/cvs/rcsnum.c11
3 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/cvs/getlog.c b/usr.bin/cvs/getlog.c
index 71262f5ea55..8f81cd29338 100644
--- a/usr.bin/cvs/getlog.c
+++ b/usr.bin/cvs/getlog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getlog.c,v 1.55 2006/02/06 16:21:43 xsa Exp $ */
+/* $OpenBSD: getlog.c,v 1.56 2006/04/14 22:33:15 niallo Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -123,6 +123,7 @@ cvs_getlog_init(struct cvs_cmd *cmd, int argc, char **argv, int *arg)
}
*arg = optind;
+ rcsnum_flags |= RCSNUM_NO_MAGIC;
return (0);
}
diff --git a/usr.bin/cvs/rcs.h b/usr.bin/cvs/rcs.h
index 4e4f226e39c..03c07ee88bd 100644
--- a/usr.bin/cvs/rcs.h
+++ b/usr.bin/cvs/rcs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcs.h,v 1.60 2006/04/13 19:55:41 joris Exp $ */
+/* $OpenBSD: rcs.h,v 1.61 2006/04/14 22:33:15 niallo Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -101,6 +101,7 @@ struct rcs_kw {
#define RCSNUM_ISBRANCH(n) ((n)->rn_len % 2)
#define RCSNUM_ISBRANCHREV(n) (!((n)->rn_len % 2) && ((n)->rn_len >= 4))
+#define RCSNUM_NO_MAGIC (1<<0)
/* file flags */
#define RCS_READ (1<<0)
@@ -277,5 +278,6 @@ extern char *timezone_flag;
#if defined(RCSPROG)
extern char *rcs_tmpdir;
#endif
+extern int rcsnum_flags;
#endif /* RCS_H */
diff --git a/usr.bin/cvs/rcsnum.c b/usr.bin/cvs/rcsnum.c
index 871d0807ec0..1063601a8d5 100644
--- a/usr.bin/cvs/rcsnum.c
+++ b/usr.bin/cvs/rcsnum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsnum.c,v 1.35 2006/04/14 02:49:44 deraadt Exp $ */
+/* $OpenBSD: rcsnum.c,v 1.36 2006/04/14 22:33:15 niallo Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -34,6 +34,7 @@
static void rcsnum_setsize(RCSNUM *, u_int);
static char *rcsnum_itoa(u_int16_t, char *, size_t);
+int rcsnum_flags;
/*
* rcsnum_alloc()
@@ -267,12 +268,8 @@ rcsnum_aton(const char *str, char **ep, RCSNUM *nump)
* completely insane and not understandable reason in that output.
*
*/
-#if !defined(RCSPROG)
- if (nump->rn_len > 2 && nump->rn_id[nump->rn_len - 1] == 0 &&
- cvs_cmdop != CVS_OP_LOG) {
-#else
- if (nump->rn_len > 2 && nump->rn_id[nump->rn_len - 1] == 0) {
-#endif
+ if (nump->rn_len > 2 && nump->rn_id[nump->rn_len - 1] == 0
+ && !(rcsnum_flags & RCSNUM_NO_MAGIC)) {
/*
* Look for ".0.x" at the end of the branch number.
*/