circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 22:43:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-10-28 12:01:11 +00:00
parent da1f6fc2c8 bf9c933cae
commit a5e4d3a2d8
19 changed files with 125 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server-client.c
View File

@ -57,7 +57,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);
@ -93,7 +93,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;
@ -217,7 +217,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;
@ -1154,7 +1154,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: