commit d0e2d94589d11cad514d1d66ade76d497e9d7567
author Bram Moolenaar <Bram@vim.org> Tue Mar 19 18:31:49 2013 +0100
committer Bram Moolenaar <Bram@vim.org> Tue Mar 19 18:31:49 2013 +0100
tree 158439512a9e8af7f411f006d12a22335dadaee0
parent c2c355df6f094cdb9e599fd395a78c14486ec697

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

src/misc1.c

diff --git a/src/misc1.c b/src/misc1.c
index 1cad0f5..7c2d350 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -5049,20 +5049,28 @@
     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)
+    while (len > 0)
     {
-	if ((p_fic ? TOLOWER_LOC(*x) != TOLOWER_LOC(*y) : *x != *y)
-		&& !(*x == '/' && *y == '\\')
-		&& !(*x == '\\' && *y == '/'))
+	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);

src/misc2.c

diff --git a/src/misc2.c b/src/misc2.c
index f075639..bfffd2e 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -5352,6 +5352,8 @@
     char_u	*s2;
 {
     int		i;
+    int		prev1 = NUL;
+    int		prev2 = NUL;
 
     if (s1 == s2)
 	return TRUE;
@@ -5362,20 +5364,16 @@
     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;
 }

src/version.c

diff --git a/src/version.c b/src/version.c
index 82eca72..d7e0755 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    874,
+/**/
     873,
 /**/
     872,