mirror of
https://github.com/tmux/tmux.git
synced 2026-03-06 07:45:35 +00:00
Merge branch 'obsd-master'
This commit is contained in:
9
format.c
9
format.c
@@ -4447,6 +4447,9 @@ format_loop_sessions(struct format_expand_state *es, const char *fmt)
|
||||
free(expanded);
|
||||
}
|
||||
|
||||
free(active);
|
||||
free(all);
|
||||
|
||||
return (value);
|
||||
}
|
||||
|
||||
@@ -5239,13 +5242,11 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
|
||||
done:
|
||||
/* Expand again if required. */
|
||||
if (modifiers & FORMAT_EXPAND) {
|
||||
format_copy_state(&next, es, FORMAT_EXPAND_NOJOBS);
|
||||
new = format_expand1(&next, value);
|
||||
new = format_expand1(es, value);
|
||||
free(value);
|
||||
value = new;
|
||||
} else if (modifiers & FORMAT_EXPANDTIME) {
|
||||
format_copy_state(&next, es, FORMAT_EXPAND_TIME|
|
||||
FORMAT_EXPAND_NOJOBS);
|
||||
format_copy_state(&next, es, FORMAT_EXPAND_TIME);
|
||||
new = format_expand1(&next, value);
|
||||
free(value);
|
||||
value = new;
|
||||
|
||||
Reference in New Issue
Block a user