Mercurial > vim
diff src/ex_cmds2.c @ 10837:437cf0fe2138 v8.0.0308
patch 8.0.0308: 'runtimepath' not update correctly when using symbolic link
commit https://github.com/vim/vim/commit/2f9e575583c2ad3978ee3d0f790eeff7df56bd6c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 5 16:07:54 2017 +0100
patch 8.0.0308: 'runtimepath' not update correctly when using symbolic link
Problem: When using a symbolic link, the package path will not be inserted
at the right position in 'runtimepath'. (Dugan Chen, Norio Takagi)
Solution: Resolve symbolic links when finding the right position in
'runtimepath'. (Hirohito Higashi)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 05 Feb 2017 16:15:04 +0100 |
| parents | 7598ce51bf2a |
| children | 3335c3c75611 |
line wrap: on
line diff
--- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -3509,6 +3509,9 @@ add_pack_plugin(char_u *fname, void *coo size_t afterlen = 0; char_u *ffname = fix_fname(fname); size_t fname_len; + char_u *buf = NULL; + char_u *rtp_ffname; + int match; if (ffname == NULL) return; @@ -3533,26 +3536,28 @@ add_pack_plugin(char_u *fname, void *coo /* Find "ffname" in "p_rtp", ignoring '/' vs '\' differences. */ fname_len = STRLEN(ffname); insp = p_rtp; - for (;;) + buf = alloc(MAXPATHL); + if (buf == NULL) + goto theend; + while (*insp != NUL) { - if (vim_fnamencmp(insp, ffname, fname_len) == 0) + copy_option_part(&insp, buf, MAXPATHL, ","); + add_pathsep(buf); + rtp_ffname = fix_fname(buf); + if (rtp_ffname == NULL) + goto theend; + match = vim_fnamencmp(rtp_ffname, ffname, fname_len) == 0; + vim_free(rtp_ffname); + if (match) break; - insp = vim_strchr(insp, ','); - if (insp == NULL) - break; - ++insp; } - if (insp == NULL) + if (*insp == NUL) /* not found, append at the end */ insp = p_rtp + STRLEN(p_rtp); else - { /* append after the matching directory. */ - insp += STRLEN(ffname); - while (*insp != NUL && *insp != ',') - ++insp; - } + --insp; *p4 = c; /* check if rtp/pack/name/start/name/after exists */ @@ -3562,7 +3567,8 @@ add_pack_plugin(char_u *fname, void *coo oldlen = STRLEN(p_rtp); addlen = STRLEN(ffname) + 1; /* add one for comma */ - new_rtp = alloc((int)(oldlen + addlen + afterlen + 1)); /* add one for NUL */ + new_rtp = alloc((int)(oldlen + addlen + afterlen + 1)); + /* add one for NUL */ if (new_rtp == NULL) goto theend; keep = (int)(insp - p_rtp); @@ -3616,6 +3622,7 @@ add_pack_plugin(char_u *fname, void *coo } theend: + vim_free(buf); vim_free(ffname); }