aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Bennett <steveb@workware.net.au>2020-04-18 14:46:44 +1000
committerSteve Bennett <steveb@workware.net.au>2020-05-04 21:57:37 +1000
commitae1a518e6edc96cb54f6d6401fd6a59656abe8a9 (patch)
treed577a999a9ee4e44e9682b5da68b75144921b7e3
parent93cadfb21511c29366ae8754fe09bd17ef12b9da (diff)
downloadjimtcl-ae1a518e6edc96cb54f6d6401fd6a59656abe8a9.zip
jimtcl-ae1a518e6edc96cb54f6d6401fd6a59656abe8a9.tar.gz
jimtcl-ae1a518e6edc96cb54f6d6401fd6a59656abe8a9.tar.bz2
signal check: fix error return
If the signal is invalid, indicate that Signed-off-by: Steve Bennett <steveb@workware.net.au>
-rw-r--r--jim-signal.c2
-rw-r--r--tests/signal.test6
2 files changed, 3 insertions, 5 deletions
diff --git a/jim-signal.c b/jim-signal.c
index 7d02e68..866119d 100644
--- a/jim-signal.c
+++ b/jim-signal.c
@@ -293,7 +293,7 @@ static int signal_cmd_check(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
int sig = find_signal_by_name(interp, Jim_String(argv[i]));
if (sig < 0 || sig >= MAX_SIGNALS) {
- return -1;
+ return JIM_ERR;
}
mask |= sig_to_bit(sig);
}
diff --git a/tests/signal.test b/tests/signal.test
index 4eb633d..63122f2 100644
--- a/tests/signal.test
+++ b/tests/signal.test
@@ -129,15 +129,13 @@ test signal-2.4 {signal block} {
signal default SIGINT
} {}
-# should complain about unknown signal
test signal-2.5 {signal check invalid} -body {
signal check NONEXISTENT
-} -returnCodes error -result {wrong # args: should be "signal check ?-clear? ?signals ...?"}
+} -returnCodes error -result {unknown signal NONEXISTENT}
-# should complain about unknown signal
test signal-2.6 {signal check invalid num} -body {
signal check 999999
-} -returnCodes error -result {wrong # args: should be "signal check ?-clear? ?signals ...?"}
+} -returnCodes error -result {unknown signal 999999}
test signal-2.7 {signal throw invalid} -body {
signal throw NONEXISTENT