summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tmux/cmd-set-option.c3
-rw-r--r--usr.bin/tmux/tmux.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/tmux/cmd-set-option.c b/usr.bin/tmux/cmd-set-option.c
index e5374ed2ce4..2fdbe7e211b 100644
--- a/usr.bin/tmux/cmd-set-option.c
+++ b/usr.bin/tmux/cmd-set-option.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-set-option.c,v 1.29 2009/12/10 09:16:52 nicm Exp $ */
+/* $OpenBSD: cmd-set-option.c,v 1.30 2009/12/11 13:58:48 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -75,6 +75,7 @@ const char *set_option_bell_action_list[] = {
const struct set_option_entry set_option_table[] = {
{ "quiet", SET_OPTION_FLAG, 0, 0, NULL },
+ { NULL, 0, 0, 0, NULL }
};
const struct set_option_entry set_session_option_table[] = {
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index d9a6dc95192..4710bf9044e 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.63 2009/12/10 09:16:52 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.64 2009/12/11 13:58:48 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -229,7 +229,7 @@ main(int argc, char **argv)
char cwd[MAXPATHLEN], **var;
void *buf;
size_t len;
- int opt, flags, quiet, cmdflags = 0;
+ int opt, flags, quiet = 0, cmdflags = 0;
short events;
#ifdef DEBUG
@@ -316,7 +316,7 @@ main(int argc, char **argv)
options_init(&global_options, NULL);
oo = &global_options;
- options_set_number(oo, "quiet", 0);
+ options_set_number(oo, "quiet", quiet);
options_init(&global_s_options, NULL);
so = &global_s_options;