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

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	grid-utf8.c
This commit is contained in:
Thomas Adam
2013-01-30 15:27:19 +00:00
parent 2ca8b7f359 fdbfc7e349
commit a3f4eb7b24
14 changed files with 198 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server-client.c
View File

@ -333,12 +333,12 @@ server_client_assume_paste(struct session *s)
u_int t;
if ((t = options_get_number(&s->options, "assume-paste-time")) == 0)
return 0;
return (0);
timersub(&s->activity_time, &s->last_activity_time, &tv);
if (tv.tv_sec == 0 && tv.tv_usec < t * 1000)
return 1;
return 0;
return (1);
return (0);
}
/* Handle data key input from client. */