From e09fb6ee534bf02535e4458cb6eb24aefb3aab24 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 29 Dec 2018 00:08:12 -0500 Subject: vim-patch:8.0.1469: when package path is a symlink 'runtimepath' is wrong Problem: When package path is a symlink adding it to 'runtimepath' happens at the end. Solution: Do not resolve symlinks before locating the position in 'runtimepath'. (Ozaki Kiichi, closes vim/vim#2604) https://github.com/vim/vim/commit/2374faae111057ee28e8d487f9a52a95855e2206 --- src/nvim/ex_cmds2.c | 238 +++++++++++++++++++++++++++++----------------------- 1 file changed, 132 insertions(+), 106 deletions(-) (limited to 'src') diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index c9b6d19aaa..4e3fc86539 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -2536,137 +2536,163 @@ static void source_all_matches(char_u *pat) } } -// used for "cookie" of add_pack_plugin() -static int APP_ADD_DIR; -static int APP_LOAD; -static int APP_BOTH; - -static void add_pack_plugin(char_u *fname, void *cookie) +/// Add the package directory to 'runtimepath' +static int add_pack_dir_to_rtp(char_u *fname) { char_u *p4, *p3, *p2, *p1, *p; char_u *buf = NULL; + char *afterdir = NULL; + int retval = FAIL; + + p4 = p3 = p2 = p1 = get_past_head(fname); + for (p = p1; *p; MB_PTR_ADV(p)) { + if (vim_ispathsep_nocolon(*p)) { + p4 = p3; p3 = p2; p2 = p1; p1 = p; + } + } + // now we have: + // rtp/pack/name/start/name + // p4 p3 p2 p1 + // + // find the part up to "pack" in 'runtimepath' + p4++; // append pathsep in order to expand symlink + char_u c = *p4; + *p4 = NUL; char *const ffname = fix_fname((char *)fname); + *p4 = c; if (ffname == NULL) { - return; + return FAIL; } - if (cookie != &APP_LOAD && strstr((char *)p_rtp, ffname) == NULL) { - // directory is not yet in 'runtimepath', add it - p4 = p3 = p2 = p1 = get_past_head((char_u *)ffname); - for (p = p1; *p; MB_PTR_ADV(p)) { - if (vim_ispathsep_nocolon(*p)) { - p4 = p3; p3 = p2; p2 = p1; p1 = p; - } - } - - // now we have: - // rtp/pack/name/start/name - // p4 p3 p2 p1 - // - // find the part up to "pack" in 'runtimepath' - char_u c = *p4; - *p4 = NUL; - - // Find "ffname" in "p_rtp", ignoring '/' vs '\' differences - size_t fname_len = strlen(ffname); - const char *insp = (const char *)p_rtp; - buf = try_malloc(MAXPATHL); - if (buf == NULL) { + // Find "ffname" in "p_rtp", ignoring '/' vs '\' differences + size_t fname_len = strlen(ffname); + const char *insp = (const char *)p_rtp; + buf = try_malloc(MAXPATHL); + if (buf == NULL) { + goto theend; + } + while (*insp != NUL) { + copy_option_part((char_u **)&insp, buf, MAXPATHL, ","); + add_pathsep((char *)buf); + char *const rtp_ffname = fix_fname((char *)buf); + if (rtp_ffname == NULL) { goto theend; } - while (*insp != NUL) { - copy_option_part((char_u **)&insp, buf, MAXPATHL, ","); - add_pathsep((char *)buf); - char *const rtp_ffname = fix_fname((char *)buf); - if (rtp_ffname == NULL) { - goto theend; - } - bool match = path_fnamencmp(rtp_ffname, ffname, fname_len) == 0; - xfree(rtp_ffname); - if (match) { - break; - } + bool match = path_fnamencmp(rtp_ffname, ffname, fname_len) == 0; + xfree(rtp_ffname); + if (match) { + break; } + } - if (*insp == NUL) { - // not found, append at the end - insp = (const char *)p_rtp + STRLEN(p_rtp); - } else { - // append after the matching directory. - insp--; - } - *p4 = c; + if (*insp == NUL) { + // not found, append at the end + insp = (const char *)p_rtp + STRLEN(p_rtp); + } else { + // append after the matching directory. + insp--; + } - // check if rtp/pack/name/start/name/after exists - char *afterdir = concat_fnames(ffname, "after", true); - size_t afterlen = 0; - if (os_isdir((char_u *)afterdir)) { - afterlen = strlen(afterdir) + 1; // add one for comma - } + // check if rtp/pack/name/start/name/after exists + afterdir = concat_fnames((char *)fname, "after", true); + size_t afterlen = 0; + if (os_isdir((char_u *)afterdir)) { + afterlen = strlen(afterdir) + 1; // add one for comma + } - const size_t oldlen = STRLEN(p_rtp); - const size_t addlen = strlen(ffname) + 1; // add one for comma - const size_t new_rtp_len = oldlen + addlen + afterlen + 1; - // add one for NUL -------------------------------------^ - char *const new_rtp = try_malloc(new_rtp_len); - if (new_rtp == NULL) { - goto theend; - } - const size_t keep = (size_t)(insp - (const char *)p_rtp); - size_t new_rtp_fill = 0; - memmove(new_rtp, p_rtp, keep); - new_rtp_fill += keep; + const size_t oldlen = STRLEN(p_rtp); + const size_t addlen = STRLEN(fname) + 1; // add one for comma + const size_t new_rtp_len = oldlen + addlen + afterlen + 1; + // add one for NUL -------------------------------------^ + char *const new_rtp = try_malloc(new_rtp_len); + if (new_rtp == NULL) { + goto theend; + } + const size_t keep = (size_t)(insp - (const char *)p_rtp); + size_t new_rtp_fill = 0; + memmove(new_rtp, p_rtp, keep); + new_rtp_fill += keep; + new_rtp[new_rtp_fill++] = ','; + memmove(new_rtp + new_rtp_fill, fname, addlen); + new_rtp_fill += addlen - 1; + assert(new_rtp[new_rtp_fill] == NUL || new_rtp[new_rtp_fill] == ','); + if (p_rtp[keep] != NUL) { + memmove(new_rtp + new_rtp_fill, p_rtp + keep, oldlen - keep + 1); + new_rtp_fill += oldlen - keep; + } + if (afterlen > 0) { + assert(new_rtp[new_rtp_fill] == NUL); new_rtp[new_rtp_fill++] = ','; - memmove(new_rtp + new_rtp_fill, ffname, addlen); - new_rtp_fill += addlen - 1; - assert(new_rtp[new_rtp_fill] == NUL || new_rtp[new_rtp_fill] == ','); - if (p_rtp[keep] != NUL) { - memmove(new_rtp + new_rtp_fill, p_rtp + keep, oldlen - keep + 1); - new_rtp_fill += oldlen - keep; - } - if (afterlen > 0) { - assert(new_rtp[new_rtp_fill] == NUL); - new_rtp[new_rtp_fill++] = ','; - memmove(new_rtp + new_rtp_fill, afterdir, afterlen - 1); - new_rtp_fill += afterlen - 1; - } - new_rtp[new_rtp_fill] = NUL; - set_option_value("rtp", 0L, new_rtp, 0); - xfree(new_rtp); - xfree(afterdir); + memmove(new_rtp + new_rtp_fill, afterdir, afterlen - 1); + new_rtp_fill += afterlen - 1; + } + new_rtp[new_rtp_fill] = NUL; + set_option_value("rtp", 0L, new_rtp, 0); + xfree(new_rtp); + retval = OK; + +theend: + xfree(buf); + xfree(ffname); + xfree(afterdir); + return retval; +} + +/// Load scripts in "plugin" and "ftdetect" directories of the package. +static int load_pack_plugin(char_u *fname) +{ + static const char *plugpat = "%s/plugin/**/*.vim"; // NOLINT + static const char *ftpat = "%s/ftdetect/*.vim"; // NOLINT + + int retval = FAIL; + char *const ffname = fix_fname((char *)fname); + size_t len = strlen(ffname) + STRLEN(ftpat); + char_u *pat = try_malloc(len + 1); + if (pat == NULL) { + goto theend; } + vim_snprintf((char *)pat, len, plugpat, ffname); + source_all_matches(pat); - if (cookie != &APP_ADD_DIR) { - static const char *plugpat = "%s/plugin/**/*.vim"; // NOLINT - static const char *ftpat = "%s/ftdetect/*.vim"; // NOLINT + char_u *cmd = vim_strsave((char_u *)"g:did_load_filetypes"); - size_t len = strlen(ffname) + STRLEN(ftpat); - char_u *pat = try_malloc(len + 1); - if (pat == NULL) { - goto theend; - } - vim_snprintf((char *)pat, len, plugpat, ffname); + // If runtime/filetype.vim wasn't loaded yet, the scripts will be + // found when it loads. + if (eval_to_number(cmd) > 0) { + do_cmdline_cmd("augroup filetypedetect"); + vim_snprintf((char *)pat, len, ftpat, ffname); source_all_matches(pat); + do_cmdline_cmd("augroup END"); + } + xfree(cmd); + xfree(pat); + retval = OK; + +theend: + xfree(ffname); + + return retval; +} - char_u *cmd = vim_strsave((char_u *)"g:did_load_filetypes"); +// used for "cookie" of add_pack_plugin() +static int APP_ADD_DIR; +static int APP_LOAD; +static int APP_BOTH; - // If runtime/filetype.vim wasn't loaded yet, the scripts will be - // found when it loads. - if (eval_to_number(cmd) > 0) { - do_cmdline_cmd("augroup filetypedetect"); - vim_snprintf((char *)pat, len, ftpat, ffname); - source_all_matches(pat); - do_cmdline_cmd("augroup END"); +static void add_pack_plugin(char_u *fname, void *cookie) +{ + if (cookie != &APP_LOAD && strstr((char *)p_rtp, (char *)fname) == NULL) { + // directory is not yet in 'runtimepath', add it + if (add_pack_dir_to_rtp(fname) == FAIL) { + return; } - xfree(cmd); - xfree(pat); } -theend: - xfree(buf); - xfree(ffname); + if (cookie != &APP_ADD_DIR) { + load_pack_plugin(fname); + } } /// Add all packages in the "start" directory to 'runtimepath'. -- cgit From 91f40ff2841c4f3af524010145ee54d6d048ce07 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 29 Dec 2018 01:15:59 -0500 Subject: vim-patch:8.0.1734: package directory not added to 'rtp' if prefix matches Problem: Package directory not added to 'rtp' if prefix matches. Solution: Check the match is a full match. (Ozaki Kiichi, closes vim/vim#2817) Also handle different ways of spelling a path. https://github.com/vim/vim/commit/f98a39ca57d001ba3e24831bae1e375790fb41f0 --- src/nvim/ex_cmds2.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 4e3fc86539..f46e4108f4 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -2683,10 +2683,24 @@ static int APP_BOTH; static void add_pack_plugin(char_u *fname, void *cookie) { - if (cookie != &APP_LOAD && strstr((char *)p_rtp, (char *)fname) == NULL) { - // directory is not yet in 'runtimepath', add it - if (add_pack_dir_to_rtp(fname) == FAIL) { - return; + if (cookie != &APP_LOAD) { + char *buf = xmalloc(MAXPATHL); + bool found = false; + + const char *p = (const char *)p_rtp; + while (*p != NUL) { + copy_option_part((char_u **)&p, (char_u *)buf, MAXPATHL, ","); + if (path_fnamecmp(buf, (char *)fname) == 0) { + found = true; + break; + } + } + xfree(buf); + if (!found) { + // directory is not yet in 'runtimepath', add it + if (add_pack_dir_to_rtp(fname) == FAIL) { + return; + } } } -- cgit From ce4199e8b043d32b03f1ac276defb429502a6bdf Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 29 Dec 2018 11:12:18 -0500 Subject: vim-patch:8.1.0353: an "after" directory of a package is appended to 'rtp' Problem: An "after" directory of a package is appended to 'rtp', which will be after the user's "after" directory. () Solution: Insert the package "after" directory before any other "after" directory in 'rtp'. (closes vim/vim#3409) https://github.com/vim/vim/commit/99396d4cbf78d313a454c7448acc07412d2e45b7 --- src/nvim/ex_cmds2.c | 105 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 72 insertions(+), 33 deletions(-) (limited to 'src') diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index f46e4108f4..1ffcf67ef7 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -2567,32 +2567,49 @@ static int add_pack_dir_to_rtp(char_u *fname) } // Find "ffname" in "p_rtp", ignoring '/' vs '\' differences + // Also stop at the first "after" directory size_t fname_len = strlen(ffname); - const char *insp = (const char *)p_rtp; buf = try_malloc(MAXPATHL); if (buf == NULL) { goto theend; } - while (*insp != NUL) { - copy_option_part((char_u **)&insp, buf, MAXPATHL, ","); - add_pathsep((char *)buf); - char *const rtp_ffname = fix_fname((char *)buf); - if (rtp_ffname == NULL) { - goto theend; + const char *insp = NULL; + const char *after_insp = NULL; + for (const char *entry = (const char *)p_rtp; *entry != NUL; ) { + const char *cur_entry = entry; + + copy_option_part((char_u **)&entry, buf, MAXPATHL, ","); + if (insp == NULL) { + add_pathsep((char *)buf); + char *const rtp_ffname = fix_fname((char *)buf); + if (rtp_ffname == NULL) { + goto theend; + } + bool match = path_fnamencmp(rtp_ffname, ffname, fname_len) == 0; + xfree(rtp_ffname); + if (match) { + // Insert "ffname" after this entry (and comma). + insp = entry; + } } - bool match = path_fnamencmp(rtp_ffname, ffname, fname_len) == 0; - xfree(rtp_ffname); - if (match) { + + if ((p = (char_u *)strstr((char *)buf, "after")) != NULL + && p > buf + && vim_ispathsep(p[-1]) + && (vim_ispathsep(p[5]) || p[5] == NUL || p[5] == ',')) { + if (insp == NULL) { + // Did not find "ffname" before the first "after" directory, + // insert it before this entry. + insp = cur_entry; + } + after_insp = cur_entry; break; } } - if (*insp == NUL) { - // not found, append at the end + if (insp == NULL) { + // Both "fname" and "after" not found, append at the end. insp = (const char *)p_rtp + STRLEN(p_rtp); - } else { - // append after the matching directory. - insp--; } // check if rtp/pack/name/start/name/after exists @@ -2604,31 +2621,53 @@ static int add_pack_dir_to_rtp(char_u *fname) const size_t oldlen = STRLEN(p_rtp); const size_t addlen = STRLEN(fname) + 1; // add one for comma - const size_t new_rtp_len = oldlen + addlen + afterlen + 1; - // add one for NUL -------------------------------------^ - char *const new_rtp = try_malloc(new_rtp_len); + const size_t new_rtp_capacity = oldlen + addlen + afterlen + 1; + // add one for NUL ------------------------------------------^ + char *const new_rtp = try_malloc(new_rtp_capacity); if (new_rtp == NULL) { goto theend; } - const size_t keep = (size_t)(insp - (const char *)p_rtp); - size_t new_rtp_fill = 0; + + // We now have 'rtp' parts: {keep}{keep_after}{rest}. + // Create new_rtp, first: {keep},{fname} + size_t keep = (size_t)(insp - (const char *)p_rtp); memmove(new_rtp, p_rtp, keep); - new_rtp_fill += keep; - new_rtp[new_rtp_fill++] = ','; - memmove(new_rtp + new_rtp_fill, fname, addlen); - new_rtp_fill += addlen - 1; - assert(new_rtp[new_rtp_fill] == NUL || new_rtp[new_rtp_fill] == ','); + size_t new_rtp_len = keep; + if (*insp == NUL) { + new_rtp[new_rtp_len++] = ','; // add comma before + } + memmove(new_rtp + new_rtp_len, fname, addlen - 1); + new_rtp_len += addlen - 1; + if (*insp != NUL) { + new_rtp[new_rtp_len++] = ','; // add comma after + } + + if (afterlen > 0 && after_insp != NULL) { + size_t keep_after = (size_t)(after_insp - (const char *)p_rtp); + + // Add to new_rtp: {keep},{fname}{keep_after},{afterdir} + memmove(new_rtp + new_rtp_len, p_rtp + keep, keep_after - keep); + new_rtp_len += keep_after - keep; + memmove(new_rtp + new_rtp_len, afterdir, afterlen - 1); + new_rtp_len += afterlen - 1; + new_rtp[new_rtp_len++] = ','; + keep = keep_after; + } + if (p_rtp[keep] != NUL) { - memmove(new_rtp + new_rtp_fill, p_rtp + keep, oldlen - keep + 1); - new_rtp_fill += oldlen - keep; + // Append rest: {keep},{fname}{keep_after},{afterdir}{rest} + memmove(new_rtp + new_rtp_len, p_rtp + keep, oldlen - keep + 1); + } else { + new_rtp[new_rtp_len] = NUL; } - if (afterlen > 0) { - assert(new_rtp[new_rtp_fill] == NUL); - new_rtp[new_rtp_fill++] = ','; - memmove(new_rtp + new_rtp_fill, afterdir, afterlen - 1); - new_rtp_fill += afterlen - 1; + + if (afterlen > 0 && after_insp == NULL) { + // Append afterdir when "after" was not found: + // {keep},{fname}{rest},{afterdir} + xstrlcat(new_rtp, ",", new_rtp_capacity); + xstrlcat(new_rtp, afterdir, new_rtp_capacity); } - new_rtp[new_rtp_fill] = NUL; + set_option_value("rtp", 0L, new_rtp, 0); xfree(new_rtp); retval = OK; -- cgit