Mercurial > vim
changeset 25390:a6c347a0c6e3 v8.2.3232
patch 8.2.3232: system() does not work without a second argument
Commit: https://github.com/vim/vim/commit/7e6a2a64f09df577f29e024c1d1e6733d6bc1b7c
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Wed Jul 28 11:51:48 2021 +0200
patch 8.2.3232: system() does not work without a second argument
Problem: system() does not work without a second argument.
Solution: Do not require a second argument. (Yegappan Lakshmanan,
closes #8651, closes #8650)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 28 Jul 2021 12:00:06 +0200 |
parents | 19b15ae5eb9f |
children | df2096e6825e |
files | src/misc1.c src/proto/typval.pro src/testdir/test_vim9_builtin.vim src/typval.c src/version.c |
diffstat | 5 files changed, 21 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/misc1.c +++ b/src/misc1.c @@ -2359,7 +2359,7 @@ get_cmd_output_as_rettv( if (in_vim9script() && (check_for_string_arg(argvars, 0) == FAIL - || check_for_string_or_number_or_list_arg(argvars, 1) == FAIL)) + || check_for_opt_string_or_number_or_list_arg(argvars, 1) == FAIL)) return; if (argvars[1].v_type != VAR_UNKNOWN)
--- a/src/proto/typval.pro +++ b/src/proto/typval.pro @@ -36,6 +36,7 @@ int check_for_string_or_list_arg(typval_ int check_for_opt_string_or_list_arg(typval_T *args, int idx); int check_for_string_or_dict_arg(typval_T *args, int idx); int check_for_string_or_number_or_list_arg(typval_T *args, int idx); +int check_for_opt_string_or_number_or_list_arg(typval_T *args, int idx); int check_for_string_or_list_or_dict_arg(typval_T *args, int idx); int check_for_list_or_blob_arg(typval_T *args, int idx); int check_for_list_or_dict_arg(typval_T *args, int idx);
--- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -3290,11 +3290,17 @@ enddef def Test_system() CheckDefAndScriptFailure2(['system(1)'], 'E1013: Argument 1: type mismatch, expected string but got number', 'E1174: String required for argument 1') CheckDefAndScriptFailure2(['system("a", {})'], 'E1013: Argument 2: type mismatch, expected string but got dict<unknown>', 'E1224: String or List required for argument 2') + assert_equal("123\n", system('echo 123')) enddef def Test_systemlist() CheckDefAndScriptFailure2(['systemlist(1)'], 'E1013: Argument 1: type mismatch, expected string but got number', 'E1174: String required for argument 1') CheckDefAndScriptFailure2(['systemlist("a", {})'], 'E1013: Argument 2: type mismatch, expected string but got dict<unknown>', 'E1224: String or List required for argument 2') + if has('win32') + call assert_equal(["123\r"], systemlist('echo 123')) + else + call assert_equal(['123'], systemlist('echo 123')) + endif enddef def Test_tabpagebuflist()
--- a/src/typval.c +++ b/src/typval.c @@ -727,6 +727,17 @@ check_for_string_or_number_or_list_arg(t } /* + * Give an error and return FAIL unless "args[idx]" is an optional string + * or number or a list + */ + int +check_for_opt_string_or_number_or_list_arg(typval_T *args, int idx) +{ + return (args[idx].v_type == VAR_UNKNOWN + || check_for_string_or_number_or_list_arg(args, idx) != FAIL); +} + +/* * Give an error and return FAIL unless "args[idx]" is a string or a list * or a dict. */