summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/server.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-08-23 17:29:52 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-08-23 17:29:52 +0000
commit087ae957eb631e47da2a7dd5ca83a4459f71d35c (patch)
tree493bbeec359ea52b06367a3ff626927fb3243667 /usr.bin/tmux/server.c
parent64dd9c8a82fcdea3d677666c748bfacd6b4f0121 (diff)
When using source-file, run the commands in the context of the source-file
command rather than with no context. This makes things like attach work from a file.
Diffstat (limited to 'usr.bin/tmux/server.c')
-rw-r--r--usr.bin/tmux/server.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c
index 0fb287fc2db..c665a745389 100644
--- a/usr.bin/tmux/server.c
+++ b/usr.bin/tmux/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.23 2009/08/18 21:37:04 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.24 2009/08/23 17:29:51 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -188,9 +188,9 @@ server_start(char *path)
&cause, "%s: %s", strerror(errno), SYSTEM_CFG);
goto error;
}
- } else if (load_cfg(SYSTEM_CFG, &cause) != 0)
+ } else if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
goto error;
- if (cfg_file != NULL && load_cfg(cfg_file, &cause) != 0)
+ if (cfg_file != NULL && load_cfg(cfg_file, NULL, &cause) != 0)
goto error;
exit(server_main(srv_fd));