From d2c3dbc665367ae391ea52828ac1c6007097380a Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 14 Jul 2009 06:38:14 +0000 Subject: If it exist, load a system-wide configuration file /etc/tmux.conf before any user-specified one. --- cmd-string.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'cmd-string.c') diff --git a/cmd-string.c b/cmd-string.c index e2f451a6..1add4a26 100644 --- a/cmd-string.c +++ b/cmd-string.c @@ -1,4 +1,4 @@ -/* $Id: cmd-string.c,v 1.19 2009-07-13 18:03:18 tcunha Exp $ */ +/* $Id: cmd-string.c,v 1.20 2009-07-14 06:38:14 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -158,13 +158,16 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause) rval = 0; goto out; case '~': - if (have_arg == 0) { - if ((t = cmd_string_expand_tilde(s, &p)) == NULL) + if (!have_arg) { + t = cmd_string_expand_tilde(s, &p); + if (t == NULL) goto error; buf = xrealloc(buf, 1, len + strlen(t) + 1); strlcpy(buf + len, t, strlen(t) + 1); len += strlen(t); xfree(t); + + have_arg = 1; break; } /* FALLTHROUGH */ -- cgit