1 files changed, 8 insertions, 1 deletions
diff --git a/dir.c b/dir.c
index 3d3ca48fe4..f21051587e 100644
--- a/dir.c
+++ b/dir.c
@@ -75,6 +75,13 @@ char *strchr _((char*,char));
 
 #define downcase(c) (nocase && ISUPPER(c) ? tolower(c) : (c))
 
+#ifndef CharNext		/* defined as CharNext[AW] on Windows. */
+# if defined(DJGPP)
+#   define CharNext(p) ((p) + mblen(p, MB_CUR_MAX))
+# else
+#   define CharNext(p) ((p) + 1)
+# endif
+#endif
 #if defined DOSISH
 #define isdirsep(c) ((c) == '/' || (c) == '\\')
 static char *
@@ -84,7 +91,7 @@ find_dirsep(s)
     while (*s) {
 	if (isdirsep(*s))
 	    return s;
-	s++;
+	s = CharNext(s);
     }
     return 0;
 }