diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 128 | ||||
| -rw-r--r-- | src/nvim/ex_docmd.c | 23 | ||||
| -rw-r--r-- | src/nvim/os/shell.c | 51 |
3 files changed, 130 insertions, 72 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 1065f1caf9..df301f4266 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10779,44 +10779,78 @@ static void f_jobresize(typval_T *argvars, typval_T *rettv) rettv->vval.v_number = 1; } -// "jobstart()" function -static void f_jobstart(typval_T *argvars, typval_T *rettv) +static char **tv_to_argv(typval_T *cmd_tv, char **cmd) { - rettv->v_type = VAR_NUMBER; - rettv->vval.v_number = 0; + if (cmd_tv->v_type == VAR_STRING) { + char *cmd_str = (char *)get_tv_string(cmd_tv); + if (cmd) { + *cmd = cmd_str; + } + return shell_build_argv(cmd_str, NULL); + } - if (check_restricted() || check_secure()) { - return; + if (cmd_tv->v_type != VAR_LIST) { + EMSG2(_(e_invarg2), "expected String or List"); + return NULL; } - if (argvars[0].v_type != VAR_LIST - || (argvars[1].v_type != VAR_DICT && argvars[1].v_type != VAR_UNKNOWN)) { - // Wrong argument types - EMSG(_(e_invarg)); - return; + list_T *argl = cmd_tv->vval.v_list; + int argc = argl->lv_len; + if (!argc) { + EMSG(_("Argument vector must have at least one item")); + return NULL; } - list_T *args = argvars[0].vval.v_list; - // Assert that all list items are strings - for (listitem_T *arg = args->lv_first; arg != NULL; arg = arg->li_next) { - if (arg->li_tv.v_type != VAR_STRING) { - EMSG(_(e_invarg)); - return; + assert(argl->lv_first); + + const char_u *exe = get_tv_string_chk(&argl->lv_first->li_tv); + if (!exe || !os_can_exe(exe, NULL)) { + // String is not executable + if (exe) { + EMSG2(e_jobexe, exe); } + return NULL; } - int argc = args->lv_len; - if (!argc) { - EMSG(_("Argument vector must have at least one item")); + if (cmd) { + *cmd = (char *)exe; + } + + // Build the argument vector + int i = 0; + char **argv = xcalloc(argc + 1, sizeof(char *)); + for (listitem_T *arg = argl->lv_first; arg != NULL; arg = arg->li_next) { + char *a = (char *)get_tv_string_chk(&arg->li_tv); + if (!a) { + // Did emsg in get_tv_string; just deallocate argv. + shell_free_argv(argv); + return NULL; + } + argv[i++] = xstrdup(a); + } + + return argv; +} + +// "jobstart()" function +static void f_jobstart(typval_T *argvars, typval_T *rettv) +{ + rettv->v_type = VAR_NUMBER; + rettv->vval.v_number = 0; + + if (check_restricted() || check_secure()) { return; } - assert(args->lv_first); - - const char_u *exe = get_tv_string(&args->lv_first->li_tv); - if (!os_can_exe(exe, NULL)) { - // String is not executable - EMSG2(e_jobexe, exe); + char **argv = tv_to_argv(&argvars[0], NULL); + if (!argv) { + return; // Did error message in tv_to_argv. + } + + if (argvars[1].v_type != VAR_DICT && argvars[1].v_type != VAR_UNKNOWN) { + // Wrong argument types + EMSG2(_(e_invarg2), "expected dictionary"); + shell_free_argv(argv); return; } @@ -10825,17 +10859,11 @@ static void f_jobstart(typval_T *argvars, typval_T *rettv) if (argvars[1].v_type == VAR_DICT) { job_opts = argvars[1].vval.v_dict; if (!common_job_callbacks(job_opts, &on_stdout, &on_stderr, &on_exit)) { + shell_free_argv(argv); return; } } - // Build the argument vector - int i = 0; - char **argv = xcalloc(argc + 1, sizeof(char *)); - for (listitem_T *arg = args->lv_first; arg != NULL; arg = arg->li_next) { - argv[i++] = xstrdup((char *) get_tv_string(&arg->li_tv)); - } - JobOptions opts = common_job_options(argv, on_stdout, on_stderr, on_exit, job_opts); @@ -14927,12 +14955,16 @@ static void get_system_output_as_rettv(typval_T *argvars, typval_T *rettv, } // get shell command to execute - const char *cmd = (char *) get_tv_string(&argvars[0]); + char **argv = tv_to_argv(&argvars[0], NULL); + if (!argv) { + xfree(input); + return; // Already did emsg. + } // execute the command size_t nread = 0; char *res = NULL; - int status = os_system(cmd, input, input_len, &res, &nread); + int status = os_system(argv, input, input_len, &res, &nread); xfree(input); @@ -15155,10 +15187,16 @@ static void f_termopen(typval_T *argvars, typval_T *rettv) return; } - if (argvars[0].v_type != VAR_STRING - || (argvars[1].v_type != VAR_DICT && argvars[1].v_type != VAR_UNKNOWN)) { - // Wrong argument types - EMSG(_(e_invarg)); + char *cmd; + char **argv = tv_to_argv(&argvars[0], &cmd); + if (!argv) { + return; // Did error message in tv_to_argv. + } + + if (argvars[1].v_type != VAR_DICT && argvars[1].v_type != VAR_UNKNOWN) { + // Wrong argument type + EMSG2(_(e_invarg2), "expected dictionary"); + shell_free_argv(argv); return; } @@ -15167,11 +15205,11 @@ static void f_termopen(typval_T *argvars, typval_T *rettv) if (argvars[1].v_type == VAR_DICT) { job_opts = argvars[1].vval.v_dict; if (!common_job_callbacks(job_opts, &on_stdout, &on_stderr, &on_exit)) { + shell_free_argv(argv); return; } } - char **argv = shell_build_argv((char *)argvars[0].vval.v_string, NULL); JobOptions opts = common_job_options(argv, on_stdout, on_stderr, on_exit, job_opts); opts.pty = true; @@ -15180,6 +15218,7 @@ static void f_termopen(typval_T *argvars, typval_T *rettv) opts.term_name = xstrdup("xterm-256color"); Job *job = common_job_start(opts, rettv); if (!job) { + shell_free_argv(argv); return; } TerminalJobData *data = opts.data; @@ -15197,10 +15236,13 @@ static void f_termopen(typval_T *argvars, typval_T *rettv) cwd = (char *)argvars[1].vval.v_string; } int pid = job_pid(job); + + // Get the desired name of the buffer. + char *name = job_opts ? + (char *)get_dict_string(job_opts, (char_u *)"name", false) : cmd; char buf[1024]; // format the title with the pid to conform with the term:// URI - snprintf(buf, sizeof(buf), "term://%s//%d:%s", cwd, pid, - (char *)argvars[0].vval.v_string); + snprintf(buf, sizeof(buf), "term://%s//%d:%s", cwd, pid, name); // at this point the buffer has no terminal instance associated yet, so unset // the 'swapfile' option to ensure no swap file will be created curbuf->b_p_swf = false; @@ -15215,6 +15257,8 @@ static void f_termopen(typval_T *argvars, typval_T *rettv) Terminal *term = terminal_open(topts); data->term = term; data->refcount++; + + return; } /* diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index e81f99ccea..9ff19521b6 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -9410,9 +9410,22 @@ static void ex_folddo(exarg_T *eap) static void ex_terminal(exarg_T *eap) { - 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); + // 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 *)"\"\\"); + lquote = rquote = "\""; + } + + char ex_cmd[512]; + snprintf(ex_cmd, sizeof(ex_cmd), + ":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) { + xfree(name); + } } diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c index 4f5928ba8a..5859254c1b 100644 --- a/src/nvim/os/shell.c +++ b/src/nvim/os/shell.c @@ -119,14 +119,14 @@ int os_call_shell(char_u *cmd, ShellOpts opts, char_u *extra_args) } size_t nread; - int status = shell((const char *)cmd, - (const char *)extra_args, - input.data, - input.len, - output_ptr, - &nread, - emsg_silent, - forward_output); + + int status = do_os_system(shell_build_argv((char *)cmd, (char *)extra_args), + input.data, + input.len, + output_ptr, + &nread, + emsg_silent, + forward_output); xfree(input.data); @@ -152,9 +152,11 @@ int os_call_shell(char_u *cmd, ShellOpts opts, char_u *extra_args) /// example: /// char *output = NULL; /// size_t nread = 0; -/// int status = os_sytem("ls -la", NULL, 0, &output, &nread); +/// char *argv[] = {"ls", "-la", NULL}; +/// int status = os_sytem(argv, NULL, 0, &output, &nread); /// -/// @param cmd The full commandline to be passed to the shell +/// @param argv The commandline arguments to be passed to the shell. `argv` +/// will be consumed. /// @param input The input to the shell (NULL for no input), passed to the /// stdin of the resulting process. /// @param len The length of the input buffer (not used if `input` == NULL) @@ -166,23 +168,22 @@ int os_call_shell(char_u *cmd, ShellOpts opts, char_u *extra_args) /// returned buffer is not NULL) /// @return the return code of the process, -1 if the process couldn't be /// started properly -int os_system(const char *cmd, +int os_system(char **argv, const char *input, size_t len, char **output, size_t *nread) FUNC_ATTR_NONNULL_ARG(1) { - return shell(cmd, NULL, input, len, output, nread, true, false); + return do_os_system(argv, input, len, output, nread, true, false); } -static int shell(const char *cmd, - const char *extra_args, - const char *input, - size_t len, - char **output, - size_t *nread, - bool silent, - bool forward_output) +static int do_os_system(char **argv, + const char *input, + size_t len, + char **output, + size_t *nread, + bool silent, + bool forward_output) { // the output buffer DynamicBuffer buf = DYNAMIC_BUFFER_INIT; @@ -197,7 +198,9 @@ static int shell(const char *cmd, data_cb = NULL; } - char **argv = shell_build_argv(cmd, extra_args); + // Copy the program name in case we need to report an error. + char prog[MAXPATHL]; + xstrlcpy(prog, argv[0], MAXPATHL); int status; JobOptions opts = JOB_OPTIONS_INIT; @@ -211,11 +214,9 @@ static int shell(const char *cmd, if (status <= 0) { // Failed, probably due to `sh` not being executable - ELOG("Couldn't start job, command: '%s', error code: '%d'", - (cmd ? cmd : (char *)p_sh), status); if (!silent) { - MSG_PUTS(_("\nCannot execute shell ")); - msg_outtrans(p_sh); + MSG_PUTS(_("\nCannot execute ")); + msg_outtrans((char_u *)prog); msg_putchar('\n'); } return -1; |