Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-12-11 13:24:45 +00:00
25 changed files with 34 additions and 28 deletions

View File

@ -482,7 +482,7 @@ format_cb_pane_tabs(struct format_tree *ft, struct format_entry *fe)
/* Create a new tree. */
struct format_tree *
format_create(int flags)
format_create(struct cmd_q *cmdq, int flags)
{
struct format_tree *ft;
@ -501,6 +501,9 @@ format_create(int flags)
format_add(ft, "socket_path", "%s", socket_path);
format_add_tv(ft, "start_time", &start_time);
if (cmdq != NULL && cmdq->cmd != NULL)
format_add(ft, "command_name", "%s", cmdq->cmd->entry->name);
return (ft);
}