[Cvs-cvs] ccvs NEWS ChangeLog src/ChangeLog src/rcs.c src...

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Mark D. Baushke <mdb>   06/06/26 21:23:53

Modified files:
        .              : NEWS ChangeLog 
        src            : ChangeLog rcs.c sanity.sh 

Log message:
        * NEWS: Revert last change for valid characters in tag testing.
        
        * src/rcs.c (RCS_check_tag): Revert last change.
        * src/sanity.sh (tag-valid): Delete test.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/NEWS?cvsroot=cvs&r1=1.357&r2=1.358
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&r1=1.1320&r2=1.1321
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3458&r2=1.3459
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/rcs.c?cvsroot=cvs&r1=1.374&r2=1.375
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1158&r2=1.1159

Patches:
Index: NEWS
===================================================================
RCS file: /cvsroot/cvs/ccvs/NEWS,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -b -r1.357 -r1.358
--- NEWS        24 Jun 2006 03:06:00 -0000      1.357
+++ NEWS        26 Jun 2006 21:23:53 -0000      1.358
@@ -23,10 +23,6 @@
 
 BUG FIXES
 
-* Thanks to a report from Alan Harder <address@hidden>, 'cvs [r]tag'
-  now tests for valid characters in the tag, instead of just a select few
-  invalid ones.
-
 * The GSSAPI server should now build under HP-UX.
 
 * `cvs rtag' now correctly tags files that have been removed from the trunk.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.1320
retrieving revision 1.1321
diff -u -b -r1.1320 -r1.1321
--- ChangeLog   26 Jun 2006 19:41:52 -0000      1.1320
+++ ChangeLog   26 Jun 2006 21:23:53 -0000      1.1321
@@ -1,3 +1,7 @@
+2006-06-26  Mark D. Baushke  <address@hidden>
+
+       * NEWS: Revert last change about valid characters in tag testing.
+
 2006-06-26  Derek Price  <address@hidden>
 
        * configure.in: Define POPEN_BINARY_FLAG.

Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3458
retrieving revision 1.3459
diff -u -b -r1.3458 -r1.3459
--- src/ChangeLog       26 Jun 2006 19:40:51 -0000      1.3458
+++ src/ChangeLog       26 Jun 2006 21:23:53 -0000      1.3459
@@ -1,3 +1,8 @@
+2006-06-24  Mark D. Baushke  <address@hidden>
+
+       * rcs.c (RCS_check_tag): Revert last change.
+       * sanity.sh (tag-valid): Delete test.
+
 2006-06-26  Derek Price  <address@hidden>
 
        * sign.c (gen_signature), verify.c (verify_signature): Use new

Index: src/rcs.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/rcs.c,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -b -r1.374 -r1.375
--- src/rcs.c   24 Jun 2006 03:05:10 -0000      1.374
+++ src/rcs.c   26 Jun 2006 21:23:53 -0000      1.375
@@ -3373,23 +3373,30 @@
 
 
 /*
- * Do some consistency checks on the symbolic tag... This is much stricter
- * to what RCS checks: we allow letters, underscores, dashes and numbers.
- * RCS allows a lot more characters.
+ * Do some consistency checks on the symbolic tag... These should equate
+ * pretty close to what RCS checks, though I don't know for certain.
  */
 void
 RCS_check_tag (const char *tag)
 {
+    char *invalid = "$,.:;@";          /* invalid RCS tag characters */
     const char *cp;
 
-    /* The first character must be an alphabetic letter. */
+    /*
+     * The first character must be an alphabetic letter. The remaining
+     * characters cannot be non-visible graphic characters, and must not be
+     * in the set of "invalid" RCS identifier characters.
+     */
     if (isalpha ((unsigned char) *tag))
     {
        for (cp = tag; *cp; cp++)
        {
-           if (!isalnum ((unsigned char) *cp) && *cp != '_' && *cp != '-' )
-               error (1, 0, "tag `%s' may contain only letters, numbers, "
-                       "_ and -", tag);
+           if (!isgraph ((unsigned char) *cp))
+               error (1, 0, "tag `%s' has non-visible graphic characters",
+                      tag);
+           if (strchr (invalid, *cp))
+               error (1, 0, "tag `%s' must not contain the characters `%s'",
+                      tag, invalid);
        }
     }
     else

Index: src/sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1158
retrieving revision 1.1159
diff -u -b -r1.1158 -r1.1159
--- src/sanity.sh       24 Jun 2006 03:05:10 -0000      1.1158
+++ src/sanity.sh       26 Jun 2006 21:23:53 -0000      1.1159
@@ -2068,7 +2068,7 @@
        tests="${tests} rdiff2 diff diffnl death death2 death-rtag"
        tests="${tests} rm-update-message rmadd rmadd2 rmadd3 resurrection"
        tests="${tests} dirs dirs2 branches branches2 branches3"
-       tests="${tests} branches4 tagc tagf tag-space tag-valid"
+       tests="${tests} branches4 tagc tagf tag-space"
        tests="${tests} rcslib multibranch import importb importc importX"
        tests="$tests importX2 import-CVS import-quirks"
        tests="${tests} update-p import-after-initial branch-after-import"
@@ -8900,74 +8900,6 @@
          ;;
 
 
-       # Test for valid characters in tags
-       tag-valid)
-         # Setup; check in first-dir/file1
-         mkdir 1; cd 1
-         dotest tag-valid-init-1 "$testcvs -q co -l ."
-         mkdir first-dir
-         $testcvs add first-dir 1>/dev/null 2>/dev/null
-         cd first-dir
-         touch file1
-         $testcvs add file1 1>/dev/null 2>/dev/null
-         $testcvs -Q ci -m add 1>/dev/null
-         dotest tag-valid-1 "$testcvs -Q tag abcdefghijklmnopqrstuvwxyz"
-         dotest tag-valid-2 "$testcvs -Q tag ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-         dotest tag-valid-3 "$testcvs -Q tag a0123456789-_"
-
-         dotest_fail tag-valid-4 "$testcvs -Q tag _a" \
-"${SPROG} \[tag aborted\]: tag \`_a' must start with a letter"
-
-      dotest_fail tag-valid-5 "$testcvs -Q tag a$" \
-"$SPROG \[tag aborted\]: tag \`a$' may contain only letters, numbers, _ and -"
-
-      dotest_fail tag-valid-6 "$testcvs -Q tag a." \
-"$SPROG \[tag aborted\]: tag \`a\.' may contain only letters, numbers, _ and -"
-
-      dotest_fail tag-valid-7 "$testcvs -Q tag a:" \
-"$SPROG \[tag aborted\]: tag \`a:' may contain only letters, numbers, _ and -"
-
-      dotest_fail tag-valid-8 "$testcvs -Q tag a," \
-"$SPROG \[tag aborted\]: tag \`a,' may contain only letters, numbers, _ and -"
-
-      dotest_fail tag-valid-9 "$testcvs -Q tag a\;" \
-"$SPROG \[tag aborted\]: tag \`a;' may contain only letters, numbers, _ and -"
-
-      dotest_fail tag-valid-10 "$testcvs -Q tag a@" \
-"$SPROG \[tag aborted\]: tag \`a@' may contain only letters, numbers, _ and -"
-
-      dotest_fail tag-valid-12 "$testcvs -Q tag a/" \
-"$SPROG \[tag aborted\]: tag \`a/' may contain only letters, numbers, _ and -"
-
-      dotest_fail tag-valid-13 "$testcvs -Q tag a!" \
-"$SPROG \[tag aborted\]: tag \`a!' may contain only letters, numbers, _ and -"
-
-      dotest_fail tag-valid-14 "$testcvs -Q tag a#" \
-"$SPROG \[tag aborted\]: tag \`a#' may contain only letters, numbers, _ and -"
-
-      dotest_fail tag-valid-15 "$testcvs -Q tag a%" \
-"$SPROG \[tag aborted\]: tag \`a%' may contain only letters, numbers, _ and -"
-
-      dotest_fail tag-valid-16 "$testcvs -Q tag a^" \
-"$SPROG \[tag aborted\]: tag \`a^' may contain only letters, numbers, _ and -"
-
-      dotest_fail tag-valid-17 "$testcvs -Q tag a\(" \
-"$SPROG \[tag aborted\]: tag \`a(' may contain only letters, numbers, _ and -"
-
-      dotest_fail tag-valid-18 "$testcvs -Q tag a\)" \
-"$SPROG \[tag aborted\]: tag \`a)' may contain only letters, numbers, _ and -"
-
-      if $keep; then
-        echo Keeping $TESTDIR and exiting due to --keep
-        exit 0
-      fi
-
-      cd ../..
-      rm -r 1
-      modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
-
-
-      ;;
 
        rcslib)
          # Test librarification of RCS.