thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.2234: get_short_pathname() fails depending on encoding

Browse Source 
Problem:    get_short_pathname() fails depending on encoding.
Solution:   Use the wide version of the library function. (closes #5129)
This commit is contained in:
Bram Moolenaar
2019-10-30 04:10:06 +01:00
parent 69bf634858
commit 3f39697b73
3 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/filepath.c
View File

@@ -30,26 +30,56 @@
get_short_pathname(char_u **fnamep, char_u **bufp, int *fnamelen)
{
int l, len;
char_u *newbuf;
WCHAR *newbuf;
WCHAR *wfname;
len = *fnamelen;
l = GetShortPathName((LPSTR)*fnamep, (LPSTR)*fnamep, len);
len = MAXPATHL;
newbuf = malloc(len * sizeof(*newbuf));
if (newbuf == NULL)
return FAIL;
wfname = enc_to_utf16(*fnamep, NULL);
if (wfname == NULL)
{
vim_free(newbuf);
return FAIL;
}
l = GetShortPathNameW(wfname, newbuf, len);
if (l > len - 1)
{
// If that doesn't work (not enough space), then save the string
// and try again with a new buffer big enough.
newbuf = vim_strnsave(*fnamep, l);
WCHAR *newbuf_t = newbuf;
newbuf = vim_realloc(newbuf, (l + 1) * sizeof(*newbuf));
if (newbuf == NULL)
{
vim_free(wfname);
vim_free(newbuf_t);
return FAIL;
vim_free(*bufp);
*fnamep = *bufp = newbuf;
}
// Really should always succeed, as the buffer is big enough.
l = GetShortPathName((LPSTR)*fnamep, (LPSTR)*fnamep, l+1);
l = GetShortPathNameW(wfname, newbuf, l+1);
}
if (l != 0)
{
char_u *p = utf16_to_enc(newbuf, NULL);
if (p != NULL)
{
vim_free(*bufp);
*fnamep = *bufp = p;
}
else
{
vim_free(wfname);
vim_free(newbuf);
return FAIL;
}
}
vim_free(wfname);
vim_free(newbuf);
*fnamelen = l;
*fnamelen = l == 0 ? l : STRLEN(*bufp);
return OK;
}