diff options
| author |   nicm <nicm@openbsd.org> | 2015-11-20 12:01:19 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2015-11-20 12:01:19 +0000 |
| commit | 1a5f73180ac8c244763d20a16d6fca5f8d7ff25a (patch) | |
| tree | bb81f7da7496fe73a9b56a0615e0944dbe046b78 /usr.bin/tmux/tmux.c | |
| parent | avoid a use after enqueue, which is like a use after free. (diff) | |
| download | wireguard-openbsd-1a5f73180ac8c244763d20a16d6fca5f8d7ff25a.tar.xz wireguard-openbsd-1a5f73180ac8c244763d20a16d6fca5f8d7ff25a.zip | |
Instead of separate tables for different types of options, give each
option a scope type (server, session, window) in one table.
Diffstat (limited to 'usr.bin/tmux/tmux.c')
| -rw-r--r-- | usr.bin/tmux/tmux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index e07799a5dc5..3d188fbed63 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.154 2015/11/15 14:32:48 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.155 2015/11/20 12:01:19 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -288,14 +288,14 @@ main(int argc, char **argv) environ_set(global_environ, "PWD", tmp); global_options = options_create(NULL); - options_table_populate_tree(server_options_table, global_options); + options_table_populate_tree(OPTIONS_TABLE_SERVER, global_options); global_s_options = options_create(NULL); - options_table_populate_tree(session_options_table, global_s_options); + options_table_populate_tree(OPTIONS_TABLE_SESSION, global_s_options); options_set_string(global_s_options, "default-shell", "%s", getshell()); global_w_options = options_create(NULL); - options_table_populate_tree(window_options_table, global_w_options); + options_table_populate_tree(OPTIONS_TABLE_WINDOW, global_w_options); /* Override keys to vi if VISUAL or EDITOR are set. */ if ((s = getenv("VISUAL")) != NULL || (s = getenv("EDITOR")) != NULL) { |