diff options
| author |   nicm <nicm@openbsd.org> | 2014-04-17 07:55:43 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2014-04-17 07:55:43 +0000 |
| commit | 7f6133c3b9c0cbe727568dc385e733fed31272d8 (patch) | |
| tree | 477d339577100cb82d4fd11c75e2a27824141942 /usr.bin/tmux/tmux.c | |
| parent | move enginetest to regress as was done with the other tests (diff) | |
| download | wireguard-openbsd-7f6133c3b9c0cbe727568dc385e733fed31272d8.tar.xz wireguard-openbsd-7f6133c3b9c0cbe727568dc385e733fed31272d8.zip | |
Remove the "info" message mechanism, this was only used for about five
mostly useless and annoying messages. Change those commands to silence
on success like all the others. Still accept the -q command line flag
and "quiet" server option for now.
Diffstat (limited to 'usr.bin/tmux/tmux.c')
| -rw-r--r-- | usr.bin/tmux/tmux.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index 457d0f4497e..689463195c1 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.130 2014/03/31 21:42:45 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.131 2014/04/17 07:55:43 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -206,7 +206,7 @@ main(int argc, char **argv) char in[256]; const char *home; long long pid; - int opt, flags, quiet, keys, session; + int opt, flags, keys, session; #ifdef DEBUG malloc_options = (char *) "AFGJPX"; @@ -214,7 +214,7 @@ main(int argc, char **argv) setlocale(LC_TIME, ""); - quiet = flags = 0; + flags = 0; label = path = NULL; login_shell = (**argv == '-'); while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:uUv")) != -1) { @@ -244,7 +244,6 @@ main(int argc, char **argv) label = xstrdup(optarg); break; case 'q': - quiet = 1; break; case 'S': free(path); @@ -291,11 +290,11 @@ main(int argc, char **argv) options_init(&global_options, NULL); options_table_populate_tree(server_options_table, &global_options); - options_set_number(&global_options, "quiet", quiet); options_init(&global_s_options, NULL); options_table_populate_tree(session_options_table, &global_s_options); - options_set_string(&global_s_options, "default-shell", "%s", getshell()); + options_set_string(&global_s_options, "default-shell", "%s", + getshell()); options_init(&global_w_options, NULL); options_table_populate_tree(window_options_table, &global_w_options); |