From 0697c45ab38f60f9cb80e0c4be3d0eb23acb0d30 Mon Sep 17 00:00:00 2001 From: Jun-ichi Takimoto Date: Thu, 2 Mar 2017 11:02:01 +0900 Subject: 40681: strftime builtin should return 1 if ztrftime() returns -1 --- ChangeLog | 5 +++++ Src/Modules/datetime.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee31ac6f7..e4d86124a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-03-02 Jun-ichi Takimoto + + * 40681: Src/Modules/datetime.c: strftime builtin should + return 1 if zstrftime() returns -1. + 2017-03-01 Peter Stephenson * 40622 (typos fixed): Doc/Zsh/builtins.yo, Src/builtin.c, diff --git a/Src/Modules/datetime.c b/Src/Modules/datetime.c index bb82c542f..6e9047bc5 100644 --- a/Src/Modules/datetime.c +++ b/Src/Modules/datetime.c @@ -133,11 +133,15 @@ output_strftime(char *nam, char **argv, Options ops, UNUSED(int func)) len = 0; for (x=0; x < 4; x++) { - if ((len = ztrftime(buffer, bufsize, argv[0], t, 0L)) >= 0) + if ((len = ztrftime(buffer, bufsize, argv[0], t, 0L)) >= 0 || x==3) break; buffer = zrealloc(buffer, bufsize *= 2); } - DPUTS(len < 0, "bad output from ztrftime"); + if (len < 0) { + zwarnnam(nam, "bad/unsupported format: '%s'", argv[0]); + zfree(buffer, bufsize); + return 1; + } if (scalar) { setsparam(scalar, metafy(buffer, len, META_DUP)); -- cgit 1.4.1