mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.0.0625: shellescape() always escapes a newline
Problem: shellescape() always escapes a newline, which does not work with some shells. (Harm te Hennepe) Solution: Only escape a newline when the "special" argument is non-zero. (Christian Brabandt, closes #1590)
This commit is contained in:
parent
6c95fbc9ae
commit
206155280d
@ -10461,8 +10461,10 @@ f_sha256(typval_T *argvars, typval_T *rettv)
|
|||||||
static void
|
static void
|
||||||
f_shellescape(typval_T *argvars, typval_T *rettv)
|
f_shellescape(typval_T *argvars, typval_T *rettv)
|
||||||
{
|
{
|
||||||
|
int do_special = non_zero_arg(&argvars[1]);
|
||||||
|
|
||||||
rettv->vval.v_string = vim_strsave_shellescape(
|
rettv->vval.v_string = vim_strsave_shellescape(
|
||||||
get_tv_string(&argvars[0]), non_zero_arg(&argvars[1]), TRUE);
|
get_tv_string(&argvars[0]), do_special, do_special);
|
||||||
rettv->v_type = VAR_STRING;
|
rettv->v_type = VAR_STRING;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -784,3 +784,28 @@ func Test_redo_in_nested_functions()
|
|||||||
delfunc Operator
|
delfunc Operator
|
||||||
delfunc Apply
|
delfunc Apply
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_shellescape()
|
||||||
|
let save_shell = &shell
|
||||||
|
set shell=bash
|
||||||
|
call assert_equal("'text'", shellescape('text'))
|
||||||
|
call assert_equal("'te\"xt'", shellescape('te"xt'))
|
||||||
|
call assert_equal("'te'\\''xt'", shellescape("te'xt"))
|
||||||
|
|
||||||
|
call assert_equal("'te%xt'", shellescape("te%xt"))
|
||||||
|
call assert_equal("'te\\%xt'", shellescape("te%xt", 1))
|
||||||
|
call assert_equal("'te#xt'", shellescape("te#xt"))
|
||||||
|
call assert_equal("'te\\#xt'", shellescape("te#xt", 1))
|
||||||
|
call assert_equal("'te!xt'", shellescape("te!xt"))
|
||||||
|
call assert_equal("'te\\!xt'", shellescape("te!xt", 1))
|
||||||
|
|
||||||
|
call assert_equal("'te\nxt'", shellescape("te\nxt"))
|
||||||
|
call assert_equal("'te\\\nxt'", shellescape("te\nxt", 1))
|
||||||
|
set shell=tcsh
|
||||||
|
call assert_equal("'te\\!xt'", shellescape("te!xt"))
|
||||||
|
call assert_equal("'te\\\\!xt'", shellescape("te!xt", 1))
|
||||||
|
call assert_equal("'te\\\nxt'", shellescape("te\nxt"))
|
||||||
|
call assert_equal("'te\\\\\nxt'", shellescape("te\nxt", 1))
|
||||||
|
|
||||||
|
let &shell = save_shell
|
||||||
|
endfunc
|
||||||
|
@ -764,6 +764,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 */
|
||||||
|
/**/
|
||||||
|
625,
|
||||||
/**/
|
/**/
|
||||||
624,
|
624,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user