mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.0.0151: passing buffer content to system() is clumsy
Problem: To pass buffer content to system() and systemlist() one has to first create a string or list. Solution: Allow passing a buffer number. (LemonBoy, closes #1240)
This commit is contained in:
parent
7069bf18e1
commit
12c4492dd3
@ -7562,6 +7562,10 @@ system({expr} [, {input}]) *system()* *E677*
|
|||||||
in a way |writefile()| does with {binary} set to "b" (i.e.
|
in a way |writefile()| does with {binary} set to "b" (i.e.
|
||||||
with a newline between each list item with newlines inside
|
with a newline between each list item with newlines inside
|
||||||
list items converted to NULs).
|
list items converted to NULs).
|
||||||
|
When {input} is given and is a number that is a valid id for
|
||||||
|
an existing buffer then the content of the buffer is written
|
||||||
|
to the file line by line, each line terminated by a NL and
|
||||||
|
NULs characters where the text has a NL.
|
||||||
|
|
||||||
Pipes are not used, the 'shelltemp' option is not used.
|
Pipes are not used, the 'shelltemp' option is not used.
|
||||||
|
|
||||||
|
@ -2164,6 +2164,7 @@ test_arglist \
|
|||||||
test_substitute \
|
test_substitute \
|
||||||
test_syn_attr \
|
test_syn_attr \
|
||||||
test_syntax \
|
test_syntax \
|
||||||
|
test_system \
|
||||||
test_tabline \
|
test_tabline \
|
||||||
test_tabpage \
|
test_tabpage \
|
||||||
test_tagcase \
|
test_tagcase \
|
||||||
|
@ -11817,7 +11817,6 @@ get_cmd_output_as_rettv(
|
|||||||
char_u *res = NULL;
|
char_u *res = NULL;
|
||||||
char_u *p;
|
char_u *p;
|
||||||
char_u *infile = NULL;
|
char_u *infile = NULL;
|
||||||
char_u buf[NUMBUFLEN];
|
|
||||||
int err = FALSE;
|
int err = FALSE;
|
||||||
FILE *fd;
|
FILE *fd;
|
||||||
list_T *list = NULL;
|
list_T *list = NULL;
|
||||||
@ -11831,7 +11830,7 @@ get_cmd_output_as_rettv(
|
|||||||
if (argvars[1].v_type != VAR_UNKNOWN)
|
if (argvars[1].v_type != VAR_UNKNOWN)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Write the string to a temp file, to be used for input of the shell
|
* Write the text to a temp file, to be used for input of the shell
|
||||||
* command.
|
* command.
|
||||||
*/
|
*/
|
||||||
if ((infile = vim_tempname('i', TRUE)) == NULL)
|
if ((infile = vim_tempname('i', TRUE)) == NULL)
|
||||||
@ -11846,7 +11845,34 @@ get_cmd_output_as_rettv(
|
|||||||
EMSG2(_(e_notopen), infile);
|
EMSG2(_(e_notopen), infile);
|
||||||
goto errret;
|
goto errret;
|
||||||
}
|
}
|
||||||
if (argvars[1].v_type == VAR_LIST)
|
if (argvars[1].v_type == VAR_NUMBER)
|
||||||
|
{
|
||||||
|
linenr_T lnum;
|
||||||
|
buf_T *buf;
|
||||||
|
|
||||||
|
buf = buflist_findnr(argvars[1].vval.v_number);
|
||||||
|
if (buf == NULL)
|
||||||
|
{
|
||||||
|
EMSGN(_(e_nobufnr), argvars[1].vval.v_number);
|
||||||
|
goto errret;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (lnum = 1; lnum <= buf->b_ml.ml_line_count; lnum++)
|
||||||
|
{
|
||||||
|
for (p = ml_get_buf(buf, lnum, FALSE); *p != NUL; ++p)
|
||||||
|
if (putc(*p == '\n' ? NUL : *p, fd) == EOF)
|
||||||
|
{
|
||||||
|
err = TRUE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (putc(NL, fd) == EOF)
|
||||||
|
{
|
||||||
|
err = TRUE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (argvars[1].v_type == VAR_LIST)
|
||||||
{
|
{
|
||||||
if (write_list(fd, argvars[1].vval.v_list, TRUE) == FAIL)
|
if (write_list(fd, argvars[1].vval.v_list, TRUE) == FAIL)
|
||||||
err = TRUE;
|
err = TRUE;
|
||||||
@ -11854,6 +11880,7 @@ get_cmd_output_as_rettv(
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
size_t len;
|
size_t len;
|
||||||
|
char_u buf[NUMBUFLEN];
|
||||||
|
|
||||||
p = get_tv_string_buf_chk(&argvars[1], buf);
|
p = get_tv_string_buf_chk(&argvars[1], buf);
|
||||||
if (p == NULL)
|
if (p == NULL)
|
||||||
|
@ -184,6 +184,7 @@ NEW_TESTS = test_arglist.res \
|
|||||||
test_stat.res \
|
test_stat.res \
|
||||||
test_substitute.res \
|
test_substitute.res \
|
||||||
test_syntax.res \
|
test_syntax.res \
|
||||||
|
test_system.res \
|
||||||
test_textobjects.res \
|
test_textobjects.res \
|
||||||
test_undo.res \
|
test_undo.res \
|
||||||
test_usercommands.res \
|
test_usercommands.res \
|
||||||
|
20
src/testdir/test_system.vim
Normal file
20
src/testdir/test_system.vim
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
" Tests for system() and systemlist()
|
||||||
|
|
||||||
|
function! Test_System()
|
||||||
|
if !executable('echo') || !executable('cat') || !executable('wc')
|
||||||
|
return
|
||||||
|
endif
|
||||||
|
call assert_equal("123\n", system('echo 123'))
|
||||||
|
call assert_equal(['123'], systemlist('echo 123'))
|
||||||
|
call assert_equal('123', system('cat', '123'))
|
||||||
|
call assert_equal(['123'], systemlist('cat', '123'))
|
||||||
|
call assert_equal(["as\<NL>df"], systemlist('cat', ["as\<NL>df"]))
|
||||||
|
new Xdummy
|
||||||
|
call setline(1, ['asdf', "pw\<NL>er", 'xxxx'])
|
||||||
|
call assert_equal("3\n", system('wc -l', bufnr('%')))
|
||||||
|
call assert_equal(['3'], systemlist('wc -l', bufnr('%')))
|
||||||
|
call assert_equal(['asdf', "pw\<NL>er", 'xxxx'], systemlist('cat', bufnr('%')))
|
||||||
|
bwipe!
|
||||||
|
|
||||||
|
call assert_fails('call system("wc -l", 99999)', 'E86:')
|
||||||
|
endfunction
|
@ -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 */
|
||||||
|
/**/
|
||||||
|
151,
|
||||||
/**/
|
/**/
|
||||||
150,
|
150,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user