Sync OpenBSD patchset 1118:

Add a helper function to send ready message.
This commit is contained in:
Tiago Cunha 2012-05-22 20:59:58 +00:00
parent 49b2a255b6
commit baafc17a1e
4 changed files with 9 additions and 2 deletions

View File

@ -94,7 +94,7 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
ctx->cmdclient->session = s;
notify_attached_session_changed(ctx->cmdclient);
session_update_activity(s);
server_write_client(ctx->cmdclient, MSG_READY, NULL, 0);
server_write_ready(ctx->cmdclient);
update = options_get_string(&s->options, "update-environment");
environ_update(update, &ctx->cmdclient->environ, &s->environ);

View File

@ -231,7 +231,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
*/
if (!detached) {
if (ctx->cmdclient != NULL) {
server_write_client(ctx->cmdclient, MSG_READY, NULL, 0);
server_write_ready(ctx->cmdclient);
old_s = ctx->cmdclient->session;
if (old_s != NULL)

View File

@ -46,6 +46,12 @@ server_fill_environ(struct session *s, struct environ *env)
environ_set(env, "TMUX", var);
}
void
server_write_ready(struct client *c)
{
server_write_client(c, MSG_READY, NULL, 0);
}
int
server_write_client(
struct client *c, enum msgtype type, const void *buf, size_t len)

1
tmux.h
View File

@ -1739,6 +1739,7 @@ void server_window_loop(void);
/* server-fn.c */
void server_fill_environ(struct session *, struct environ *);
void server_write_ready(struct client *);
int server_write_client(
struct client *, enum msgtype, const void *, size_t);
void server_write_session(