thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.279

Browse Source 
Problem:    globpath() returns a string, making it difficult to get a list of
            matches. (Greg Novack)
Solution:   Add an optional argument like with glob(). (Adnan Zafar)
This commit is contained in:
Bram Moolenaar
2014-05-07 18:35:30 +02:00
parent 3ec7f4e402
commit 1b1063af58
10 changed files with 100 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/misc1.c
View File

@@ -10336,9 +10336,6 @@ expand_in_path(gap, pattern, flags)
{
char_u *curdir;
garray_T path_ga;
char_u *files = NULL;
char_u *s; /* start */
char_u *e; /* end */
char_u *paths = NULL;
if ((curdir = alloc((unsigned)MAXPATHL)) == NULL)
@@ -10351,37 +10348,13 @@ expand_in_path(gap, pattern, flags)
if (path_ga.ga_len == 0)
return 0;
paths = ga_concat_strings(&path_ga);
paths = ga_concat_strings(&path_ga, ",");
ga_clear_strings(&path_ga);
if (paths == NULL)
return 0;
files = globpath(paths, pattern, (flags & EW_ICASE) ? WILD_ICASE : 0);
globpath(paths, pattern, gap, (flags & EW_ICASE) ? WILD_ICASE : 0);
vim_free(paths);
if (files == NULL)
return 0;
/* Copy each path in files into gap */
s = e = files;
while (*s != NUL)
{
while (*e != '\n' && *e != NUL)
e++;
if (*e == NUL)
{
addfile(gap, s, flags);
break;
}
else
{
/* *e is '\n' */
*e = NUL;
addfile(gap, s, flags);
e++;
s = e;
}
}
vim_free(files);
return gap->ga_len;
}