circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 18:29:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2018-05-29 11:02:26 +01:00
commit 54cd292f09
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
format.c
View File

@ -1058,8 +1058,18 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
*ptr = '\0';
found = format_find(ft, copy + 1, modifiers);
if (found == NULL)
if (found == NULL) {
/*
* If the conditional not found, try to expand it. If
* the expansion doesn't have any effect, then assume
* false.
*/
found = format_expand(ft, copy + 1);
if (strcmp(found, copy + 1) == 0) {
free(found);
found = xstrdup("");
}
}
if (format_choose(ptr + 1, &left, &right) != 0)
goto fail;
@ -1114,8 +1124,8 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
value = new;
}
/* Expand the buffer and copy in the value. */
done:
/* Expand the buffer and copy in the value. */
valuelen = strlen(value);
while (*len - *off < valuelen + 1) {
*buf = xreallocarray(*buf, 2, *len);