extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-06-24 19:41:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix message log appends

Browse Source 
The following has been improved:
1) Previous code had "u_int first" which is incorrect as
   "first = c->message_next - limit" would result in negative values,
   resulting in dropping the first limit messages.
2) Avoid to traverse the entire list of message to prune messages.
This commit is contained in:
Nicolas Viennot 2015-12-31 13:14:32 -05:00
parent 4c5522f7fa
commit 2e0d82648f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
status.c
View File

@ -555,7 +555,7 @@ status_message_set(struct client *c, const char *fmt, ...)
struct message_entry *msg, *msg1; struct message_entry *msg, *msg1;
va_list ap; va_list ap;
int delay; int delay;
u_int first, limit; u_int limit;
limit = options_get_number(global_options, "message-limit"); limit = options_get_number(global_options, "message-limit");
@ -572,10 +572,9 @@ status_message_set(struct client *c, const char *fmt, ...)
msg->msg = xstrdup(c->message_string); msg->msg = xstrdup(c->message_string);
TAILQ_INSERT_TAIL(&c->message_log, msg, entry); TAILQ_INSERT_TAIL(&c->message_log, msg, entry);
first = c->message_next - limit;
TAILQ_FOREACH_SAFE(msg, &c->message_log, entry, msg1) { TAILQ_FOREACH_SAFE(msg, &c->message_log, entry, msg1) {
if (msg->msg_num >= first) if (msg->msg_num + limit >= c->message_next)
continue; break;
free(msg->msg); free(msg->msg);
TAILQ_REMOVE(&c->message_log, msg, entry); TAILQ_REMOVE(&c->message_log, msg, entry);
free(msg); free(msg);