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 9.0.1560: Win32: When 'encoding' is set $PATH has duplicate entries

Browse Source 
Problem:    Win32: When 'encoding' is set $PATH has duplicate entries.
Solution:   Only append the directory if it is not there yet. (Ken Takata,
            closes #12400, closes #12372)
This commit is contained in:
K.Takata 2023-05-15 16:41:40 +01:00 committed by Bram Moolenaar
parent 2ba51236fb
commit f741e3ec1f
2 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/os_win32.c
View File

@ -466,10 +466,10 @@ wait_for_single_object(
mch_get_exe_name(void) mch_get_exe_name(void)
{ {
// Maximum length of $PATH is more than MAXPATHL. 8191 is often mentioned // Maximum length of $PATH is more than MAXPATHL. 8191 is often mentioned
// as the maximum length that works (plus a NUL byte). // as the maximum length that works. Add 1 for a NUL byte and 5 for
#define MAX_ENV_PATH_LEN 8192 // "PATH=".
char temp[MAX_ENV_PATH_LEN]; #define MAX_ENV_PATH_LEN (8191 + 1 + 5)
char_u *p; WCHAR temp[MAX_ENV_PATH_LEN];
WCHAR buf[MAX_PATH]; WCHAR buf[MAX_PATH];
int updated = FALSE; int updated = FALSE;
static int enc_prev = -1; static int enc_prev = -1;
@ -482,16 +482,14 @@ mch_get_exe_name(void)
{ {
if (enc_codepage == -1) if (enc_codepage == -1)
enc_codepage = GetACP(); enc_codepage = GetACP();
if (exe_name != NULL) vim_free(exe_name);
vim_free(exe_name);
exe_name = utf16_to_enc(buf, NULL); exe_name = utf16_to_enc(buf, NULL);
enc_prev = enc_codepage; enc_prev = enc_codepage;
WCHAR *wp = wcsrchr(buf, '\\'); WCHAR *wp = wcsrchr(buf, '\\');
if (wp != NULL) if (wp != NULL)
*wp = NUL; *wp = NUL;
if (exe_pathw != NULL) vim_free(exe_pathw);
vim_free(exe_pathw);
exe_pathw = _wcsdup(buf); exe_pathw = _wcsdup(buf);
updated = TRUE; updated = TRUE;
} }
@ -500,28 +498,36 @@ mch_get_exe_name(void)
if (exe_pathw == NULL || !updated) if (exe_pathw == NULL || !updated)
return; return;
char_u *exe_path = utf16_to_enc(exe_pathw, NULL);
if (exe_path == NULL)
return;
// Append our starting directory to $PATH, so that when doing // Append our starting directory to $PATH, so that when doing
// "!xxd" it's found in our starting directory. Needed because // "!xxd" it's found in our starting directory. Needed because
// SearchPath() also looks there. // SearchPath() also looks there.
p = mch_getenv("PATH"); WCHAR *p = _wgetenv(L"PATH");
if (p == NULL if (p == NULL || wcslen(p) + wcslen(exe_pathw) + 2 + 5 < MAX_ENV_PATH_LEN)
|| STRLEN(p) + STRLEN(exe_path) + 2 < MAX_ENV_PATH_LEN)
{ {
wcscpy(temp, L"PATH=");
if (p == NULL || *p == NUL) if (p == NULL || *p == NUL)
temp[0] = NUL; wcscat(temp, exe_pathw);
else else
{ {
STRCPY(temp, p); wcscat(temp, p);
STRCAT(temp, ";");
// Check if exe_path is already included in $PATH.
if (wcsstr(temp, exe_pathw) == NULL)
{
// Append ';' if $PATH doesn't end with it.
size_t len = wcslen(temp);
if (temp[len - 1] != L';')
wcscat(temp, L";");
wcscat(temp, exe_pathw);
}
} }
STRCAT(temp, exe_path); _wputenv(temp);
vim_setenv((char_u *)"PATH", (char_u *)temp); #ifdef libintl_wputenv
libintl_wputenv(temp);
#endif
} }
vim_free(exe_path);
} }
/* /*
@ -558,10 +564,11 @@ vimLoadLib(const char *name)
// NOTE: Do not use mch_dirname() and mch_chdir() here, they may call // NOTE: Do not use mch_dirname() and mch_chdir() here, they may call
// vimLoadLib() recursively, which causes a stack overflow. // vimLoadLib() recursively, which causes a stack overflow.
if (exe_pathw == NULL) if (exe_pathw == NULL)
{
mch_get_exe_name(); mch_get_exe_name();
if (exe_pathw == NULL)
if (exe_pathw == NULL) return NULL;
return NULL; }
WCHAR old_dirw[MAXPATHL]; WCHAR old_dirw[MAXPATHL];

2
src/version.c
View File

@ -695,6 +695,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 */
/**/
1560,
/**/ /**/
1559, 1559,
/**/ /**/