aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 7.4.1996

Browse Source 
Problem:    Capturing the output of a command takes a few commands.
Solution:   Add evalcmd().
This commit is contained in:
Bram Moolenaar
2016-07-07 17:33:02 +02:00
parent 9d5d3c9c44
commit 1e5e1231ac
6 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/eval.c
View File

@@ -555,6 +555,7 @@ static void f_diff_hlID(typval_T *argvars, typval_T *rettv);
static void f_empty(typval_T *argvars, typval_T *rettv);
static void f_escape(typval_T *argvars, typval_T *rettv);
static void f_eval(typval_T *argvars, typval_T *rettv);
static void f_evalcmd(typval_T *argvars, typval_T *rettv);
static void f_eventhandler(typval_T *argvars, typval_T *rettv);
static void f_executable(typval_T *argvars, typval_T *rettv);
static void f_exepath(typval_T *argvars, typval_T *rettv);
@@ -1133,6 +1134,7 @@ set_internal_string_var(char_u *name, char_u *value)
}
static lval_T *redir_lval = NULL;
#define EVALCMD_BUSY (redir_lval == (lval_T *)&redir_lval)
static garray_T redir_ga; /* only valid when redir_lval is not NULL */
static char_u *redir_endp = NULL;
static char_u *redir_varname = NULL;
@@ -1250,6 +1252,12 @@ var_redir_stop(void)
{
typval_T tv;
if (EVALCMD_BUSY)
{
redir_lval = NULL;
return;
}
if (redir_lval != NULL)
{
/* If there was no error: assign the text to the variable. */
@@ -8556,6 +8564,7 @@ static struct fst
{"empty", 1, 1, f_empty},
{"escape", 2, 2, f_escape},
{"eval", 1, 1, f_eval},
{"evalcmd", 1, 1, f_evalcmd},
{"eventhandler", 0, 0, f_eventhandler},
{"executable", 1, 1, f_executable},
{"exepath", 1, 1, f_exepath},
@@ -11336,6 +11345,36 @@ f_eval(typval_T *argvars, typval_T *rettv)
EMSG(_(e_trailing));
}
/*
* "evalcmd()" function
*/
static void
f_evalcmd(typval_T *argvars, typval_T *rettv)
{
char_u *s;
rettv->vval.v_string = NULL;
rettv->v_type = VAR_STRING;
s = get_tv_string_chk(&argvars[0]);
if (s != NULL)
{
redir_vname = TRUE;
redir_lval = (lval_T *)&redir_lval;
ga_init2(&redir_ga, (int)sizeof(char), 500);
if (do_cmdline_cmd(s) == OK)
rettv->vval.v_string = redir_ga.ga_data;
else
vim_free(redir_ga.ga_data);
redir_ga.ga_data = NULL;
redir_vname = FALSE;
redir_lval = NULL;
}
}
/*
* "eventhandler()" function
*/