=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/co.c,v retrieving revision 1.18 retrieving revision 1.19 diff -c -r1.18 -r1.19 *** src/usr.bin/rcs/co.c 2005/10/17 15:33:12 1.18 --- src/usr.bin/rcs/co.c 2005/10/18 01:22:14 1.19 *************** *** 1,4 **** ! /* $OpenBSD: co.c,v 1.18 2005/10/17 15:33:12 joris Exp $ */ /* * Copyright (c) 2005 Joris Vink * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: co.c,v 1.19 2005/10/18 01:22:14 joris Exp $ */ /* * Copyright (c) 2005 Joris Vink * All rights reserved. *************** *** 61,113 **** while ((ch = rcs_getopt(argc, argv, "f::l::qr::u::V")) != -1) { switch (ch) { case 'f': ! if (rev != RCS_HEAD_REV) ! cvs_log(LP_WARN, ! "redefinition of revision number"); ! if (rcs_optarg != NULL) { ! if ((rev = rcsnum_parse(rcs_optarg)) == NULL) { ! cvs_log(LP_ERR, "bad revision number"); ! exit (1); ! } ! } fflag = 1; break; case 'l': ! if (rev != RCS_HEAD_REV) ! cvs_log(LP_WARN, ! "redefinition of revision number"); ! if (rcs_optarg != NULL) { ! if ((rev = rcsnum_parse(rcs_optarg)) == NULL) { ! cvs_log(LP_ERR, "bad revision number"); ! exit (1); ! } ! } lock = LOCK_LOCK; break; case 'q': verbose = 0; break; case 'r': ! if (rev != RCS_HEAD_REV) ! cvs_log(LP_WARN, ! "redefinition of revision number"); ! if (rcs_optarg != NULL) { ! if ((rev = rcsnum_parse(rcs_optarg)) == NULL) { ! cvs_log(LP_ERR, "bad revision number"); ! exit (1); ! } ! } break; case 'u': ! if (rev != RCS_HEAD_REV) ! cvs_log(LP_WARN, ! "redefinition of revision number"); ! if (rcs_optarg != NULL) { ! if ((rev = rcsnum_parse(rcs_optarg)) == NULL) { ! cvs_log(LP_ERR, "bad revision number"); ! exit (1); ! } ! } lock = LOCK_UNLOCK; break; case 'V': --- 61,81 ---- while ((ch = rcs_getopt(argc, argv, "f::l::qr::u::V")) != -1) { switch (ch) { case 'f': ! rcs_set_rev(rcs_optarg, &rev); fflag = 1; break; case 'l': ! rcs_set_rev(rcs_optarg, &rev); lock = LOCK_LOCK; break; case 'q': verbose = 0; break; case 'r': ! rcs_set_rev(rcs_optarg, &rev); break; case 'u': ! rcs_set_rev(rcs_optarg, &rev); lock = LOCK_UNLOCK; break; case 'V':