vim-patch:8.0.0106

Problem:    Cannot use a semicolon in 'backupext'. (Jeff)
Solution:   Allow for a few more characters when "secure" isn't set.

0945eaface
This commit is contained in:
ckelsel
2017-09-24 13:21:07 +08:00
parent 1a73ac7698
commit 3a1c33a6c3
2 changed files with 5 additions and 4 deletions

View File

@@ -2455,13 +2455,14 @@ did_set_string_option (
if ((secure || sandbox != 0) if ((secure || sandbox != 0)
&& (options[opt_idx].flags & P_SECURE)) { && (options[opt_idx].flags & P_SECURE)) {
errmsg = e_secure; errmsg = e_secure;
} else if ((((options[opt_idx].flags & P_NFNAME) } else if (((options[opt_idx].flags & P_NFNAME)
&& vim_strpbrk(*varp, (char_u *)"/\\*?[|;&<>\r\n") != NULL)) && vim_strpbrk(*varp, (char_u *)(secure
? "/\\*?[|;&<>\r\n" : "/\\*?[<>\r\n")) != NULL)
|| ((options[opt_idx].flags & P_NDNAME) || ((options[opt_idx].flags & P_NDNAME)
&& vim_strpbrk(*varp, (char_u *)"*?[|;&<>\r\n") != NULL)) { && vim_strpbrk(*varp, (char_u *)"*?[|;&<>\r\n") != NULL)) {
// Check for a "normal" directory or file name in some options. Disallow a // Check for a "normal" directory or file name in some options. Disallow a
// path separator (slash and/or backslash), wildcards and characters that // path separator (slash and/or backslash), wildcards and characters that
// are often illegal in a file name. // are often illegal in a file name. Be more permissive if "secure" is off.
errmsg = e_invarg; errmsg = e_invarg;
} }
/* 'backupcopy' */ /* 'backupcopy' */

View File

@@ -846,7 +846,7 @@ static const int included_patches[] = {
// 109 NA // 109 NA
// 108 NA // 108 NA
// 107 NA // 107 NA
// 106, 106,
// 105 NA // 105 NA
104, 104,
// 103 NA // 103 NA