Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2016-08-25 12:01:10 +01:00
commit 1bc467fe52

View File

@ -78,9 +78,10 @@ cmd_display_message_exec(struct cmd *self, struct cmd_q *cmdq)
msg = format_expand_time(ft, template, time(NULL)); msg = format_expand_time(ft, template, time(NULL));
if (args_has(self->args, 'p')) if (args_has(self->args, 'p'))
cmdq_print(cmdq, "%s", msg); cmdq_print(cmdq, "%s", msg);
else else if (c != NULL)
status_message_set(c, "%s", msg); status_message_set(c, "%s", msg);
free(msg); free(msg);
format_free(ft); format_free(ft);
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);