diff options
Diffstat (limited to 'src/nvim/ex_docmd.c')
| -rw-r--r-- | src/nvim/ex_docmd.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 656311ae14..9ff19521b6 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -9410,23 +9410,19 @@ static void ex_folddo(exarg_T *eap) static void ex_terminal(exarg_T *eap) { - char *name = NULL; - char cmd[512]; - if (strcmp((char *)eap->arg, "") == 0) { - snprintf(cmd, sizeof(cmd), "['%s']", (char *)p_sh); - name = (char *)p_sh; - } else { - // Escape quotes and slashes so they get sent literally. + // We will call termopen() with ['shell'] if not given a {cmd}. + char *name = (char *)p_sh; + char *lquote = "['"; + char *rquote = "']"; + if (*eap->arg != NUL) { name = (char *)vim_strsave_escaped(eap->arg, (char_u *)"\"\\"); - snprintf(cmd, sizeof(cmd), "['%s','%s',\"%s\"]", - (char *)p_sh, (char *)p_shcf, name); + lquote = rquote = "\""; } char ex_cmd[512]; snprintf(ex_cmd, sizeof(ex_cmd), - ":enew%s | call termopen(%s, {'name':\"%s\"}) | startinsert", - eap->forceit==TRUE ? "!" : "", cmd, name); - + ":enew%s | call termopen(%s%s%s) | startinsert", + eap->forceit==TRUE ? "!" : "", lquote, name, rquote); do_cmdline_cmd((uint8_t *)ex_cmd); if (name != (char *)p_sh) { |