circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 06:17:04 +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
tmux.c
View File

@ -39,7 +39,7 @@ extern char *malloc_options;
struct options *global_options; /* server options */
struct options *global_s_options; /* session options */
struct options *global_w_options; /* window options */
struct environ global_environ;
struct environ *global_environ;
char *shell_cmd;
int debug_level;
@ -282,11 +282,11 @@ main(int argc, char **argv)
flags |= CLIENT_UTF8;
}
environ_init(&global_environ);
global_environ = environ_create();
for (var = environ; *var != NULL; var++)
environ_put(&global_environ, *var);
environ_put(global_environ, *var);
if (getcwd(tmp, sizeof tmp) != NULL)
environ_set(&global_environ, "PWD", tmp);
environ_set(global_environ, "PWD", tmp);
global_options = options_create(NULL);
options_table_populate_tree(server_options_table, global_options);