Merge branch 'obsd-master'

1 files changed, 3 insertions, 6 deletions

diff --git a/format.c b/format.c
index 34d5f796..632dfaf0 100644
--- a/format.c
+++ b/format.c
@@ -492,7 +492,6 @@ struct format_tree *
 format_create(struct cmd_q *cmdq, int flags)
 {
 	struct format_tree	*ft;
-	struct cmd		*cmd;
 
 	if (!event_initialized(&format_job_event)) {
 		evtimer_set(&format_job_event, format_job_timer, NULL);
@@ -510,11 +509,9 @@ format_create(struct cmd_q *cmdq, int flags)
 	format_add_tv(ft, "start_time", &start_time);
 
 	if (cmdq != NULL && cmdq->cmd != NULL)
-		format_add(ft, "command_name", "%s", cmdq->cmd->entry->name);
-	if (cmdq != NULL && cmdq->parent != NULL) {
-		cmd = cmdq->parent->cmd;
-		format_add(ft, "command_hooked", "%s", cmd->entry->name);
-	}
+		format_add(ft, "command", "%s", cmdq->cmd->entry->name);
+	if (cmdq != NULL && cmdq->hook != NULL)
+		format_add(ft, "hook", "%s", cmdq->hook);
 
 	return (ft);
 }