From dfb7bb683057d08303955c49073f4b475bd0e2d6 Mon Sep 17 00:00:00 2001 From: nicm Date: Fri, 26 Apr 2019 11:38:51 +0000 Subject: Merge hooks into options and make each one an array option. This allows multiple commands to be easily bound to one hook. set-hook and show-hooks remain but they are now variants of set-option and show-options. show-options now has a -H flag to show hooks (by default they are not shown). --- cmd-string.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'cmd-string.c') diff --git a/cmd-string.c b/cmd-string.c index 440a0231..058f997c 100644 --- a/cmd-string.c +++ b/cmd-string.c @@ -174,7 +174,10 @@ cmd_string_parse(const char *s, const char *file, u_int line, char **cause) int argc; char **argv; - *cause = NULL; + if (cause != NULL) + *cause = NULL; + log_debug ("%s: %s", __func__, s); + if (cmd_string_split(s, &argc, &argv) != 0) { xasprintf(cause, "invalid or unknown command: %s", s); return (NULL); -- cgit