aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.3.1297

Browse Source 
Problem:    findfile() directory matching does not work when a star follows
            text. (Markus Braun)
Solution:   Make a wildcard work properly. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2013-07-03 17:14:00 +02:00
parent 8968a31179
commit f4c5fcb3ad
4 changed files with 75 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/misc2.c
View File

@@ -4679,8 +4679,58 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
}
STRCPY(ff_expand_buffer, search_ctx->ffsc_start_dir);
add_pathsep(ff_expand_buffer);
STRCAT(ff_expand_buffer, search_ctx->ffsc_fix_path);
add_pathsep(ff_expand_buffer);
{
char_u *buf = alloc(STRLEN(ff_expand_buffer)
+ STRLEN(search_ctx->ffsc_fix_path));
STRCPY(buf, ff_expand_buffer);
STRCAT(buf, search_ctx->ffsc_fix_path);
if (mch_isdir(buf))
{
STRCAT(ff_expand_buffer, search_ctx->ffsc_fix_path);
add_pathsep(ff_expand_buffer);
}
#ifdef FEAT_PATH_EXTRA
else
{
char_u *p = vim_strrchr(search_ctx->ffsc_fix_path, PATHSEP);
char_u *wc_path = NUL;
char_u *temp = NUL;
int len = 0;
if (p != NULL)
{
len = p - search_ctx->ffsc_fix_path;
STRNCAT(ff_expand_buffer, search_ctx->ffsc_fix_path, len);
add_pathsep(ff_expand_buffer);
}
else
len = STRLEN(search_ctx->ffsc_fix_path);
if (search_ctx->ffsc_wc_path != NULL)
{
wc_path = vim_strsave(search_ctx->ffsc_wc_path);
temp = alloc(STRLEN(search_ctx->ffsc_wc_path)
+ (STRLEN(search_ctx->ffsc_fix_path) - len));
}
if (temp == NULL || wc_path == NULL)
{
vim_free(buf);
vim_free(temp);
vim_free(wc_path);
goto error_return;
}
STRCPY(temp, search_ctx->ffsc_fix_path + len);
STRCAT(temp, search_ctx->ffsc_wc_path);
vim_free(search_ctx->ffsc_wc_path);
vim_free(wc_path);
search_ctx->ffsc_wc_path = temp;
}
#endif
vim_free(buf);
}
sptr = ff_create_stack_element(ff_expand_buffer,
#ifdef FEAT_PATH_EXTRA