circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Whoops, chose the wrong one in a conflict. Revert.

Browse Source
This commit is contained in:
Nicholas Marriott
2009-07-14 06:54:38 +00:00
parent 20e322bf9b
commit 910d6282c4
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd-string.c
View File

@@ -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>
@@ -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 */

2
tty-term.c
View File

@@ -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>