From 087ae957eb631e47da2a7dd5ca83a4459f71d35c Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sun, 23 Aug 2009 17:29:52 +0000 Subject: 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. --- usr.bin/tmux/server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr.bin/tmux/server.c') 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 @@ -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)); -- cgit v1.2.3