diff options
| author | Ray Lai <ray@cvs.openbsd.org> | 2006-03-14 01:51:36 +0000 |
|---|---|---|
| committer | Ray Lai <ray@cvs.openbsd.org> | 2006-03-14 01:51:36 +0000 |
| commit | 3b27c0e367bfc7f90808491babf39a068e66537d (patch) | |
| tree | 3546adf430ced73e109f9593fbb490c79191802c | |
| parent | 8a910292291bad1e7f136460ea9a889970017ed5 (diff) | |
OpenRCS currently strips any text in a filename up to and including
the last comma, assuming that it is a `,v' extension. GNU RCS does
not do this. This removes that check.
ok niallo
| -rw-r--r-- | regress/usr.bin/rcs/Makefile | 12 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsprog.c | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/regress/usr.bin/rcs/Makefile b/regress/usr.bin/rcs/Makefile index f1c965c5b2c..09d2ce6fc2a 100644 --- a/regress/usr.bin/rcs/Makefile +++ b/regress/usr.bin/rcs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2006/03/12 00:36:00 ray Exp $ +# $OpenBSD: Makefile,v 1.3 2006/03/14 01:51:35 ray Exp $ # Regression tests by Niall O'Higgins <niallo@openbsd.org>. # ksh -> Makefile by Ray Lai <ray@cyth.net>. @@ -22,7 +22,7 @@ REGRESS_TARGETS+=test-rcsdiff-rflag test-rcs-mflag test-rcs-mflag2 REGRESS_TARGETS+=test-co-RCSINIT test-ci-nflag test-ci-Nflag REGRESS_TARGETS+=test-ci-sflag test-co-lflag2 test-rcsdiff #REGRESS_TARGETS+=test-rcsmerge -REGRESS_TARGETS+=test-ci-dflag +REGRESS_TARGETS+=test-ci-dflag test-comma test-ci-initial: clean @echo 'this is a test file' > test @@ -185,4 +185,12 @@ test-ci-dflag: @${CI} -q -d'2037-01-12 04:00:00+00' -m'dated revision' -l test @grep -q 'dated revision' test,v +test-comma: + @rm -rf RCS + @mkdir -p RCS + @touch file,notext + @echo . | ${CI} -q file,notext + @test -e RCS/file,notext,v + @test ! -e RCS/file,v + .include <bsd.regress.mk> diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c index 842c758a356..295522d1d04 100644 --- a/usr.bin/rcs/rcsprog.c +++ b/usr.bin/rcs/rcsprog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.c,v 1.70 2006/03/12 01:20:38 joris Exp $ */ +/* $OpenBSD: rcsprog.c,v 1.71 2006/03/14 01:51:35 ray Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -239,10 +239,6 @@ rcs_statfile(char *fname, char *out, size_t len) strdir = found = 0; - /* we might have gotten a RCS file as argument */ - if ((ext = strchr(fname, ',')) != NULL) - *ext = '\0'; - /* we might have gotten the RCS/ dir in the argument string */ if (strstr(fname, RCSDIR) != NULL) strdir = 1; |