* PATCH: The time builtin forgot to unmetafy TIMEFMT
@ 2014-10-27 19:32 Mikael Magnusson
2014-10-27 19:55 ` PATCH: 33562: Fix thinko in previous commit Mikael Magnusson
0 siblings, 1 reply; 2+ messages in thread
From: Mikael Magnusson @ 2014-10-27 19:32 UTC (permalink / raw)
To: zsh-workers
When TIMEFMT contains some high bit characters, the output was corrupted, this fixes it.
---
Src/jobs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Src/jobs.c b/Src/jobs.c
index bd95afb..5f55f80 100644
--- a/Src/jobs.c
+++ b/Src/jobs.c
@@ -711,7 +711,7 @@ printtime(struct timeval *real, child_times_t *ti, char *desc)
#endif
queue_signals();
- if (!(s = getsparam("TIMEFMT")))
+ if (!(s = unmetafy(getsparam("TIMEFMT"), NULL)))
s = DEFAULT_TIMEFMT;
for (; *s; s++)
--
2.1.0.GIT
^ permalink raw reply [flat|nested] 2+ messages in thread
* PATCH: 33562: Fix thinko in previous commit
2014-10-27 19:32 PATCH: The time builtin forgot to unmetafy TIMEFMT Mikael Magnusson
@ 2014-10-27 19:55 ` Mikael Magnusson
0 siblings, 0 replies; 2+ messages in thread
From: Mikael Magnusson @ 2014-10-27 19:55 UTC (permalink / raw)
To: zsh-workers
Oops.
---
ChangeLog | 3 ++-
Src/jobs.c | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 56a6ea2..f54327a 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 d312b23..494d5aa 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 == '%')
--
2.1.0.GIT
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-27 19:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-27 19:32 PATCH: The time builtin forgot to unmetafy TIMEFMT Mikael Magnusson
2014-10-27 19:55 ` PATCH: 33562: Fix thinko in previous commit Mikael Magnusson
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).