diff options
| author | nicm <nicm> | 2015-10-28 09:51:55 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2015-10-28 09:51:55 +0000 |
| commit | bf9c933caed5c74be3c9c4da02d7c57a9dcf091d (patch) | |
| tree | 533de8449d76a2bb151f883f99f80ba73f0c987e /tmux.c | |
| parent | 44657bf932b068aff5ce1019a4e8a2e7b00b5321 (diff) | |
| download | rtmux-bf9c933caed5c74be3c9c4da02d7c57a9dcf091d.tar.gz rtmux-bf9c933caed5c74be3c9c4da02d7c57a9dcf091d.tar.bz2 rtmux-bf9c933caed5c74be3c9c4da02d7c57a9dcf091d.zip | |
Like options, move the environ struct into environ.c.
Diffstat (limited to 'tmux.c')
| -rw-r--r-- | tmux.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -41,7 +41,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; @@ -275,11 +275,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); |