aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.0895: MS-Windows: dealing with temp name encoding not quite right

Browse Source 
Problem:    MS-Windows: dealing with temp name encoding not quite right.
Solution:   Use more wide functions. (Ken Takata, closes #3921)
This commit is contained in:
Bram Moolenaar 2019-02-10 23:26:13 +01:00
parent dce1e89be4
commit ec0f50a35e
2 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/fileio.c
View File

@ -7322,6 +7322,8 @@ vim_tempname(
{ {
#ifdef USE_TMPNAM #ifdef USE_TMPNAM
char_u itmp[L_tmpnam]; /* use tmpnam() */ char_u itmp[L_tmpnam]; /* use tmpnam() */
#elif defined(WIN3264)
WCHAR itmp[TEMPNAMELEN];
#else #else
char_u itmp[TEMPNAMELEN]; char_u itmp[TEMPNAMELEN];
#endif #endif
@ -7443,51 +7445,33 @@ vim_tempname(
#else /* TEMPDIRNAMES */ #else /* TEMPDIRNAMES */
# ifdef WIN3264 # ifdef WIN3264
char szTempFile[_MAX_PATH + 1]; WCHAR wszTempFile[_MAX_PATH + 1];
char buf4[4]; WCHAR buf4[4];
char_u *retval; char_u *retval;
char_u *p; char_u *p;
STRCPY(itmp, ""); wcscpy(itmp, L"");
if (GetTempPath(_MAX_PATH, szTempFile) == 0) if (GetTempPathW(_MAX_PATH, wszTempFile) == 0)
{ {
szTempFile[0] = '.'; /* GetTempPath() failed, use current dir */ wszTempFile[0] = L'.'; // GetTempPathW() failed, use current dir
szTempFile[1] = NUL; wszTempFile[1] = NUL;
} }
strcpy(buf4, "VIM"); wcscpy(buf4, L"VIM");
buf4[2] = extra_char; /* make it "VIa", "VIb", etc. */ buf4[2] = extra_char; /* make it "VIa", "VIb", etc. */
if (GetTempFileName(szTempFile, buf4, 0, (LPSTR)itmp) == 0) if (GetTempFileNameW(wszTempFile, buf4, 0, itmp) == 0)
return NULL; return NULL;
if (!keep) if (!keep)
/* GetTempFileName() will create the file, we don't want that */ // GetTempFileName() will create the file, we don't want that
(void)DeleteFile((LPSTR)itmp); (void)DeleteFileW(itmp);
/* Backslashes in a temp file name cause problems when filtering with // Backslashes in a temp file name cause problems when filtering with
* "sh". NOTE: This also checks 'shellcmdflag' to help those people who // "sh". NOTE: This also checks 'shellcmdflag' to help those people who
* didn't set 'shellslash'. */ // didn't set 'shellslash'.
retval = vim_strsave(itmp); retval = utf16_to_enc(itmp, NULL);
if (*p_shcf == '-' || p_ssl) if (*p_shcf == '-' || p_ssl)
for (p = retval; *p; ++p) for (p = retval; *p; ++p)
if (*p == '\\') if (*p == '\\')
*p = '/'; *p = '/';
#if defined(WIN3264)
if (enc_utf8)
{
int len;
char_u *pp = NULL;
// Convert from active codepage to UTF-8 since mch_call_shell()
// converts command-line to wide string from encoding.
acp_to_enc(retval, (int)STRLEN(retval), &pp, &len);
if (pp != NULL)
{
vim_free(retval);
return pp;
}
}
#endif
return retval; return retval;
# else /* WIN3264 */ # else /* WIN3264 */

2
src/version.c
View File

@ -783,6 +783,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
895,
/**/ /**/
894, 894,
/**/ /**/