diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2017-08-10 17:16:37 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2017-08-10 17:16:37 +0200 |
| commit | e3b67a8198c852bf6c9db3a0a1a20e87a4e1da74 (patch) | |
| tree | 8486633f6232f49ea330ab8e036decb5dc3bbf74 /Src/Modules/datetime.c | |
| parent | f8edeff2494bf23e2ee29d4c761361b1c878e09d (diff) | |
| parent | dc475bfa0ec6cd03789dde3bf28f71e0ea9d5003 (diff) | |
| download | zsh-e3b67a8198c852bf6c9db3a0a1a20e87a4e1da74.tar.gz zsh-e3b67a8198c852bf6c9db3a0a1a20e87a4e1da74.zip | |
Merge tag '5.4.1' into debian
Release 5.4.1.
Diffstat (limited to 'Src/Modules/datetime.c')
| -rw-r--r-- | Src/Modules/datetime.c | 8 |
1 files changed, 6 insertions, 2 deletions
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)); |