Merge pull request #16221 from glacambre/fix_13187

fix: remove double slash in sysinit path
This commit is contained in:
James McCoy
2021-11-03 18:24:24 -04:00
committed by GitHub

View File

@@ -1697,8 +1697,11 @@ static void do_system_initialization(void)
} }
char *vimrc = xmalloc(dir_len + sizeof(path_tail) + 1); char *vimrc = xmalloc(dir_len + sizeof(path_tail) + 1);
memcpy(vimrc, dir, dir_len); memcpy(vimrc, dir, dir_len);
vimrc[dir_len] = PATHSEP; if (vimrc[dir_len - 1] != PATHSEP) {
memcpy(vimrc + dir_len + 1, path_tail, sizeof(path_tail)); vimrc[dir_len] = PATHSEP;
dir_len += 1;
}
memcpy(vimrc + dir_len, path_tail, sizeof(path_tail));
if (do_source(vimrc, false, DOSO_NONE) != FAIL) { if (do_source(vimrc, false, DOSO_NONE) != FAIL) {
xfree(vimrc); xfree(vimrc);
xfree(config_dirs); xfree(config_dirs);