updated for version 7.3.874

Problem:    Comparing file names does not handle multi-byte characters
            properly.
Solution:   Implement multi-byte handling.

diff --git a/src/misc1.c b/src/misc1.c
index 1cad0f53b15cceeb57d6c398d6aa3785df249685..7c2d3505244de8d6a03101d620c4c905d27a84d4 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -5049,20 +5049,28 @@ vim_fnamencmp(x, y, len)
     size_t     len;
 {
 #ifdef BACKSLASH_IN_FILENAME
+    char_u     *px = x;
+    char_u     *py = y;
+    int                cx = NUL;
+    int                cy = NUL;
+
     /* TODO: multi-byte characters. */
-    while (len > 0 && *x && *y)
-    {
-       if ((p_fic ? TOLOWER_LOC(*x) != TOLOWER_LOC(*y) : *x != *y)
-               && !(*x == '/' && *y == '\\')
-               && !(*x == '\\' && *y == '/'))
+    while (len > 0)
+    {
+       cx = PTR2CHAR(px);
+       cy = PTR2CHAR(py);
+       if (cx == NUL || cy == NUL
+           || ((p_fic ? MB_TOLOWER(cx) != MB_TOLOWER(cy) : cx != cy)
+               && !(cx == '/' && cy == '\\')
+               && !(cx == '\\' && cy == '/')))
            break;
-       ++x;
-       ++y;
-       --len;
+       len -= MB_PTR2LEN(px);
+       px += MB_PTR2LEN(px);
+       py += MB_PTR2LEN(py);
     }
     if (len == 0)
        return 0;
-    return (*x - *y);
+    return (cx - cy);
 #else
     if (p_fic)
        return MB_STRNICMP(x, y, len);

diff --git a/src/misc2.c b/src/misc2.c
index f075639b0d8dfa72a0d2a6ecc6fd7b603585eefc..bfffd2e8ec413b0e06215d8bdb930e385e5c09c8 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -5352,6 +5352,8 @@ ff_wc_equal(s1, s2)
     char_u     *s2;
 {
     int                i;
+    int                prev1 = NUL;
+    int                prev2 = NUL;
 
     if (s1 == s2)
        return TRUE;
@@ -5362,20 +5364,16 @@ ff_wc_equal(s1, s2)
     if (STRLEN(s1) != STRLEN(s2))
        return FAIL;
 
-    /* TODO: handle multi-byte characters. */
-    for (i = 0; s1[i] != NUL && s2[i] != NUL; i++)
+    for (i = 0; s1[i] != NUL && s2[i] != NUL; i += MB_PTR2LEN(s1 + i))
     {
-       if (s1[i] != s2[i]
-                     && (!p_fic || TOUPPER_LOC(s1[i]) != TOUPPER_LOC(s2[i])))
-       {
-           if (i >= 2)
-               if (s1[i-1] == '*' && s1[i-2] == '*')
-                   continue;
-               else
-                   return FAIL;
-           else
-               return FAIL;
-       }
+       int c1 = PTR2CHAR(s1 + i);
+       int c2 = PTR2CHAR(s2 + i);
+
+       if ((p_fic ? MB_TOLOWER(c1) != MB_TOLOWER(c2) : c1 != c2)
+               && (prev1 != '*' || prev2 != '*'))
+           return FAIL;
+       prev2 = prev1;
+       prev1 = c1;
     }
     return TRUE;
 }

diff --git a/src/version.c b/src/version.c
index 82eca7282e8f2906a941451b5d3f3da2698a6ab3..d7e07550d5ac9a35b9fe2e3b0e1a3dc422d1f7bf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    874,
 /**/
     873,
 /**/