Merge branch 'obsd-master'

Conflicts:
	cmd.c
	format.c
	osdep-openbsd.c
	tmux.h
This commit is contained in:
Thomas Adam
2012-09-24 17:55:06 +01:00
3 changed files with 13 additions and 1 deletions

View File

@ -79,6 +79,15 @@ control_write(struct client *c, const char *fmt, ...)
server_push_stdout(c);
}
/* Write a buffer, adding a terminal newline. Empties buffer. */
void
control_write_buffer(struct client *c, struct evbuffer *buffer)
{
evbuffer_add_buffer(c->stdout_data, buffer);
evbuffer_add(c->stdout_data, "\n", 1);
server_push_stdout(c);
}
/* Control input callback. Read lines and fire commands. */
void
control_callback(struct client *c, int closed, unused void *data)