# HG changeset patch # User Rik # Date 1582072262 28800 # Node ID 43c2d9c03cc7e7628d9bdee5b01595fd971f2431 # Parent aa4eba65d227d59e44ecaf544350f01d841ca8f8 kill: throw error if operation fails and nargout == 0 (bug #57830). * syscalls.cc (Fkill): Add nargout to DEFUN macro invocation. Rename "err" to "status" in documentation. Document that status variable is -1 if an error is encountered. Based on nargout variable, either throw an error if operation failed, or return status and msg information. diff -r aa4eba65d227 -r 43c2d9c03cc7 libinterp/corefcn/syscalls.cc --- a/libinterp/corefcn/syscalls.cc Tue Feb 18 16:10:45 2020 -0800 +++ b/libinterp/corefcn/syscalls.cc Tue Feb 18 16:31:02 2020 -0800 @@ -591,26 +591,29 @@ return ovl (octave::sys::getuid ()); } -DEFUNX ("kill", Fkill, args, , +DEFUNX ("kill", Fkill, args, nargout, doc: /* -*- texinfo -*- -@deftypefn {} {[@var{err}, @var{msg}] =} kill (@var{pid}, @var{sig}) +@deftypefn {} {} kill (@var{pid}, @var{sig}) +@deftypefnx {} {[@var{status}, @var{msg}] =} kill (@var{pid}, @var{sig}) Send signal @var{sig} to process @var{pid}. If @var{pid} is positive, then signal @var{sig} is sent to @var{pid}. -If @var{pid} is 0, then signal @var{sig} is sent to every process -in the process group of the current process. +If @var{pid} is 0, then signal @var{sig} is sent to every process in the +process group of the current process. -If @var{pid} is -1, then signal @var{sig} is sent to every process -except process 1. +If @var{pid} is -1, then signal @var{sig} is sent to every process except +process 1. -If @var{pid} is less than -1, then signal @var{sig} is sent to every -process in the process group @var{-pid}. +If @var{pid} is less than -1, then signal @var{sig} is sent to every process in +the process group @var{-pid}. If @var{sig} is 0, then no signal is sent, but error checking is still performed. -Return 0 if successful, otherwise return -1. +If successful, @var{status} is 0 and @var{msg} is an empty string. +Otherwise, @var{status} is -1 and @var{msg} contains a system-dependent +error message. @end deftypefn */) { if (args.length () != 2) @@ -620,11 +623,25 @@ int sig = args(1).int_value (true); + octave_value_list retval; std::string msg; int status = octave::sys::kill (pid, sig, msg); - return ovl (status, msg); + if (nargout == 0) + { + if (status < 0) + error ("kill: operation failed: %s", msg.c_str ()); + } + else + { + if (status < 0) + retval = ovl (-1.0, msg); + else + retval = ovl (0.0, ""); + } + + return retval; } DEFUNX ("lstat", Flstat, args, ,