From 910d6282c49909a3f0277a858b699a8e06d28589 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 14 Jul 2009 06:54:38 +0000 Subject: [PATCH] Whoops, chose the wrong one in a conflict. Revert. --- cmd-string.c | 9 +++------ tty-term.c | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/cmd-string.c b/cmd-string.c index 1add4a26..00331c32 100644 --- a/cmd-string.c +++ b/cmd-string.c @@ -1,4 +1,4 @@ -/* $Id: cmd-string.c,v 1.20 2009-07-14 06:38:14 nicm Exp $ */ +/* $Id: cmd-string.c,v 1.21 2009-07-14 06:54:38 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -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 */ diff --git a/tty-term.c b/tty-term.c index f86680b9..acd7add2 100644 --- a/tty-term.c +++ b/tty-term.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty-term.c,v 1.3 2009/07/14 06:30:45 nicm Exp $ */ +/* $Id: tty-term.c,v 1.23 2009-07-14 06:54:38 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott