circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Expand arguments to C and s format modifiers (matches m which already expands).

pull/1819/head
nicm 2019-06-24 10:04:29 +00:00
parent bdab595095
commit 20b938bcb1
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
format.c
View File

@ -1644,13 +1644,15 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
goto fail; goto fail;
} else if (search != NULL) { } else if (search != NULL) {
/* Search in pane. */ /* Search in pane. */
new = format_expand(ft, copy);
if (wp == NULL) { if (wp == NULL) {
format_log(ft, "search '%s' but no pane", copy); format_log(ft, "search '%s' but no pane", new);
value = xstrdup("0"); value = xstrdup("0");
} else { } else {
format_log(ft, "search '%s' pane %%%u", copy, wp->id); format_log(ft, "search '%s' pane %%%u", new, wp->id);
value = format_search(fm, wp, copy); value = format_search(fm, wp, new);
} }
free(new);
} else if (cmp != NULL) { } else if (cmp != NULL) {
/* Comparison of left and right. */ /* Comparison of left and right. */
if (format_choose(ft, copy, &left, &right, 1) != 0) { if (format_choose(ft, copy, &left, &right, 1) != 0) {
@ -1780,11 +1782,14 @@ done:
/* Perform substitution if any. */ /* Perform substitution if any. */
if (sub != NULL) { if (sub != NULL) {
new = format_sub(sub, value, sub->argv[0], sub->argv[1]); left = format_expand(ft, sub->argv[0]);
format_log(ft, "substituted '%s' to '%s': %s", sub->argv[0], right = format_expand(ft, sub->argv[1]);
sub->argv[1], new); new = format_sub(sub, value, left, right);
format_log(ft, "substitute '%s' to '%s': %s", left, right, new);
free(value); free(value);
value = new; value = new;
free(right);
free(left);
} }
/* Truncate the value if needed. */ /* Truncate the value if needed. */