summaryrefslogtreecommitdiffstats
path: root/cmd-string.c
authornicm <nicm>2009-07-14 06:54:38 (GMT)
committer nicm <nicm>2009-07-14 06:54:38 (GMT)
commit5780470a0b53a07dde050e464767fc438e56401e (patch) (side-by-side diff)
tree8784fd25ab8a8a7487852cac7680f734d8161104 /cmd-string.c
parentdfcac26a4f39e3e13b1eb8da060d909171c1e133 (diff)
downloadtmux-old-5780470a0b53a07dde050e464767fc438e56401e.zip
tmux-old-5780470a0b53a07dde050e464767fc438e56401e.tar.gz
tmux-old-5780470a0b53a07dde050e464767fc438e56401e.tar.bz2
Whoops, chose the wrong one in a conflict. Revert.
Diffstat (limited to 'cmd-string.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cmd-string.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/cmd-string.c b/cmd-string.c
index 2fec21d..818e25e 100644
--- a/cmd-string.c
+++ b/cmd-string.c
@@ -158,16 +158,13 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)
rval = 0;
goto out;
case '~':
- if (!have_arg) {
- t = cmd_string_expand_tilde(s, &p);
- if (t == NULL)
+ if (have_arg == 0) {
+ if ((t = cmd_string_expand_tilde(s, &p)) == 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 */