diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-11-23 09:05:03 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-11-23 09:05:03 +0000 |
| commit | b9772c06c6b8085b673d4c244da234df22231f80 (patch) | |
| tree | 784df4bb54ddc4d5c22a18d6c0ac23a1f18fd5b4 /usr.bin/rcs/co.c | |
| parent | f54c63e14f2411f22311340e2670fda1054f694e (diff) | |
add support for `-kmode';
Diffstat (limited to 'usr.bin/rcs/co.c')
| -rw-r--r-- | usr.bin/rcs/co.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c index 5c247cd98a4..f56faaf6c9e 100644 --- a/usr.bin/rcs/co.c +++ b/usr.bin/rcs/co.c @@ -1,4 +1,4 @@ -/* $OpenBSD: co.c,v 1.32 2005/11/23 08:42:23 xsa Exp $ */ +/* $OpenBSD: co.c,v 1.33 2005/11/23 09:05:02 xsa Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -42,8 +42,7 @@ static int checkout_state(RCSFILE *, RCSNUM *, const char *, int, int checkout_main(int argc, char **argv) { - int i, ch; - int flags; + int i, ch, flags, kflag; RCSNUM *frev, *rev; RCSFILE *file; char fpath[MAXPATHLEN], buf[16]; @@ -51,6 +50,7 @@ checkout_main(int argc, char **argv) const char *state = NULL; flags = 0; + kflag = RCS_KWEXP_ERR; rev = RCS_HEAD_REV; frev = NULL; @@ -59,12 +59,21 @@ checkout_main(int argc, char **argv) exit (1); } - while ((ch = rcs_getopt(argc, argv, "f::l::M::p::q::r::s:u::Vx:")) != -1) { + while ((ch = rcs_getopt(argc, argv, "f::k:l::M::p::q::r::s:u::Vx:")) != -1) { switch (ch) { case 'f': rcs_set_rev(rcs_optarg, &rev); flags |= FORCE; break; + case 'k': + kflag = rcs_kflag_get(rcs_optarg); + if (RCS_KWEXP_INVAL(kflag)) { + cvs_log(LP_ERR, + "invalid RCS keyword expansion mode"); + (usage)(); + exit(1); + } + break; case 'l': rcs_set_rev(rcs_optarg, &rev); flags |= CO_LOCK; @@ -134,6 +143,9 @@ checkout_main(int argc, char **argv) rcsnum_tostr(frev, buf, sizeof(buf)); + if (kflag != RCS_KWEXP_ERR) + rcs_kwexp_set(file, kflag); + if (flags & CO_STATE) { if (checkout_state(file, frev, argv[i], flags, username, state) < 0) { |