about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2015-08-18 14:26:11 +0100
committerPeter Stephenson <pws@zsh.org>2015-08-18 14:27:42 +0100
commit5292d60eb1b2ed5e021e3ee3d05bf08136757ac4 (patch)
tree3e10efddffd0595fee77277bd772594db38d9abf
parent8141a3d850b1b9777a13d0107c262853734214b4 (diff)
downloadzsh-5292d60eb1b2ed5e021e3ee3d05bf08136757ac4.tar.gz
zsh-5292d60eb1b2ed5e021e3ee3d05bf08136757ac4.tar.xz
zsh-5292d60eb1b2ed5e021e3ee3d05bf08136757ac4.zip
Revert "36222: unmetafy output from strftime"
This reverts commit 8141a3d850b1b9777a13d0107c262853734214b4.
-rw-r--r--ChangeLog2
-rw-r--r--Src/Modules/datetime.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d28a6067c..2165a9ae3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-08-18  Peter Stephenson  <p.stephenson@samsung.com>
 
+	* unposted: revert 36222, not the correct fix.
+
 	* 36222: Src/Modules/datetime.c: unmetafy output from strftime.
 
 	* 36218: Src/files.c: use unmetafied file name for mkdir()
diff --git a/Src/Modules/datetime.c b/Src/Modules/datetime.c
index f5a47e3d6..d9416679f 100644
--- a/Src/Modules/datetime.c
+++ b/Src/Modules/datetime.c
@@ -140,8 +140,7 @@ output_strftime(char *nam, char **argv, Options ops, UNUSED(int func))
     if (scalar) {
 	setsparam(scalar, metafy(buffer, -1, META_DUP));
     } else {
-	zputs(buffer, stdout);
-	putchar('\n');
+	printf("%s\n", buffer);
     }
     zfree(buffer, bufsize);