[Cvs-cvs] ccvs/src ChangeLog client.c sanity.sh [cvs1-11-x-branch]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Derek Robert Price <dprice>     06/06/29 16:46:48

Modified files:
        src            : ChangeLog client.c sanity.sh 

Log message:
        * client.c (is_arg_a_parent_or_listed_dir): Strip trailing slashes from
        dir name defore searching for it.  Partially addresses TODO #205.
        * sanity.sh (trailingslashes): Update to compensate.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.462&r2=1.2336.2.463
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.318.4.42&r2=1.318.4.43
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.752.2.201&r2=1.752.2.202

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2336.2.462
retrieving revision 1.2336.2.463
diff -u -b -r1.2336.2.462 -r1.2336.2.463
--- ChangeLog   28 Jun 2006 14:02:34 -0000      1.2336.2.462
+++ ChangeLog   29 Jun 2006 16:46:45 -0000      1.2336.2.463
@@ -1,3 +1,9 @@
+2006-06-29  Derek Price  <address@hidden>
+
+       * client.c (is_arg_a_parent_or_listed_dir): Strip trailing slashes from
+       dir name defore searching for it.  Partially addresses TODO #205.
+       * sanity.sh (trailingslashes): Update to compensate.
+
 2006-06-28  Derek Price  <address@hidden>
 
        [bug #16961]

Index: client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.318.4.42
retrieving revision 1.318.4.43
diff -u -b -r1.318.4.42 -r1.318.4.43
--- client.c    8 Jun 2006 19:58:30 -0000       1.318.4.42
+++ client.c    29 Jun 2006 16:46:46 -0000      1.318.4.43
@@ -160,17 +160,22 @@
     void *d;
 {
     char *directory = n->key;  /* name of the dir sent to server */
-    char *this_argv_elem = (char *) d; /* this argv element */
+    char *this_argv_elem = xstrdup (d);        /* this argv element */
+    int retval;
 
     /* Say we should send this argument if the argument matches the
        beginning of a directory name sent to the server.  This way,
        the server will know to start at the top of that directory
        hierarchy and descend. */
 
+    strip_trailing_slashes (this_argv_elem);
     if (strncmp (directory, this_argv_elem, strlen (this_argv_elem)) == 0)
-       return 1;
+       retval = 1;
+    else
+       retval = 0;
 
-    return 0;
+    free (this_argv_elem);
+    return retval;
 }
 
 static int arg_should_not_be_sent_to_server PROTO((char *));

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.752.2.201
retrieving revision 1.752.2.202
diff -u -b -r1.752.2.201 -r1.752.2.202
--- sanity.sh   10 Jun 2006 15:55:54 -0000      1.752.2.201
+++ sanity.sh   29 Jun 2006 16:46:46 -0000      1.752.2.202
@@ -14980,18 +14980,10 @@
          dotest trailingslashes-1 "$testcvs -q up CVSROOT"
          dotest_fail trailingslashes-1a "test -f topfile"
 
-         # FIXCVS:
-         # Now the one that fails in remote mode.
-         # This highlights one of the failure cases mentioned in TODO item
-         # #205.
-         if $remote; then
-                 dotest trailingslashes-2 "$testcvs -q up CVSROOT/" \
-"U topfile"
-                 dotest trailingslashes-2a "test -f topfile"
-         else
+         # Now the one that used to fail in remote mode prior to 1.11.24
+         # & 1.12.14.  Formerly TODO item #205.
                  dotest trailingslashes-2 "$testcvs -q up CVSROOT/"
                  dotest_fail trailingslashes-2a "test -f topfile"
-         fi
 
          if $keep; then
            echo Keeping $TESTDIR and exiting due to --keep