diff options
| author |   nicm <nicm@openbsd.org> | 2015-10-28 09:51:55 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2015-10-28 09:51:55 +0000 |
| commit | fb46cb3d45f8409388c0708ceae7c35b9816d7d2 (patch) | |
| tree | 82a82e31962a2960a835e9e60a7a64ffff21728f /usr.bin/tmux/tmux.c | |
| parent | kern.cptime is length 2 (diff) | |
| download | wireguard-openbsd-fb46cb3d45f8409388c0708ceae7c35b9816d7d2.tar.xz wireguard-openbsd-fb46cb3d45f8409388c0708ceae7c35b9816d7d2.zip | |
Like options, move the environ struct into environ.c.
Diffstat (limited to 'usr.bin/tmux/tmux.c')
| -rw-r--r-- | usr.bin/tmux/tmux.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index 10b9306f48f..01216a5b54a 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.148 2015/10/27 15:58:42 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.149 2015/10/28 09:51:55 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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); |