Skip to content

Commit 967d225

Browse files
committed
updated for version 7.4.006
Problem: mkdir("foo/bar/", "p") gives an error message. (David Barnett) Solution: Remove the trailing slash. (lcd)
1 parent b062f60 commit 967d225

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/eval.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14292,14 +14292,18 @@ f_mkdir(argvars, rettv)
1429214292
return;
1429314293

1429414294
dir = get_tv_string_buf(&argvars[0], buf);
14295+
if (*gettail(dir) == NUL)
14296+
/* remove trailing slashes */
14297+
*gettail_sep(dir) = NUL;
14298+
1429514299
if (argvars[1].v_type != VAR_UNKNOWN)
1429614300
{
1429714301
if (argvars[2].v_type != VAR_UNKNOWN)
1429814302
prot = get_tv_number_chk(&argvars[2], NULL);
1429914303
if (prot != -1 && STRCMP(get_tv_string(&argvars[1]), "p") == 0)
1430014304
mkdir_recurse(dir, prot);
1430114305
}
14302-
rettv->vval.v_number = prot != -1 ? vim_mkdir_emsg(dir, prot) : 0;
14306+
rettv->vval.v_number = prot == -1 ? FAIL : vim_mkdir_emsg(dir, prot);
1430314307
}
1430414308
#endif
1430514309

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,8 @@ static char *(features[]) =
727727

728728
static int included_patches[] =
729729
{ /* Add new patch number below this line */
730+
/**/
731+
6,
730732
/**/
731733
5,
732734
/**/

0 commit comments

Comments
 (0)