From 26cec3ea70f65b655e16a9ba88951a9050b646c2 Mon Sep 17 00:00:00 2001 From: Urban Müller Date: Wed, 5 Jul 2023 14:06:58 +0200 Subject: mark safe it::shell_command calls --- it.class | 6 +++--- it_pipe.class | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/it.class b/it.class index 0efe3b4..13e3aa0 100644 --- a/it.class +++ b/it.class @@ -674,12 +674,12 @@ static function filter_keys($array, $keys, $p = array()) * {0} .. {n} quotes and inserts positional arguments * {-opts} array of opts => {value,true,false,null}: it::exec('ls {-opts}', ['-opts' => ["-l" => true]]); * @param $cmd Format string with {keywords} a la ET() - * @param $args varargs, contains key => val arrays for filling in cmd line. val=null expands to nothing + * @param $args varargs, contains key => val arrays or positionals for filling in cmd line. val=null expands to nothing * @return output of command. shell errors not detectable, consider it::system or see /www/server/log/error_log */ static function exec($cmd, ...$args) { - $cmd = it::shell_command($cmd, ...$args); + $cmd = it::shell_command($cmd, ...$args); # NOPHPLINT $before = gettimeofday(true); $result = EDC('noexec') ? "" : (string)shell_exec("set +o posix\n" . $cmd); @@ -697,7 +697,7 @@ static function exec($cmd, ...$args) */ static function system($cmd, ...$args) { - $cmd = it::shell_command($cmd, ...$args); + $cmd = it::shell_command($cmd, ...$args); # NOPHPLINT $before = gettimeofday(true); if (!EDC('noexec')) diff --git a/it_pipe.class b/it_pipe.class index 73ce75a..fd1e7cf 100644 --- a/it_pipe.class +++ b/it_pipe.class @@ -228,7 +228,7 @@ function lines() */ function pipe($cmd, ...$args) { - $cmd = it::shell_command($cmd, ...$args); + $cmd = it::shell_command($cmd, ...$args); # NOPHPLINT $descriptors = array(0 => array("pipe", "r"), 1 => array("pipe", "w")); $process = proc_open($cmd, $descriptors, $pipes); -- cgit v1.2.3