kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

win: expand nested env var #10662

Browse Source 
Vim-compatible behavior for a Windows edge case.
This commit is contained in:
erw7 2019-08-11 16:51:00 +09:00 committed by Justin M. Keyes
parent e5d388f23a
commit 7d664837e1
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/nvim/os/env.c
View File

@ -304,6 +304,30 @@ void init_homedir(void)
if (var == NULL) {
var = os_getenv("USERPROFILE");
}
// Weird but true: $HOME may contain an indirect reference to another
// variable, esp. "%USERPROFILE%". Happens when $USERPROFILE isn't set
// when $HOME is being set.
if (var != NULL && *var == '%') {
const char *p = strchr(var + 1, '%');
if (p != NULL) {
vim_snprintf(os_buf, (size_t)(p - var), "%s", var + 1);
const char *exp = os_getenv(os_buf);
if (exp != NULL && *exp != NUL
&& STRLEN(exp) + STRLEN(p) < MAXPATHL) {
vim_snprintf(os_buf, MAXPATHL, "%s%s", exp, p + 1);
var = os_buf;
}
}
}
// Default home dir is C:/
// Best assumption we can make in such a situation.
if (var == NULL
// Empty means "undefined"
|| *var == NUL) {
var = "C:/";
}
#endif
if (var != NULL) {
@ -705,17 +729,17 @@ char *vim_getenv(const char *name)
// init_path() should have been called before now.
assert(get_vim_var_str(VV_PROGPATH)[0] != NUL);
const char *kos_env_path = os_getenv(name);
if (kos_env_path != NULL) {
return xstrdup(kos_env_path);
}
#ifdef WIN32
if (strcmp(name, "HOME") == 0) {
return xstrdup(homedir);
}
#endif
const char *kos_env_path = os_getenv(name);
if (kos_env_path != NULL) {
return xstrdup(kos_env_path);
}
bool vimruntime = (strcmp(name, "VIMRUNTIME") == 0);
if (!vimruntime && strcmp(name, "VIM") != 0) {
return NULL;

2
src/nvim/testdir/test_windows_home.vim
View File

@ -86,7 +86,7 @@ func Test_WindowsHome()
let $HOME = '%USERPROFILE%\bar'
let $HOMEDRIVE = 'unused'
let $HOMEPATH = 'unused'
" call CheckHome('C:\foo\bar', '%USERPROFILE%\bar')
call CheckHome('C:\foo\bar', '%USERPROFILE%\bar')
" Invalid $HOME is kept
let $USERPROFILE = 'C:\foo'