diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2018-09-21 09:20:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-21 09:20:04 +0200 |
commit | ecdd2df88ab52ed6e39057e2a8fb9eabfbb90bd5 (patch) | |
tree | a6072625d7c97b943c4ed5cbfe3d258bd111c23f /src | |
parent | ad6bbe44683cf936ec2268ee89e8e1c22f538ecc (diff) | |
download | rneovim-ecdd2df88ab52ed6e39057e2a8fb9eabfbb90bd5.tar.gz rneovim-ecdd2df88ab52ed6e39057e2a8fb9eabfbb90bd5.tar.bz2 rneovim-ecdd2df88ab52ed6e39057e2a8fb9eabfbb90bd5.zip |
shell/logging: Fix E730 with verbose system({List}) #9009
ref https://github.com/neovim/neovim/issues/9001#issuecomment-421843790
Steps to reproduce:
:set verbose=9
:call system(['echo'])
E730: using List as a String
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/eval.c | 7 | ||||
-rw-r--r-- | src/nvim/eval/typval.c | 10 | ||||
-rw-r--r-- | src/nvim/misc1.c | 2 | ||||
-rw-r--r-- | src/nvim/os/shell.c | 38 |
4 files changed, 44 insertions, 13 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 1d0077ecc9..44560792f0 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -16471,13 +16471,12 @@ static void get_system_output_as_rettv(typval_T *argvars, typval_T *rettv, } if (p_verbose > 3) { - char buf[NUMBUFLEN]; - const char * cmd = tv_get_string_buf(argvars, buf); - + char *cmdstr = shell_argv_to_str(argv); verbose_enter_scroll(); - smsg(_("Calling shell to execute: \"%s\""), cmd); + smsg(_("Executing command: \"%s\""), cmdstr); msg_puts("\n\n"); verbose_leave_scroll(); + xfree(cmdstr); } if (do_profiling == PROF_YES) { diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c index b151357196..55dcfcc198 100644 --- a/src/nvim/eval/typval.c +++ b/src/nvim/eval/typval.c @@ -2632,7 +2632,7 @@ static const char *const str_errors[] = { #undef FUNC_ERROR -/// Check that given value is a string or can be converted to it +/// Check that given value is a VimL String or can be "cast" to it. /// /// Error messages are compatible with tv_get_string_chk() previously used for /// the same purpose. @@ -2805,7 +2805,7 @@ float_T tv_get_float(const typval_T *const tv) return 0; } -/// Get the string value of a VimL object +/// Get the string value of a "stringish" VimL object. /// /// @param[in] tv Object to get value of. /// @param buf Buffer used to hold numbers and special variables converted to @@ -2847,7 +2847,7 @@ const char *tv_get_string_buf_chk(const typval_T *const tv, char *const buf) return NULL; } -/// Get the string value of a VimL object +/// Get the string value of a "stringish" VimL object. /// /// @warning For number and special values it uses a single, static buffer. It /// may be used only once, next call to get_tv_string may reuse it. Use @@ -2866,7 +2866,7 @@ const char *tv_get_string_chk(const typval_T *const tv) return tv_get_string_buf_chk(tv, mybuf); } -/// Get the string value of a VimL object +/// Get the string value of a "stringish" VimL object. /// /// @warning For number and special values it uses a single, static buffer. It /// may be used only once, next call to get_tv_string may reuse it. Use @@ -2888,7 +2888,7 @@ const char *tv_get_string(const typval_T *const tv) return tv_get_string_buf((typval_T *)tv, mybuf); } -/// Get the string value of a VimL object +/// Get the string value of a "stringish" VimL object. /// /// @note tv_get_string_chk() and tv_get_string_buf_chk() are similar, but /// return NULL on error. diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index 7a32b3c00a..2e7fe4d7a9 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -2718,7 +2718,7 @@ int call_shell(char_u *cmd, ShellOpts opts, char_u *extra_shell_arg) if (p_verbose > 3) { verbose_enter(); - smsg(_("Calling shell to execute: \"%s\""), cmd == NULL ? p_sh : cmd); + smsg(_("Executing command: \"%s\""), cmd == NULL ? p_sh : cmd); msg_putchar('\n'); verbose_leave(); } diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c index aa4e7d307b..19d199f4d5 100644 --- a/src/nvim/os/shell.c +++ b/src/nvim/os/shell.c @@ -80,21 +80,53 @@ char **shell_build_argv(const char *cmd, const char *extra_args) void shell_free_argv(char **argv) { char **p = argv; - if (p == NULL) { // Nothing was allocated, return return; } - while (*p != NULL) { // Free each argument xfree(*p); p++; } - xfree(argv); } +/// Joins shell arguments from `argv` into a new string. +/// If the result is too long it is truncated with ellipsis ("..."). +/// +/// @returns[allocated] `argv` joined to a string. +char *shell_argv_to_str(char **const argv) + FUNC_ATTR_NONNULL_ALL +{ + size_t n = 0; + char **p = argv; + char *rv = xcalloc(256, sizeof(*rv)); + const size_t maxsize = (256 * sizeof(*rv)); + if (*p == NULL) { + return rv; + } + while (*p != NULL) { + xstrlcat(rv, "'", maxsize); + xstrlcat(rv, *p, maxsize); + n = xstrlcat(rv, "' ", maxsize); + if (n >= maxsize) { + break; + } + p++; + } + if (n < maxsize) { + rv[n - 1] = '\0'; + } else { + // Command too long, show ellipsis: "/bin/bash 'foo' 'bar'..." + rv[maxsize - 4] = '.'; + rv[maxsize - 3] = '.'; + rv[maxsize - 2] = '.'; + rv[maxsize - 1] = '\0'; + } + return rv; +} + /// Calls the user-configured 'shell' (p_sh) for running a command or wildcard /// expansion. /// |