[Cvs-cvs] ccvs/src ChangeLog client.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/06/30 00:38:39

Modified files:
        src            : ChangeLog client.c 

Log message:
        * client.c (is_arg_a_parent_or_listed_dir): Avoid false positives.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3462&r2=1.3463
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.c?cvsroot=cvs&r1=1.456&r2=1.457

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3462
retrieving revision 1.3463
diff -u -b -r1.3462 -r1.3463
--- ChangeLog   29 Jun 2006 17:03:09 -0000      1.3462
+++ ChangeLog   30 Jun 2006 00:38:39 -0000      1.3463
@@ -2,6 +2,7 @@
 
        * client.c (is_arg_a_parent_or_listed_dir): Strip trailing slashes from
        dir name defore searching for it.  Partially addresses TODO #205.
+       Avoid false positives.
        * sanity.sh (trailingslashes): Update to compensate.
 
 2006-06-28  Larry Jones  <address@hidden>

Index: client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -b -r1.456 -r1.457
--- client.c    29 Jun 2006 17:03:09 -0000      1.456
+++ client.c    30 Jun 2006 00:38:39 -0000      1.457
@@ -145,7 +145,10 @@
        hierarchy and descend. */
 
     strip_trailing_slashes (this_argv_elem);
-    if (!strncmp (directory, this_argv_elem, strlen (this_argv_elem)))
+    if (strlen (directory) >= strlen (this_argv_elem)
+       && !strncmp (directory, this_argv_elem, strlen (this_argv_elem))
+       && (strlen (directory) == strlen (this_argv_elem)
+           || ISSLASH (directory[strlen (this_argv_elem)])))
        retval = 1;
     else
        retval = 0;