From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 5 May 2011 16:31:59 +0000 (+0200)
Subject: updated for version 7.3.177
X-Git-Tag: v7.3.177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c9c99cb2c7839b96101ba0f41e93f8991adf531;p=vim

updated for version 7.3.177
Problem:    MS-Windows: mkdir() doesn't work properly when 'encoding' is
            "utf-8".
Solution:   Convert to utf-16. (Yukihiro Nakadaira)
---

diff --git a/src/os_win32.c b/src/os_win32.c
index bf51d2473..179ee64ad 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -2639,6 +2639,30 @@ mch_isdir(char_u *name)
     return (f & FILE_ATTRIBUTE_DIRECTORY) != 0;
 }
 
+/*
+ * Create directory "name".
+ * Return 0 on success, -1 on error.
+ */
+    int
+mch_mkdir(char_u *name)
+{
+#ifdef FEAT_MBYTE
+    if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+    {
+	WCHAR	*p;
+	int	retval;
+
+	p = enc_to_utf16(name, NULL);
+	if (p == NULL)
+	    return -1;
+	retval = _wmkdir(p);
+	vim_free(p);
+	return retval;
+    }
+#endif
+    return _mkdir(name);
+}
+
 /*
  * Return TRUE if file "fname" has more than one link.
  */
diff --git a/src/os_win32.h b/src/os_win32.h
index 527d8c7b3..41a44bf0d 100644
--- a/src/os_win32.h
+++ b/src/os_win32.h
@@ -191,5 +191,5 @@ Trace(char *pszFormat, ...);
 #ifdef __BORLANDC__
 # define vim_mkdir(x, y) mkdir(x)
 #else
-# define vim_mkdir(x, y) _mkdir(x)
+# define vim_mkdir(x, y) mch_mkdir(x)
 #endif
diff --git a/src/proto/os_win32.pro b/src/proto/os_win32.pro
index a3f5b3ecd..68d4ee2aa 100644
--- a/src/proto/os_win32.pro
+++ b/src/proto/os_win32.pro
@@ -20,6 +20,7 @@ long mch_getperm __ARGS((char_u *name));
 int mch_setperm __ARGS((char_u *name, long perm));
 void mch_hide __ARGS((char_u *name));
 int mch_isdir __ARGS((char_u *name));
+int mch_mkdir __ARGS((char_u *name));
 int mch_is_linked __ARGS((char_u *fname));
 int win32_fileinfo __ARGS((char_u *name, BY_HANDLE_FILE_INFORMATION *lpFileInfo));
 int mch_writable __ARGS((char_u *name));
diff --git a/src/version.c b/src/version.c
index 94c21dd66..0c24bd2f7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    177,
 /**/
     176,
 /**/