From f47a063841f2baa1590fb9e53713b3713a03020d Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 7 Mar 2013 10:07:22 +0000 Subject: Rename session idx to session id throughout and add $ prefix to targets to use it, extended from a diff from George Nachman. --- server-fn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server-fn.c') diff --git a/server-fn.c b/server-fn.c index b09415e0..4d8a658c 100644 --- a/server-fn.c +++ b/server-fn.c @@ -39,7 +39,7 @@ server_fill_environ(struct session *s, struct environ *env) term = options_get_string(&s->options, "default-terminal"); environ_set(env, "TERM", term); - idx = s->idx; + idx = s->id; } else idx = -1; pid = getpid(); -- cgit From 412ac6bc3a690628f72101494ac88e91c7d3377c Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 11 Mar 2013 09:46:18 +0000 Subject: Use single stdout and stderr for control clients. --- server-fn.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'server-fn.c') diff --git a/server-fn.c b/server-fn.c index 4d8a658c..566925f0 100644 --- a/server-fn.c +++ b/server-fn.c @@ -546,6 +546,10 @@ server_push_stderr(struct client *c) struct msg_stderr_data data; size_t size; + if (c->stderr_data == c->stdout_data) { + server_push_stdout(c); + return; + } size = EVBUFFER_LENGTH(c->stderr_data); if (size == 0) return; -- cgit