mirror of
https://github.com/tmux/tmux.git
synced 2024-12-24 01:58:46 +00:00
Sync OpenBSD patchset 586:
Use quiet variable, and add missing sentinel to options array.
This commit is contained in:
parent
b70be285b7
commit
7459be544e
@ -1,4 +1,4 @@
|
||||
/* $Id: cmd-set-option.c,v 1.90 2009-12-10 16:59:02 tcunha Exp $ */
|
||||
/* $Id: cmd-set-option.c,v 1.91 2009-12-12 01:01:11 tcunha 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[] = {
|
||||
|
6
tmux.c
6
tmux.c
@ -1,4 +1,4 @@
|
||||
/* $Id: tmux.c,v 1.194 2009-12-10 16:59:02 tcunha Exp $ */
|
||||
/* $Id: tmux.c,v 1.195 2009-12-12 01:01:11 tcunha Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -232,7 +232,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;
|
||||
|
||||
#if defined(DEBUG) && defined(__OpenBSD__)
|
||||
@ -319,7 +319,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;
|
||||
|
Loading…
Reference in New Issue
Block a user