Mercurial > vim
comparison src/fileio.c @ 7641:b44fc33ef92a v7.4.1120
commit https://github.com/vim/vim/commit/336bd622c31e1805495c034e1a8cfadcc0bbabc7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 17 18:23:58 2016 +0100
patch 7.4.1120
Problem: delete(x, 'rf') fails if a directory is empty. (Lcd)
Solution: Ignore not finding matches in an empty directory.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 17 Jan 2016 18:30:05 +0100 |
parents | 2a280b8e7040 |
children | 9c5e8254ea6b |
comparison
equal
deleted
inserted
replaced
7640:6da21217eb5a | 7641:b44fc33ef92a |
---|---|
7311 vim_snprintf((char *)NameBuff, MAXPATHL, "%s/*", name); | 7311 vim_snprintf((char *)NameBuff, MAXPATHL, "%s/*", name); |
7312 exp = vim_strsave(NameBuff); | 7312 exp = vim_strsave(NameBuff); |
7313 if (exp == NULL) | 7313 if (exp == NULL) |
7314 return -1; | 7314 return -1; |
7315 if (gen_expand_wildcards(1, &exp, &file_count, &files, | 7315 if (gen_expand_wildcards(1, &exp, &file_count, &files, |
7316 EW_DIR|EW_FILE|EW_SILENT|EW_ALLLINKS|EW_DODOT) == OK) | 7316 EW_DIR|EW_FILE|EW_SILENT|EW_ALLLINKS|EW_DODOT|EW_EMPTYOK) == OK) |
7317 { | 7317 { |
7318 for (i = 0; i < file_count; ++i) | 7318 for (i = 0; i < file_count; ++i) |
7319 if (delete_recursive(files[i]) != 0) | 7319 if (delete_recursive(files[i]) != 0) |
7320 result = -1; | 7320 result = -1; |
7321 FreeWild(file_count, files); | 7321 FreeWild(file_count, files); |