SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2023-11-15 11:31:12 +00:00
parent 4574748555
commit a7acbdeab0
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
11 changed files with 50 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

27
usr.bin/tmux/status.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: status.c,v 1.240 2023/08/15 07:01:47 nicm Exp $ */
/* $OpenBSD: status.c,v 1.241 2023/11/14 15:59:49 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@ -472,17 +472,26 @@ void
status_message_set(struct client *c, int delay, int ignore_styles,
int ignore_keys, const char *fmt, ...)
{
struct timeval tv;
va_list ap;
struct timeval tv;
va_list ap;
char *s;
va_start(ap, fmt);
xvasprintf(&s, fmt, ap);
va_end(ap);
log_debug("%s: %s", __func__, s);
if (c == NULL) {
server_add_message("message: %s", s);
free(s);
return;
}
status_message_clear(c);
status_push_screen(c);
va_start(ap, fmt);
xvasprintf(&c->message_string, fmt, ap);
va_end(ap);
server_add_message("%s message: %s", c->name, c->message_string);
c->message_string = s;
server_add_message("%s message: %s", c->name, s);
/*
* With delay -1, the display-time option is used; zero means wait for