Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-10-16 20:01:10 +01:00
29 changed files with 817 additions and 702 deletions

View File

@ -65,7 +65,7 @@ notify_hook(struct notify_entry *ne)
const char *name;
struct cmd_find_state fs;
struct hook *hook;
struct cmd_q *hooks_cmdq;
struct cmd_q *new_cmdq, *loop;
name = notify_hooks[ne->type];
if (name == NULL)
@ -86,14 +86,12 @@ notify_hook(struct notify_entry *ne)
return;
log_debug("notify hook %s", name);
hooks_cmdq = cmdq_new(NULL);
hooks_cmdq->flags |= CMD_Q_NOHOOKS;
new_cmdq = cmdq_get_command(hook->cmdlist, &fs, NULL, CMD_Q_NOHOOKS);
cmd_find_copy_state(&hooks_cmdq->current, &fs);
hooks_cmdq->parent = NULL;
for (loop = new_cmdq; loop != NULL; loop = loop->next)
loop->hook = xstrdup(name);
cmdq_run(hooks_cmdq, hook->cmdlist, NULL);
cmdq_free(hooks_cmdq);
cmdq_append(NULL, new_cmdq);
}
static void