aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1116

Browse Source 
Problem:    delete(x, 'rf') does not delete files starting with a dot.
Solution:   Also delete files starting with a dot.
This commit is contained in:
Bram Moolenaar 2016-01-17 16:49:43 +01:00
parent d0232917ce
commit b0967d587f
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fileio.c
View File

@ -7313,7 +7313,7 @@ delete_recursive(char_u *name)
if (exp == NULL) if (exp == NULL)
return -1; return -1;
if (gen_expand_wildcards(1, &exp, &file_count, &files, 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 (i = 0; i < file_count; ++i) for (i = 0; i < file_count; ++i)
if (delete_recursive(files[i]) != 0) if (delete_recursive(files[i]) != 0)

11
src/misc1.c
View File

@ -10013,7 +10013,7 @@ dos_expandpath(
if (p[0] == '*' && p[1] == '*') if (p[0] == '*' && p[1] == '*')
starstar = TRUE; starstar = TRUE;
starts_with_dot = (*s == '.'); starts_with_dot = *s == '.' || (flags & EW_DODOT);
pat = file_pat_to_reg_pat(s, e, NULL, FALSE); pat = file_pat_to_reg_pat(s, e, NULL, FALSE);
if (pat == NULL) if (pat == NULL)
{ {
@ -10096,7 +10096,8 @@ dos_expandpath(
#endif #endif
/* Ignore entries starting with a dot, unless when asked for. Accept /* Ignore entries starting with a dot, unless when asked for. Accept
* all entries found with "matchname". */ * all entries found with "matchname". */
if ((p[0] != '.' || starts_with_dot) if ((p[0] != '.' || (starts_with_dot
&& p[1] != NUL && (p[1] != '.' || p[2] != NUL)))
&& (matchname == NULL && (matchname == NULL
|| (regmatch.regprog != NULL || (regmatch.regprog != NULL
&& vim_regexec(&regmatch, p, (colnr_T)0)) && vim_regexec(&regmatch, p, (colnr_T)0))
@ -10325,7 +10326,7 @@ unix_expandpath(gap, path, wildoff, flags, didstar)
starstar = TRUE; starstar = TRUE;
/* convert the file pattern to a regexp pattern */ /* convert the file pattern to a regexp pattern */
starts_with_dot = (*s == '.'); starts_with_dot = *s == '.' || (flags & EW_DODOT);
pat = file_pat_to_reg_pat(s, e, NULL, FALSE); pat = file_pat_to_reg_pat(s, e, NULL, FALSE);
if (pat == NULL) if (pat == NULL)
{ {
@ -10374,7 +10375,9 @@ unix_expandpath(gap, path, wildoff, flags, didstar)
dp = readdir(dirp); dp = readdir(dirp);
if (dp == NULL) if (dp == NULL)
break; break;
if ((dp->d_name[0] != '.' || starts_with_dot) if ((dp->d_name[0] != '.' || (starts_with_dot
&& dp->d_name[1] != NUL
&& (dp->d_name[1] != '.' || dp->d_name[2] != NUL)))
&& ((regmatch.regprog != NULL && vim_regexec(&regmatch, && ((regmatch.regprog != NULL && vim_regexec(&regmatch,
(char_u *)dp->d_name, (colnr_T)0)) (char_u *)dp->d_name, (colnr_T)0))
|| ((flags & EW_NOTWILD) || ((flags & EW_NOTWILD)

2
src/version.c
View File

@ -741,6 +741,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 */
/**/
1116,
/**/ /**/
1115, 1115,
/**/ /**/

1
src/vim.h
View File

@ -835,6 +835,7 @@ extern char *(*dyn_libintl_textdomain)(const char *domainname);
#define EW_ALLLINKS 0x1000 /* also links not pointing to existing file */ #define EW_ALLLINKS 0x1000 /* also links not pointing to existing file */
#define EW_SHELLCMD 0x2000 /* called from expand_shellcmd(), don't check #define EW_SHELLCMD 0x2000 /* called from expand_shellcmd(), don't check
* if executable is in $PATH */ * if executable is in $PATH */
#define EW_DODOT 0x4000 /* also files starting with a dot */
/* Flags for find_file_*() functions. */ /* Flags for find_file_*() functions. */
#define FINDFILE_FILE 0 /* only files */ #define FINDFILE_FILE 0 /* only files */