diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-05-15 08:52:25 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-05-15 09:19:27 -0700 |
| commit | 61d64408a1f42b0340d37ea0c90a9f028ffb1bfd (patch) | |
| tree | c74d0245a5cf6098fc0a434d3c50912610d9b89d /timezone/zdump.c | |
| parent | 59b64f9cbbf1e98c6d187873de6c363994aee19d (diff) | |
| download | glibc-61d64408a1f42b0340d37ea0c90a9f028ffb1bfd.tar glibc-61d64408a1f42b0340d37ea0c90a9f028ffb1bfd.tar.gz glibc-61d64408a1f42b0340d37ea0c90a9f028ffb1bfd.tar.bz2 glibc-61d64408a1f42b0340d37ea0c90a9f028ffb1bfd.zip | |
Update timezone code from tzcode 2020a
This patch updates files coming from tzcode to tzcode 2020a.
This is mostly for better support for Internet RFC 8536, by adding
support to zic for the Expires line (new to tzcode 2020a), the -b
option (new to 2019b) and the -r option (new to 2019a).
One trivial change to other glibc was needed.
* time/tzfile.c (__tzfile_read): Adjust to tzcode private.h renaming.
* timezone/private.h, timezone/tzfile.h, timezone/version:
* timezone/zdump.c, timezone/zic.c: Update from tzcode 2020a.
Diffstat (limited to 'timezone/zdump.c')
| -rw-r--r-- | timezone/zdump.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/timezone/zdump.c b/timezone/zdump.c index 0fc8ced96a..b532fe3eae 100644 --- a/timezone/zdump.c +++ b/timezone/zdump.c @@ -328,12 +328,12 @@ abbrok(const char *const abbrp, const char *const zone) cp = abbrp; while (is_alpha(*cp) || is_digit(*cp) || *cp == '-' || *cp == '+') ++cp; - if (cp - abbrp < 3) + if (*cp) + wp = _("has characters other than ASCII alphanumerics, '-' or '+'"); + else if (cp - abbrp < 3) wp = _("has fewer than 3 characters"); else if (cp - abbrp > 6) wp = _("has more than 6 characters"); - else if (*cp) - wp = _("has characters other than ASCII alphanumerics, '-' or '+'"); else return; fflush(stdout); |