Mercurial > irccd
changeset 1154:c528a9e75a4f release-4.0
irccdctl: fix plugin-reload without argument as advertised
While here, cleanup manual page and help usage as well.
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Fri, 04 Feb 2022 10:11:41 +0100 |
| parents | 4d6fe5535657 |
| children | f1adf94eb0fc |
| files | irccd/peer.c irccdctl/irccdctl.c man/irccdctl.1 |
| diffstat | 3 files changed, 15 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/irccd/peer.c Sun Feb 06 16:04:15 2022 +0100 +++ b/irccd/peer.c Fri Feb 04 10:11:41 2022 +0100 @@ -339,7 +339,7 @@ } /* - * PLUGIN-RELOAD plugin + * PLUGIN-RELOAD [plugin] */ static int cmd_plugin_reload(struct peer *p, char *line) @@ -347,12 +347,14 @@ struct irc_plugin *plg; const char *args[1] = {0}; - if (parse(line, args, 1) != 1) - return EINVAL; - if (!(plg = irc_bot_plugin_get(args[0]))) - return peer_send(p, "could not reload plugin: %s", strerror(ENOENT)), 0; + if (parse(line, args, 1) == 1) { + if (!(plg = irc_bot_plugin_get(args[0]))) + return peer_send(p, "could not reload plugin: %s", strerror(ENOENT)), 0; - irc_plugin_reload(plg); + irc_plugin_reload(plg); + } else + DL_FOREACH(irc.plugins, plg) + irc_plugin_reload(plg); return ok(p); }
--- a/irccdctl/irccdctl.c Sun Feb 06 16:04:15 2022 +0100 +++ b/irccdctl/irccdctl.c Fri Feb 04 10:11:41 2022 +0100 @@ -942,10 +942,10 @@ fprintf(stderr, " irccdctl plugin-info id\n"); fprintf(stderr, " irccdctl plugin-list\n"); fprintf(stderr, " irccdctl plugin-load name\n"); - fprintf(stderr, " irccdctl plugin-path [variable [value]]\n"); - fprintf(stderr, " irccdctl plugin-template [variable [value]]\n"); - fprintf(stderr, " irccdctl plugin-reload [plugin]\n"); - fprintf(stderr, " irccdctl plugin-unload [plugin]\n"); + fprintf(stderr, " irccdctl plugin-path id [variable [value]]\n"); + fprintf(stderr, " irccdctl plugin-template id [variable [value]]\n"); + fprintf(stderr, " irccdctl plugin-reload [id]\n"); + fprintf(stderr, " irccdctl plugin-unload [id]\n"); fprintf(stderr, " irccdctl rule-add [-c channel] [-e event] [-i index] [-o origin] [-p plugin] [-s server] accept|drop\n"); fprintf(stderr, " irccdctl rule-edit [-a accept|drop] [-c|C channel] [-e|E event] [-o|O origin] [-s|S server] index\n"); fprintf(stderr, " irccdctl rule-list\n");