diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-10-28 12:01:11 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-10-28 12:01:11 +0000 |
| commit | a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a (patch) | |
| tree | ebfcd8a38514651c4657dac40601a5aafa360b89 /tmux.c | |
| parent | da1f6fc2c8477c99e986061bcdd7c3e854a60076 (diff) | |
| parent | bf9c933caed5c74be3c9c4da02d7c57a9dcf091d (diff) | |
| download | rtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.tar.gz rtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.tar.bz2 rtmux-a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.c')
| -rw-r--r-- | tmux.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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); |