aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2021-11-03 18:24:24 -0400
committerGitHub <noreply@github.com>2021-11-03 18:24:24 -0400
commitf26b391317281d0520056eaa8312cf25e654149f (patch)
tree078a94d8c65c7d048e8d22fe4e757ac82c3d0be7
parent2481b18a53e2c395431c1b8f0a8089d3a2fe4c05 (diff)
parent52efcefcc85f2dca05442925d14c5a53aac3c58a (diff)
downloadrneovim-f26b391317281d0520056eaa8312cf25e654149f.tar.gz
rneovim-f26b391317281d0520056eaa8312cf25e654149f.tar.bz2
rneovim-f26b391317281d0520056eaa8312cf25e654149f.zip
Merge pull request #16221 from glacambre/fix_13187
fix: remove double slash in sysinit path
-rw-r--r--src/nvim/main.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 0409628ed8..921bc883cf 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -1697,8 +1697,11 @@ static void do_system_initialization(void)
}
char *vimrc = xmalloc(dir_len + sizeof(path_tail) + 1);
memcpy(vimrc, dir, dir_len);
- vimrc[dir_len] = PATHSEP;
- memcpy(vimrc + dir_len + 1, path_tail, sizeof(path_tail));
+ if (vimrc[dir_len - 1] != PATHSEP) {
+ vimrc[dir_len] = PATHSEP;
+ dir_len += 1;
+ }
+ memcpy(vimrc + dir_len, path_tail, sizeof(path_tail));
if (do_source(vimrc, false, DOSO_NONE) != FAIL) {
xfree(vimrc);
xfree(config_dirs);