summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/jobs.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 56a6ea228..f54327a6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2014-10-27 Mikael Magnusson <mikachu@gmail.com>
- * 33561: Src/jobs.c: The time builtin forgot to unmetafy TIMEFMT.
+ * 33561, 33562: Src/jobs.c: The time builtin forgot to unmetafy
+ TIMEFMT.
2014-10-26 Peter Stephenson <p.w.stephenson@ntlworld.com>
diff --git a/Src/jobs.c b/Src/jobs.c
index d312b2380..494d5aa90 100644
--- a/Src/jobs.c
+++ b/Src/jobs.c
@@ -702,8 +702,10 @@ printtime(struct timeval *real, child_times_t *ti, char *desc)
#endif
queue_signals();
- if (!(s = unmetafy(getsparam("TIMEFMT"), NULL)))
+ if (!(s = getsparam("TIMEFMT")))
s = DEFAULT_TIMEFMT;
+ else
+ s = unmetafy(s, NULL);
for (; *s; s++)
if (*s == '%')