From 74aef8972048c3288a3cbd6a8dadf17a8df3c08c Mon Sep 17 00:00:00 2001
From: Scott Prager <splinterofchaos@gmail.com>
Date: Mon, 13 Apr 2015 23:53:16 -0400
Subject: 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>
---
 src/nvim/ex_docmd.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'src/nvim/ex_docmd.c')

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);
+  }
 }
-- 
cgit 


From 1eb33969220b267cf45adb286f0b7b6d14805eff Mon Sep 17 00:00:00 2001
From: Scott Prager <splinterofchaos@gmail.com>
Date: Wed, 15 Apr 2015 13:05:30 -0400
Subject: unify jobstart, termopen, and system interfaces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For any of these functions, if {cmd} is a string, execute
"&shell &shellcmdflag '{cmd}'", or simply {cmd} if it's a list.

In termopen(), if the 'name' option is not supplied, try to guess using
'{cmd}' (string) or {cmd}[0] (list).  Simplify ex_terminal to use the
string form of termopen().

termopen: get name from argument

Convert list_to_argv to tv_to_argv.

Helped-by: Björn Linse <@bfredl>
Helped-by: oni-link <knil.ino@gmail.com>
Helped-by: Thiago de Arruda <@tarruda>
---
 src/nvim/ex_docmd.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'src/nvim/ex_docmd.c')

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) {
-- 
cgit