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

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	tmux.1
	tmux.c
This commit is contained in:
Thomas Adam
2014-02-16 23:02:07 +00:00
parent 8edbbb9865 81db6bab91
commit b3de4a3dec
14 changed files with 90 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server-client.c
View File

@@ -67,9 +67,9 @@ server_client_create(int fd)
c->cmdq = cmdq_new(c);
c->cmdq->client_exit = 1;
c->stdin_data = evbuffer_new ();
c->stdout_data = evbuffer_new ();
c->stderr_data = evbuffer_new ();
c->stdin_data = evbuffer_new();
c->stdout_data = evbuffer_new();
c->stderr_data = evbuffer_new();
c->tty.fd = -1;
c->title = NULL;
@@ -122,7 +122,7 @@ server_client_open(struct client *c, struct session *s, char **cause)
return (0);
if (!(c->flags & CLIENT_TERMINAL)) {
*cause = xstrdup ("not a terminal");
*cause = xstrdup("not a terminal");
return (-1);
}
@@ -173,7 +173,7 @@ server_client_lost(struct client *c)
evtimer_del(&c->identify_timer);
free(c->message_string);
if (event_initialized (&c->message_timer))
if (event_initialized(&c->message_timer))
evtimer_del(&c->message_timer);
for (i = 0; i < ARRAY_LENGTH(&c->message_log); i++) {
msg = &ARRAY_ITEM(&c->message_log, i);
@@ -279,7 +279,7 @@ server_client_status_timer(void)
interval = options_get_number(&s->options, "status-interval");
difference = tv.tv_sec - c->status_timer.tv_sec;
if (difference >= interval) {
if (interval != 0 && difference >= interval) {
status_update_jobs(c);
c->flags |= CLIENT_STATUS;
}