aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.1.0297: MS-Windows: tests fail, Vim crashes

Browse Source 
Problem:    MS-Windows: tests fail, Vim crashes.
Solution:   Fix long file name handling.
This commit is contained in:
Bram Moolenaar
2018-08-19 14:38:42 +02:00
parent 111bbd61e9
commit cea1f9ec52
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/os_win32.c
View File

@@ -3109,6 +3109,7 @@ mch_dirname(
int len) int len)
{ {
char_u abuf[_MAX_PATH + 1]; char_u abuf[_MAX_PATH + 1];
DWORD lfnlen;
/* /*
* Originally this was: * Originally this was:
@@ -3124,11 +3125,19 @@ mch_dirname(
if (GetCurrentDirectoryW(_MAX_PATH, wbuf) != 0) if (GetCurrentDirectoryW(_MAX_PATH, wbuf) != 0)
{ {
WCHAR wcbuf[_MAX_PATH + 1]; WCHAR wcbuf[_MAX_PATH + 1];
char_u *p; char_u *p = NULL;
if (GetLongPathNameW(wbuf, wcbuf, _MAX_PATH) != 0) if (GetLongPathNameW(wbuf, wcbuf, _MAX_PATH) != 0)
{
p = utf16_to_enc(wcbuf, NULL); p = utf16_to_enc(wcbuf, NULL);
else if (STRLEN(p) >= (size_t)len)
{
// long path name is too long, fall back to short one
vim_free(p);
p = NULL;
}
}
if (p == NULL)
p = utf16_to_enc(wbuf, NULL); p = utf16_to_enc(wbuf, NULL);
if (p != NULL) if (p != NULL)
@@ -3143,11 +3152,13 @@ mch_dirname(
#endif #endif
if (GetCurrentDirectory(len, (LPSTR)buf) == 0) if (GetCurrentDirectory(len, (LPSTR)buf) == 0)
return FAIL; return FAIL;
if (GetLongPathNameA((LPSTR)buf, (LPSTR)abuf, _MAX_PATH) == 0) lfnlen = GetLongPathNameA((LPCSTR)buf, (LPSTR)abuf, _MAX_PATH);
// return the short path name if (lfnlen == 0 || lfnlen >= (DWORD)len)
// Failed to get long path name or it's too long: fall back to the
// short path name.
return OK; return OK;
vim_strncpy(abuf, buf, len - 1); STRCPY(buf, abuf);
return OK; return OK;
} }

2
src/version.c
View File

@@ -794,6 +794,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 */
/**/
297,
/**/ /**/
296, 296,
/**/ /**/