Provide a way for hooks to tag formats onto the commands they fire so

that the user can get at additional information - now used for the
"hook" format, more to come.
This commit is contained in:
nicm
2016-10-16 19:36:37 +00:00
parent 026ad08b56
commit 3f35b5299f
5 changed files with 53 additions and 21 deletions

View File

@ -102,7 +102,8 @@ cmdq_insert_after(struct cmdq_item *after, struct cmdq_item *item)
static void
cmdq_remove(struct cmdq_item *item)
{
free((void *)item->hook);
if (item->formats != NULL)
format_free(item->formats);
if (item->client != NULL)
server_client_unref(item->client);
@ -241,6 +242,28 @@ cmdq_fire_callback(struct cmdq_item *item)
return (item->cb(item, item->data));
}
/* Add a format to command queue. */
void
cmdq_format(struct cmdq_item *item, const char *key, const char *fmt, ...)
{
va_list ap;
struct cmdq_item *loop;
char *value;
va_start(ap, fmt);
xvasprintf(&value, fmt, ap);
va_end(ap);
for (loop = item; loop != NULL; loop = item->next) {
if (loop->formats == NULL)
loop->formats = format_create(NULL, 0);
format_add(loop->formats, key, "%s", value);
}
free(value);
}
/* Process next item on command queue. */
u_int
cmdq_next(struct client *c)