diff options
| author |   nicm <nicm@openbsd.org> | 2015-10-28 09:51:55 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2015-10-28 09:51:55 +0000 |
| commit | fb46cb3d45f8409388c0708ceae7c35b9816d7d2 (patch) | |
| tree | 82a82e31962a2960a835e9e60a7a64ffff21728f /usr.bin/tmux/server-client.c | |
| parent | kern.cptime is length 2 (diff) | |
| download | wireguard-openbsd-fb46cb3d45f8409388c0708ceae7c35b9816d7d2.tar.xz wireguard-openbsd-fb46cb3d45f8409388c0708ceae7c35b9816d7d2.zip | |
Like options, move the environ struct into environ.c.
Diffstat (limited to 'usr.bin/tmux/server-client.c')
| -rw-r--r-- | usr.bin/tmux/server-client.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 01c8f0e15f8..76ff5e04da2 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.163 2015/10/27 15:58:42 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.164 2015/10/28 09:51:55 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -59,7 +59,7 @@ server_client_check_nested(struct client *c) if (c->tty.path == NULL) return (0); - envent = environ_find(&c->environ, "TMUX"); + envent = environ_find(c->environ, "TMUX"); if (envent == NULL || *envent->value == '\0') return (0); @@ -95,7 +95,7 @@ server_client_create(int fd) fatal("gettimeofday failed"); memcpy(&c->activity_time, &c->creation_time, sizeof c->activity_time); - environ_init(&c->environ); + c->environ = environ_create(); c->fd = -1; c->cwd = -1; @@ -219,7 +219,7 @@ server_client_lost(struct client *c) cmdq_free(c->cmdq); c->cmdq = NULL; - environ_free(&c->environ); + environ_free(c->environ); proc_remove_peer(c->peer); c->peer = NULL; @@ -1146,7 +1146,7 @@ server_client_dispatch_identify(struct client *c, struct imsg *imsg) if (datalen == 0 || data[datalen - 1] != '\0') fatalx("bad MSG_IDENTIFY_ENVIRON string"); if (strchr(data, '=') != NULL) - environ_put(&c->environ, data); + environ_put(c->environ, data); log_debug("client %p IDENTIFY_ENVIRON %s", c, data); break; case MSG_IDENTIFY_CLIENTPID: |