aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ex_docmd.c
diff options
context:
space:
mode:
authorScott Prager <splinterofchaos@gmail.com>2015-04-13 23:53:16 -0400
committerScott Prager <splinterofchaos@gmail.com>2015-05-02 09:47:29 -0400
commit74aef8972048c3288a3cbd6a8dadf17a8df3c08c (patch)
tree85397b18d46b464466ba0dad85bd7ca0000b2f4f /src/nvim/ex_docmd.c
parent205466830207a920c62146b7b689fac2e395431a (diff)
downloadrneovim-74aef8972048c3288a3cbd6a8dadf17a8df3c08c.tar.gz
rneovim-74aef8972048c3288a3cbd6a8dadf17a8df3c08c.tar.bz2
rneovim-74aef8972048c3288a3cbd6a8dadf17a8df3c08c.zip
term: use an argument vector for termopen().
Old behaviour: termopen('cmd') would run `&shell &shcf "cmd"`, which caused the functional tests to fail on some systems due to the process not "owning" the terminal. Also, it is inconsistent with jobstart(). Modify termopen() so that &shell is not invoked, but maintain the old behaviour with :terminal. Factor the common code for building the argument vector from jobstart() and modify the functional tests to call termopen() instead of :terminal (fixes #2354). Also: * Add a 'name' option for termopen() so that `:terminal {cmd}` produces a buffer named "term//{cwd}/{cmd}" and termopen() users can customize the name. * Update the documentation. * Add functional tests for `:terminal` sinse its behaviour now differs from termopen(). Add "test/functional/fixtures/shell-test.c" and move "test/functional/job/tty-test.c" there, too. Helped-by: Justin M. Keyes <@justinmk>
Diffstat (limited to 'src/nvim/ex_docmd.c')
-rw-r--r--src/nvim/ex_docmd.c25
1 files changed, 21 insertions, 4 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index e81f99ccea..656311ae14 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -9410,9 +9410,26 @@ static void ex_folddo(exarg_T *eap)
static void ex_terminal(exarg_T *eap)
{
+ char *name = NULL;
char cmd[512];
- snprintf(cmd, sizeof(cmd), ":enew%s | call termopen('%s') | startinsert",
- eap->forceit==TRUE ? "!" : "",
- strcmp((char *)eap->arg, "") ? (char *)eap->arg : (char *)p_sh);
- do_cmdline_cmd((uint8_t *)cmd);
+ 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.
+ name = (char *)vim_strsave_escaped(eap->arg, (char_u *)"\"\\");
+ snprintf(cmd, sizeof(cmd), "['%s','%s',\"%s\"]",
+ (char *)p_sh, (char *)p_shcf, name);
+ }
+
+ char ex_cmd[512];
+ snprintf(ex_cmd, sizeof(ex_cmd),
+ ":enew%s | call termopen(%s, {'name':\"%s\"}) | startinsert",
+ eap->forceit==TRUE ? "!" : "", cmd, name);
+
+ do_cmdline_cmd((uint8_t *)ex_cmd);
+
+ if (name != (char *)p_sh) {
+ xfree(name);
+ }
}