mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-19 03:31:14 +02:00
Code Releases Activity

40681: strftime builtin should return 1 if ztrftime() returns -1

Browse source
This commit is contained in:
Jun-ichi Takimoto 2017-03-02 11:02:01 +09:00
parent 47c05f6b66
commit 0697c45ab3
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2017-03-02 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
* 40681: Src/Modules/datetime.c: strftime builtin should
return 1 if zstrftime() returns -1.
2017-03-01 Peter Stephenson <p.stephenson@samsung.com> 2017-03-01 Peter Stephenson <p.stephenson@samsung.com>
* 40622 (typos fixed): Doc/Zsh/builtins.yo, Src/builtin.c, * 40622 (typos fixed): Doc/Zsh/builtins.yo, Src/builtin.c,

8
Src/Modules/datetime.c
View file

@ -133,11 +133,15 @@ output_strftime(char *nam, char **argv, Options ops, UNUSED(int func))
len = 0; len = 0;
for (x=0; x < 4; x++) { 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; break;
buffer = zrealloc(buffer, bufsize *= 2); 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) { if (scalar) {
setsparam(scalar, metafy(buffer, len, META_DUP)); setsparam(scalar, metafy(buffer, len, META_DUP));