circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2017-03-09 18:01:16 +00:00
parent fd96ccfd80 bce1dee034
commit c5bdae466e
10 changed files with 89 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
job.c
View File

@ -52,12 +52,7 @@ job_run(const char *cmd, struct session *s, const char *cwd,
if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, out) != 0)
return (NULL);
env = environ_create();
environ_copy(global_environ, env);
if (s != NULL)
environ_copy(s->environ, env);
server_fill_environ(s, env);
env = environ_for_session(s);
switch (pid = fork()) {
case -1:
environ_free(env);