diff options
| author | Jurica Bradaric <jbradaric@gmail.com> | 2016-02-28 12:59:13 +0100 |
|---|---|---|
| committer | Jurica Bradaric <jbradaric@gmail.com> | 2016-04-20 08:25:51 +0200 |
| commit | 9e385404b3443f201f1092ba76bcdafd1f303976 (patch) | |
| tree | c40d939240c2d751bdc7feb9f6aeac39a03fcb65 | |
| parent | 88a735166b7ee1eadaf6d46be11804dc0e1a251a (diff) | |
| download | rneovim-9e385404b3443f201f1092ba76bcdafd1f303976.tar.gz rneovim-9e385404b3443f201f1092ba76bcdafd1f303976.tar.bz2 rneovim-9e385404b3443f201f1092ba76bcdafd1f303976.zip | |
vim-patch:7.4.1116
Problem: delete(x, 'rf') does not delete files starting with a dot.
Solution: Also delete files starting with a dot.
https://github.com/vim/vim/commit/b0967d587fc420fa02832533d4915c85d1a78c17
| -rw-r--r-- | src/nvim/path.c | 8 | ||||
| -rw-r--r-- | src/nvim/path.h | 1 | ||||
| -rw-r--r-- | src/nvim/tempfile.c | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
4 files changed, 9 insertions, 5 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(®match, name, 0)) || ((flags & EW_NOTWILD) && fnamencmp(path + (s - buf), name, e - s) == 0))) { diff --git a/src/nvim/path.h b/src/nvim/path.h index eac367d0ac..9574d8131f 100644 --- a/src/nvim/path.h +++ b/src/nvim/path.h @@ -21,6 +21,7 @@ /* Note: mostly EW_NOTFOUND and EW_SILENT are mutually exclusive: EW_NOTFOUND * is used when executing commands and EW_SILENT for interactive expanding. */ #define EW_ALLLINKS 0x1000 // also links not pointing to existing file +#define EW_DODOT 0x4000 // also files starting with a dot /// Return value for the comparison of two files. Also @see path_full_compare. typedef enum file_comparison { diff --git a/src/nvim/tempfile.c b/src/nvim/tempfile.c index 5b6268168d..6566749f8a 100644 --- a/src/nvim/tempfile.c +++ b/src/nvim/tempfile.c @@ -70,7 +70,8 @@ int delete_recursive(char_u *name) int file_count; char_u *exp = vim_strsave(NameBuff); if (gen_expand_wildcards(1, &exp, &file_count, &files, - EW_DIR | EW_FILE | EW_SILENT) == OK) { + EW_DIR | EW_FILE | EW_SILENT + | EW_ALLLINKS | EW_DODOT) == OK) { for (int i = 0; i < file_count; i++) { if (delete_recursive(files[i]) != 0) { result = -1; diff --git a/src/nvim/version.c b/src/nvim/version.c index 235d74de76..75eb37c2c3 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -248,7 +248,7 @@ static int included_patches[] = { // 1119, // 1118, // 1117, - // 1116, + 1116, // 1115 NA 1114, 1113, |