aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/path.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim/path.c')
-rw-r--r--src/nvim/path.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/path.c b/src/nvim/path.c
index aaf54bc5b4..8ba3fe3358 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -604,8 +604,8 @@ static size_t do_path_expand(garray_T *gap, const char_u *path,
starstar = true;
// convert the file pattern to a regexp pattern
- int starts_with_dot = (*s == '.');
- char_u *pat = file_pat_to_reg_pat(s, e, NULL, false);
+ int starts_with_dot = *s == '.' || (flags & EW_DODOT);
+ char_u *pat = file_pat_to_reg_pat(s, e, NULL, FALSE);
if (pat == NULL) {
xfree(buf);
return 0;
@@ -649,7 +649,9 @@ static size_t do_path_expand(garray_T *gap, const char_u *path,
char_u *name;
scandir_next_with_dots(NULL /* initialize */);
while((name = (char_u *) scandir_next_with_dots(&dir)) && name != NULL) {
- if ((name[0] != '.' || starts_with_dot)
+ if ((name[0] != '.' || (starts_with_dot
+ && name[1] != NUL
+ && (name[1] != '.' || name[2] != NUL)))
&& ((regmatch.regprog != NULL && vim_regexec(&regmatch, name, 0))
|| ((flags & EW_NOTWILD)
&& fnamencmp(path + (s - buf), name, e - s) == 0))) {