From 1492ae11a5c4f29e783f1d49f3580ee7f4d276e4 Mon Sep 17 00:00:00 2001 From: nicm Date: Tue, 9 Feb 2021 14:25:40 +0000 Subject: [PATCH] Do not expand times and #() inside #(). --- format.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/format.c b/format.c index ecf299d1..0e773498 100644 --- a/format.c +++ b/format.c @@ -367,7 +367,10 @@ format_job_get(struct format_expand_state *es, const char *cmd) RB_INSERT(format_job_tree, jobs, fj); } - expanded = format_expand1(es, cmd); + format_copy_state(&next, es, FORMAT_EXPAND_NOJOBS); + next.flags &= ~FORMAT_EXPAND_TIME; + + expanded = format_expand1(&next, cmd); if (fj->expanded == NULL || strcmp(expanded, fj->expanded) != 0) { free((void *)fj->expanded); fj->expanded = xstrdup(expanded); @@ -393,7 +396,6 @@ format_job_get(struct format_expand_state *es, const char *cmd) if (ft->flags & FORMAT_STATUS) fj->status = 1; - format_copy_state(&next, es, FORMAT_EXPAND_NOJOBS); return (format_expand1(&next, fj->out)); }