diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-09-09 12:09:22 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-09-09 12:09:22 +0000 |
| commit | 48bea83486cd6072e7618d2cc8f418dfb6d90446 (patch) | |
| tree | 77354ac9cfe391a1967dc819aa6b492bf0bc51e8 | |
| parent | 4e08e896bf4a7610e3cd35702d76aaddece84cab (diff) | |
No need to keep global options around for client which doesn't use them.
| -rw-r--r-- | usr.bin/tmux/cfg.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/client.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/usr.bin/tmux/cfg.c b/usr.bin/tmux/cfg.c index 7ed177fcfee..7f2c4abbe31 100644 --- a/usr.bin/tmux/cfg.c +++ b/usr.bin/tmux/cfg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfg.c,v 1.41 2015/09/01 10:10:59 nicm Exp $ */ +/* $OpenBSD: cfg.c,v 1.42 2015/09/09 12:09:21 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -98,7 +98,7 @@ load_cfg(const char *path, struct cmd_q *cmdq, char **cause) } found = 0; - while ((buf = fparseln(f, NULL, &line, delim, 0))) { + while ((buf = fparseln(f, NULL, &line, delim, 0)) != NULL) { log_debug("%s: %s", path, buf); /* Skip empty lines. */ diff --git a/usr.bin/tmux/client.c b/usr.bin/tmux/client.c index 8a97356beb4..01c610a7a15 100644 --- a/usr.bin/tmux/client.c +++ b/usr.bin/tmux/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.93 2015/08/30 22:40:25 nicm Exp $ */ +/* $OpenBSD: client.c,v 1.94 2015/09/09 12:09:21 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -268,6 +268,10 @@ client_main(struct event_base *base, int argc, char **argv, int flags) } return (1); } + options_free(&global_options); + options_free(&global_s_options); + options_free(&global_w_options); + environ_free(&global_environ); /* Create imsg. */ imsg_init(&client_ibuf, fd); |