Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-04-13 14:01:45 +01:00
62 changed files with 470 additions and 336 deletions

View File

@ -208,7 +208,7 @@ server_client_create(int fd)
c->fd = -1;
c->cwd = NULL;
TAILQ_INIT(&c->queue);
c->queue = cmdq_new();
c->tty.fd = -1;
c->title = NULL;
@ -353,8 +353,7 @@ server_client_free(__unused int fd, __unused short events, void *arg)
log_debug("free client %p (%d references)", c, c->references);
if (!TAILQ_EMPTY(&c->queue))
fatalx("queue not empty");
cmdq_free(c->queue);
if (c->references == 0) {
free((void *)c->name);
@ -1080,7 +1079,7 @@ server_client_update_latest(struct client *c)
static enum cmd_retval
server_client_key_callback(struct cmdq_item *item, void *data)
{
struct client *c = item->client;
struct client *c = cmdq_get_client(item);
struct key_event *event = data;
key_code key = event->key;
struct mouse_event *m = &event->m;
@ -1891,7 +1890,7 @@ server_client_dispatch(struct imsg *imsg, void *arg)
static enum cmd_retval
server_client_command_done(struct cmdq_item *item, __unused void *data)
{
struct client *c = item->client;
struct client *c = cmdq_get_client(item);
if (~c->flags & CLIENT_ATTACHED)
c->flags |= CLIENT_EXIT;