diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-04-14 13:51:55 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-04-14 13:51:55 +0200 |
| commit | 78a16b0f2a142aae1fdc96c50ab0f25194d0e755 (patch) | |
| tree | 2980fc918579aba91215787b3ce7f535708d4ad4 /src | |
| parent | 98da6ecab905df48a67da36ce60233f45726c979 (diff) | |
| download | vim-git-78a16b0f2a142aae1fdc96c50ab0f25194d0e755.tar.gz | |
patch 8.0.1708: mkdir with 'p' flag fails on existing directoryv8.0.1708
Problem: Mkdir with 'p' flag fails on existing directory, which is
different from the mkdir shell command.
Solution: Don't fail if the directory already exists. (James McCoy,
closes #2775)
Diffstat (limited to 'src')
| -rw-r--r-- | src/evalfunc.c | 34 | ||||
| -rw-r--r-- | src/testdir/test_eval_stuff.vim | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 41 insertions, 12 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 65279a52f..4b0995185 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -8057,22 +8057,32 @@ f_mkdir(typval_T *argvars, typval_T *rettv) dir = get_tv_string_buf(&argvars[0], buf); if (*dir == NUL) - rettv->vval.v_number = FAIL; - else - { - if (*gettail(dir) == NUL) - /* remove trailing slashes */ - *gettail_sep(dir) = NUL; + return; - if (argvars[1].v_type != VAR_UNKNOWN) + if (*gettail(dir) == NUL) + /* remove trailing slashes */ + *gettail_sep(dir) = NUL; + + if (argvars[1].v_type != VAR_UNKNOWN) + { + if (argvars[2].v_type != VAR_UNKNOWN) { - if (argvars[2].v_type != VAR_UNKNOWN) - prot = (int)get_tv_number_chk(&argvars[2], NULL); - if (prot != -1 && STRCMP(get_tv_string(&argvars[1]), "p") == 0) - mkdir_recurse(dir, prot); + prot = (int)get_tv_number_chk(&argvars[2], NULL); + if (prot == -1) + return; + } + if (STRCMP(get_tv_string(&argvars[1]), "p") == 0) + { + if (mch_isdir(dir)) + { + /* With the "p" flag it's OK if the dir already exists. */ + rettv->vval.v_number = OK; + return; + } + mkdir_recurse(dir, prot); } - rettv->vval.v_number = prot == -1 ? FAIL : vim_mkdir_emsg(dir, prot); } + rettv->vval.v_number = vim_mkdir_emsg(dir, prot); } #endif diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim index 12222303d..41ba1374d 100644 --- a/src/testdir/test_eval_stuff.vim +++ b/src/testdir/test_eval_stuff.vim @@ -25,3 +25,20 @@ func Test_nocatch_restore_silent_emsg() let c5 = nr2char(screenchar(&lines, 5)) call assert_equal('wrong', c1 . c2 . c3 . c4 . c5) endfunc + +func Test_mkdir_p() + call mkdir('Xmkdir/nested', 'p') + call assert_true(isdirectory('Xmkdir/nested')) + try + " Trying to make existing directories doesn't error + call mkdir('Xmkdir', 'p') + call mkdir('Xmkdir/nested', 'p') + catch /E739:/ + call assert_report('mkdir(..., "p") failed for an existing directory') + endtry + " 'p' doesn't suppress real errors + call writefile([], 'Xfile') + call assert_fails('call mkdir("Xfile", "p")', 'E739') + call delete('Xfile') + call delete('Xmkdir', 'rf') +endfunc diff --git a/src/version.c b/src/version.c index 5facbc581..6bebac291 100644 --- a/src/version.c +++ b/src/version.c @@ -763,6 +763,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1708, +/**/ 1707, /**/ 1706, |