mirror of
https://github.com/tmux/tmux.git
synced 2025-01-12 11:18:48 +00:00
Whoops, chose the wrong one in a conflict. Revert.
This commit is contained in:
parent
20e322bf9b
commit
910d6282c4
@ -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 <nicm@users.sourceforge.net>
|
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||||
@ -158,16 +158,13 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)
|
|||||||
rval = 0;
|
rval = 0;
|
||||||
goto out;
|
goto out;
|
||||||
case '~':
|
case '~':
|
||||||
if (!have_arg) {
|
if (have_arg == 0) {
|
||||||
t = cmd_string_expand_tilde(s, &p);
|
if ((t = cmd_string_expand_tilde(s, &p)) == NULL)
|
||||||
if (t == NULL)
|
|
||||||
goto error;
|
goto error;
|
||||||
buf = xrealloc(buf, 1, len + strlen(t) + 1);
|
buf = xrealloc(buf, 1, len + strlen(t) + 1);
|
||||||
strlcpy(buf + len, t, strlen(t) + 1);
|
strlcpy(buf + len, t, strlen(t) + 1);
|
||||||
len += strlen(t);
|
len += strlen(t);
|
||||||
xfree(t);
|
xfree(t);
|
||||||
|
|
||||||
have_arg = 1;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
|
@ -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 <nicm@users.sourceforge.net>
|
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||||
|
Loading…
Reference in New Issue
Block a user