aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.0.0231: expanding "**" may loop forever with directory links

Browse Source 
Problem:    Expanding "**" may loop forever with directory links.
Solution:   Check for being interrupted. (closes #10946)
This commit is contained in:
Bram Moolenaar
2022-08-20 19:26:14 +01:00
parent 2984ed31d9
commit 57e95179ab
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cmdexpand.c
View File

@@ -722,8 +722,9 @@ ExpandOne(
findex = -1; // next p_wc gets first one findex = -1; // next p_wc gets first one
} }
// Concatenate all matching names // Concatenate all matching names. Unless interrupted, this can be slow
if (mode == WILD_ALL && xp->xp_numfiles > 0) // and the result probably won't be used.
if (mode == WILD_ALL && xp->xp_numfiles > 0 && !got_int)
{ {
len = 0; len = 0;
for (i = 0; i < xp->xp_numfiles; ++i) for (i = 0; i < xp->xp_numfiles; ++i)

11
src/filepath.c
View File

@@ -3180,8 +3180,9 @@ expand_wildcards(
/* /*
* Move the names where 'suffixes' match to the end. * Move the names where 'suffixes' match to the end.
* Skip when interrupted, the result probably won't be used.
*/ */
if (*num_files > 1) if (*num_files > 1 && !got_int)
{ {
non_suf_match = 0; non_suf_match = 0;
for (i = 0; i < *num_files; ++i) for (i = 0; i < *num_files; ++i)
@@ -3719,7 +3720,7 @@ unix_expandpath(
// Find all matching entries // Find all matching entries
if (dirp != NULL) if (dirp != NULL)
{ {
for (;;) while (!got_int)
{ {
dp = readdir(dirp); dp = readdir(dirp);
if (dp == NULL) if (dp == NULL)
@@ -3789,8 +3790,10 @@ unix_expandpath(
vim_free(buf); vim_free(buf);
vim_regfree(regmatch.regprog); vim_regfree(regmatch.regprog);
// When interrupted the matches probably won't be used and sorting can be
// slow, thus skip it.
matches = gap->ga_len - start_len; matches = gap->ga_len - start_len;
if (matches > 0) if (matches > 0 && !got_int)
qsort(((char_u **)gap->ga_data) + start_len, matches, qsort(((char_u **)gap->ga_data) + start_len, matches,
sizeof(char_u *), pstrcmp); sizeof(char_u *), pstrcmp);
return matches; return matches;
@@ -3918,7 +3921,7 @@ gen_expand_wildcards(
*/ */
ga_init2(&ga, sizeof(char_u *), 30); ga_init2(&ga, sizeof(char_u *), 30);
for (i = 0; i < num_pat; ++i) for (i = 0; i < num_pat && !got_int; ++i)
{ {
add_pat = -1; add_pat = -1;
p = pat[i]; p = pat[i];

2
src/version.c
View File

@@ -731,6 +731,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
231,
/**/ /**/
230, 230,
/**/ /**/