Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2026-02-26 10:18:15 +00:00
12 changed files with 541 additions and 336 deletions

View File

@@ -5239,11 +5239,13 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
done:
/* Expand again if required. */
if (modifiers & FORMAT_EXPAND) {
new = format_expand1(es, value);
format_copy_state(&next, es, FORMAT_EXPAND_NOJOBS);
new = format_expand1(&next, value);
free(value);
value = new;
} else if (modifiers & FORMAT_EXPANDTIME) {
format_copy_state(&next, es, FORMAT_EXPAND_TIME);
format_copy_state(&next, es, FORMAT_EXPAND_TIME|
FORMAT_EXPAND_NOJOBS);
new = format_expand1(&next, value);
free(value);
value = new;