summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/tmux.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2015-11-24 23:46:15 +0000
committernicm <nicm@openbsd.org>2015-11-24 23:46:15 +0000
commitc4ce9d7a63a0826d937537e91ffee21defc0885e (patch)
tree0e38175d4e8e84a3fa8435c7ac8f0b713bf5d080 /usr.bin/tmux/tmux.c
parentShell command from -c doesn't have to be global, pass it as an argument. (diff)
downloadwireguard-openbsd-c4ce9d7a63a0826d937537e91ffee21defc0885e.tar.xz
wireguard-openbsd-c4ce9d7a63a0826d937537e91ffee21defc0885e.zip
Make environ_set va_args and use it to tidy up some calls. Also add a
missing word in manpage (from jmc).
Diffstat (limited to 'usr.bin/tmux/tmux.c')
-rw-r--r--usr.bin/tmux/tmux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index a98ddb88948..5df75994b08 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.161 2015/11/24 23:22:51 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.162 2015/11/24 23:46:15 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -273,7 +273,7 @@ main(int argc, char **argv)
for (var = environ; *var != NULL; var++)
environ_put(global_environ, *var);
if (getcwd(tmp, sizeof tmp) != NULL)
- environ_set(global_environ, "PWD", tmp);
+ environ_set(global_environ, "PWD", "%s", tmp);
global_options = options_create(NULL);
options_table_populate_tree(OPTIONS_TABLE_SERVER, global_options);