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

Use a utility function for common code to show errors in config file,

Browse Source 
from Thomas Adam.
This commit is contained in:
Nicholas Marriott
2012-11-19 10:38:06 +00:00
parent c68efec6c0
commit 827b311c81
4 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server.c
View File

@ -106,11 +106,8 @@ server_create_socket(void)
int
server_start(int lockfd, char *lockfile)
{
struct window_pane *wp;
int pair[2];
char *cause;
struct timeval tv;
u_int i;
int pair[2];
struct timeval tv;
/* The first client is special and gets a socketpair; create it. */
if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pair) != 0)
@ -178,17 +175,9 @@ server_start(int lockfd, char *lockfile)
* If there is a session already, put the current window and pane into
* more mode.
*/
if (!RB_EMPTY(&sessions) && !ARRAY_EMPTY(&cfg_causes)) {
wp = RB_MIN(sessions, &sessions)->curw->window->active;
window_pane_set_mode(wp, &window_copy_mode);
window_copy_init_for_output(wp);
for (i = 0; i < ARRAY_LENGTH(&cfg_causes); i++) {
cause = ARRAY_ITEM(&cfg_causes, i);
window_copy_add(wp, "%s", cause);
free(cause);
}
ARRAY_FREE(&cfg_causes);
}
if (!RB_EMPTY(&sessions) && !ARRAY_EMPTY(&cfg_causes))
show_cfg_causes(RB_MIN(sessions, &sessions));
cfg_finished = 1;
server_add_accept(0);