set-hook needs CANFAIL like the other set commands.

1 files changed, 12 insertions, 3 deletions

diff --git a/cmd-set-hook.c b/cmd-set-hook.c
index 8ef02f8c..4d7cf908 100644
--- a/cmd-set-hook.c
+++ b/cmd-set-hook.c
@@ -36,7 +36,7 @@ const struct cmd_entry cmd_set_hook_entry = {
 	.args = { "gt:u", 1, 2 },
 	.usage = "[-gu] " CMD_TARGET_SESSION_USAGE " hook-name [command]",
 
-	.tflag = CMD_SESSION,
+	.tflag = CMD_SESSION_CANFAIL,
 
 	.flags = 0,
 	.exec = cmd_set_hook_exec
@@ -63,12 +63,21 @@ cmd_set_hook_exec(struct cmd *self, struct cmd_q *cmdq)
 	struct hooks	*hooks;
 	struct hook	*hook;
 	char		*cause, *tmp;
-	const char	*name, *cmd;
+	const char	*name, *cmd, *target;
 
 	if (args_has(args, 'g'))
 		hooks = global_hooks;
-	else
+	else {
+		if (cmdq->state.tflag.s == NULL) {
+			target = args_get(args, 't');
+			if (target != NULL)
+				cmdq_error(cmdq, "no such session: %s", target);
+			else
+				cmdq_error(cmdq, "no current session");
+			return (CMD_RETURN_ERROR);
+		}
 		hooks = cmdq->state.tflag.s->hooks;
+	}
 
 	if (self->entry == &cmd_show_hooks_entry) {
 		hook = hooks_first(hooks);