[v6] Fix strptime era handling, add more strftime tests [BZ #24394]
Commit Message
Comments and new patch...
Rafal Luzynski <digitalfreak@lingonborough.com> writes:
> I skip the review of changes in this file because I am unable
> to analyze it thoroughly enough. It looks good at first sight
> though and I believe that the test confirms that these changes
> are correct.
Every review is helpful, no matter how much or what aspects are
reviewed. All help is appreciated :-)
>> + /* A descriptive name of the test. */
>
> Please use two spaces before the closing "*/" consequently.
Done. Note that there's only one space before the closing comment in
the test data, because "not a sentence" on purpose.
>> + For convenience, mis-matched strings are printed in
>> + paste-compatible format, raw text format, and unicode format. Use
>
> /s/unicode/Unicode
Fixed.
> I don't understand the rule when you decide to use one empty line
> and when two empty lines between the elements of the array. Just
> please make sure you use it consequently and deliberately.
Each pair of tests is a before/after a cutoff. I put one blank line
between tests for a given era change, and two between different eras.
It's intentional and consistent. I can take them out later, but it's a
lot of data to keep track of, and any visual clues I can add help.
So...
[two blanks]
before/after start of year
[blank]
before/after transition
[blank]
before/after end of year
[two blanks]
>> + printf("%s : ", header);
>
> Please use a space after "printf".
I actually have a script that checks for this, because I learned
programming without that space. I ran the script and corrected them
all.
> Thank you for this change. I thought that illegal tm_wday value is
> unlikely and if happens it is correct to crash/corrupt/etc. But
> your approach to handle possible illegal value is correct and not
> harmful.
I like pretty and useful output, but I'm paranoid and I *always* expect
invalid data. Especially in a test suite, which is *supposed* to watch
for it.
>> +
>> + snprintf (buffer, TMBUFLEN, "%04d/%02d/%02d %02d:%02d:%02d %s",
>> + tm->tm_year,
>> + tm->tm_mon,
>
> Since tm_mon is zero based, I think it should be:
>
> tm->tm_mon + 1,
Yup, and tm_year + 1900. I did this after Florian's request.
>> + printf("%s: %s %s %s\n", d->name, d->locale, d->format, d->printed);
>
> I'm afraid this will not work as expected for two reasons:
>
> * strlen counts bytes rather than characters which is wrong for UTF-8,
> * double width characters (quite common in CJK languages) occupy two
> columns on the terminal.
I could be even more clever about strlen*2 but it's not important
enough. I'll just break it always.
I also added NULL string handling to print_string_hex.
-----
Test the transition points between all the currently listed Japanese
era name changes. This includes testing the transition between the
first year date and the second year date. This test will help test
the upcoming Japanese era name change.
Also fixes a fencepost error where the era name isn't properly parsed
by strptime in the last (partial) year of the era.
Example: if an era change happens in Feb 1990, and again in Aug 1995,
that's 5.5 years long, but the 0.5 year wasn't accounted for.
Comments
On 3/29/19 7:18 PM, DJ Delorie wrote:
> I could be even more clever about strlen*2 but it's not important
> enough. I'll just break it always.
>
> I also added NULL string handling to print_string_hex.
Thanks for working on this test. At this point we've had feedback
from Rafal and TAMUKI-san, and myself. The changes from Rafal and
TAMUKI-san have been integrated or discussed, and we all agree this
test should go in because it adds valuable data-driven testing for
the new era name change.
Please commit this test after fixing the GNU coding standard issues.
On April 1st when we get the new era name we can adjust the test to
provide the additional coverage we're looking to have. Thank you again
for making this release the best it can be.
Would you be able to backport this to 2.29, 2.28, and 2.27? This will
give us coverage for F30, F29, and F28 (active branches) and I'll work
with the rest of the team to get Fedora updated.
> -----
Please use "8< --- 8< --- 8<" (see `man git mailinfo` and --scissors).
It helps me pull a patch from mail and apply it.
OK for master if you:
- Add back spaces in front of url in license text in new test.
- Fix enum {} placement.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
>
> Test the transition points between all the currently listed Japanese
> era name changes. This includes testing the transition between the
> first year date and the second year date. This test will help test
> the upcoming Japanese era name change.
>
> Also fixes a fencepost error where the era name isn't properly parsed
> by strptime in the last (partial) year of the era.
>
> Example: if an era change happens in Feb 1990, and again in Aug 1995,
> that's 5.5 years long, but the 0.5 year wasn't accounted for.
>
> diff --git a/ChangeLog b/ChangeLog
> index bd76c1e28d..100ae76c7c 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,10 @@
> +2019-03-29 DJ Delorie<dj@redhat.com>
> +
> + [BZ #24394]
> + * time/strptime_l.c (%Ey): Fix fencepost error.
> + * time/tst-strftime3.c: New.
> + * time/Makefile (tests): Add tst-strftime3.
OK.
> +
> 2019-02-26 Adhemerval Zanella<adhemerval.zanella@linaro.org>
>
> * math/math.h (fpclassify, isfinite, isnormal, isnan): Use builtin for
> diff --git a/time/Makefile b/time/Makefile
> index 5c6304ece1..2ca206309d 100644
> --- a/time/Makefile
> +++ b/time/Makefile
> @@ -43,7 +43,7 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
> tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \
> tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \
> tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \
> - tst-tzname tst-y2039 bug-mktime4 tst-strftime2
> + tst-tzname tst-y2039 bug-mktime4 tst-strftime2 tst-strftime3
OK.
>
> include ../Rules
>
> diff --git a/time/strptime_l.c b/time/strptime_l.c
> index e19b9a15dd..7436a168b7 100644
> --- a/time/strptime_l.c
> +++ b/time/strptime_l.c
> @@ -907,10 +907,15 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
> {
> int delta = ((tm->tm_year - era->offset)
> * era->absolute_direction);
> + /* The difference between two sets of years
> + does not include the final year itself,
> + therefore add 1 to the difference to
> + account for that final year. */
OK.
> match = (delta >= 0
> && delta < (((int64_t) era->stop_date[0]
> - (int64_t) era->start_date[0])
> - * era->absolute_direction));
> + * era->absolute_direction
> + + 1));
OK.
> }
> if (! match)
> return NULL;
> @@ -928,10 +933,12 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
> {
> int delta = ((tm->tm_year - era->offset)
> * era->absolute_direction);
> + /* See comment above about year difference + 1. */
OK.
> if (delta >= 0
> && delta < (((int64_t) era->stop_date[0]
> - (int64_t) era->start_date[0])
> - * era->absolute_direction))
> + * era->absolute_direction
> + + 1))
OK.
> {
> s.decided = loc;
> break;
> diff --git a/time/tst-strftime3.c b/time/tst-strftime3.c
> new file mode 100644
> index 0000000000..0b39d46375
> --- /dev/null
> +++ b/time/tst-strftime3.c
> @@ -0,0 +1,453 @@
> +/* Data-driven tests for strftime/strptime.
OK.
> + Copyright (C) 2019 Free Software Foundation, Inc. This file is
> + part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> +<http://www.gnu.org/licenses/>. */
Add back spaces before URL.
> +
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <string.h>
> +#include <time.h>
> +#include <locale.h>
> +#include <wchar.h>
> +
> +#include <support/check.h>
> +#include <array_length.h>
> +
> +/* These exist for the convenience of writing the test data, because
> + zero-based vs one-based. */
> +typedef enum {
> + Sun, Mon, Tue, Wed, Thu, Fri, Sat
> +} WeekDay;
> +
> +typedef enum {
> + Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec
> +} Month;
Per GNU coding standard brace on next line please (both enums).
> +
> +typedef struct Data {
Per GNU coding standard brace on next line please.
> + /* A descriptive name of the test. */
> + const char *name;
> +
> + /* The specific date and time to be tested. */
> + int y, m, d;
> + WeekDay w;
> + int hh, mm, ss;
> +
> + /* The locale under which the conversion is done. */
> + const char *locale;
> +
> + /* Format passed to strftime. */
> + const char *format;
> +
> + /* Expected data, NUL terminated. */
> + const char *printed;
> +
> +} Data;
Per GNU coding guidelines don't declare typedef and struct in the same line, please split these out.
> +
> +/* Notes:
> +
> + Years are full 4-digit years, the code compensates. Likewise,
> + use month and weekday enums (above) which are zero-based.
> +
> + The encoded strings are multibyte strings in the C locale which
> + reflect the same binary data as the expected strings. When you run
> + the test, the strings are printed as-is to stdout, so if your
> + terminal is set for the correct encoding, they'll be printed
> + "correctly". Put the Unicode codes and UTF-8 samples in the
> + comments.
> +
> + For convenience, mis-matched strings are printed in
> + paste-compatible format, raw text format, and Unicode format. Use
> + "" between a hex escape sequence (like \xe8) and a following hex
> + digit which should be considered as a printable character.
> +
> + To verify text, save the correct text in a file, and use "od -tx1
> + -tc file" to see the raw hex values. */
> +
> +const Data data[] = {
> +
> + { "Baseline test",
> + 2019, Mar, 27, Wed, 14, 3, 22, "en_US.ISO-8859-1", "%Y-%m-%d %T",
> + "2019-03-27 14:03:22" },
> +
> +
> + { "Japanese era change, BCE/CE, before transition",
> + 0, Dec, 31, Sun, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U7D00><U5143><U524D>01<U5E74> 紀元前01年 */
> + "\xe7\xb4\x80\xe5\x85\x83\xe5\x89\x8d""01\xe5\xb9\xb4" },
> + { "Japanese era change, BCE/CE, after transition",
> + 1, Jan, 1, Mon, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U897F><U66A6>01<U5E74> 西暦01年 */
> + "\xe8\xa5\xbf\xe6\x9a\xa6""01\xe5\xb9\xb4" },
> +
> + { "Japanese era change, BCE/CE, before transition",
> + 0, Dec, 31, Sun, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U7D00><U5143><U524D>01<U5E74> 紀元前01年 */
> + "\xb5\xaa\xb8\xb5\xc1\xb0""01\xc7\xaf" },
> + { "Japanese era change, BCE/CE, after transition",
> + 1, Jan, 1, Mon, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U897F><U66A6>01<U5E74> 西暦01年 */
> + "\xc0\xbe\xce\xf1""01\xc7\xaf" },
> +
> +
> + { "Japanese era change, 1873, before transition",
> + 1872, Dec, 31, Tue, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U897F><U66A6>1872<U5E74> 西暦1872年 */
> + "\xe8\xa5\xbf\xe6\x9a\xa6""1872\xe5\xb9\xb4" },
> + { "Japanese era change, 1873, after transition",
> + 1873, Jan, 1, Wed, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U660E><U6CBB>06<U5E74> 明治06年 */
> + "\xe6\x98\x8e\xe6\xb2\xbb""06\xe5\xb9\xb4" },
> +
> +
> + { "Japanese era change, 1873, before transition",
> + 1872, Dec, 31, Tue, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U897F><U66A6>1872<U5E74> 西暦1872年 */
> + "\xc0\xbe\xce\xf1""1872\xc7\xaf" },
> + { "Japanese era change, 1873, after transition",
> + 1873, Jan, 1, Wed, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U660E><U6CBB>06<U5E74> 明治06年 */
> + "\xcc\xc0\xbc\xa3""06\xc7\xaf" },
> +
> +
> + { "Japanese era change, 1912, before transition year",
> + 1911, Dec, 31, Sun, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U660E><U6CBB>44<U5E74> 明治44年 */
> + "\xe6\x98\x8e\xe6\xb2\xbb""44\xe5\xb9\xb4" },
> + { "Japanese era change, 1912, start of transition year",
> + 1912, Jan, 1, Mon, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U660E><U6CBB>45<U5E74> 明治45年 */
> + "\xe6\x98\x8e\xe6\xb2\xbb""45\xe5\xb9\xb4" },
> +
> + { "Japanese era change, 1912, before transition",
> + 1912, Jul, 29, Mon, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U660E><U6CBB>45<U5E74> 明治45年 */
> + "\xe6\x98\x8e\xe6\xb2\xbb""45\xe5\xb9\xb4" },
> + { "Japanese era change, 1912, after transition",
> + 1912, Jul, 30, Tue, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U5927><U6B63><U5143><U5E74> 大正元年 */
> + "\xe5\xa4\xa7\xe6\xad\xa3\xe5\x85\x83\xe5\xb9\xb4" },
> +
> + { "Japanese era change, 1912, before end of transition year",
> + 1912, Dec, 31, Tue, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U5927><U6B63><U5143><U5E74> 大正元年 */
> + "\xe5\xa4\xa7\xe6\xad\xa3\xe5\x85\x83\xe5\xb9\xb4" },
> + { "Japanese era change, 1912, after transition year",
> + 1913, Jan, 1, Wed, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U5927><U6B63>02<U5E74> 大正02年 */
> + "\xe5\xa4\xa7\xe6\xad\xa3""02\xe5\xb9\xb4" },
> +
> +
> + { "Japanese era change, 1912, before transition year",
> + 1911, Dec, 31, Sun, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U660E><U6CBB>44<U5E74> 明治44年 */
> + "\xcc\xc0\xbc\xa3""44\xc7\xaf" },
> + { "Japanese era change, 1912, start of transition year",
> + 1912, Jan, 1, Mon, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U660E><U6CBB>45<U5E74> 明治45年 */
> + "\xcc\xc0\xbc\xa3""45\xc7\xaf" },
> +
> + { "Japanese era change, 1912, before transition",
> + 1912, Jul, 29, Mon, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U660E><U6CBB>45<U5E74> 明治45年 */
> + "\xcc\xc0\xbc\xa3""45\xc7\xaf" },
> + { "Japanese era change, 1912, after transition",
> + 1912, Jul, 30, Tue, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U5927><U6B63><U5143><U5E74> 大正元年 */
> + "\xc2\xe7\xc0\xb5\xb8\xb5\xc7\xaf" },
> +
> + { "Japanese era change, 1912, before end of transition year",
> + 1912, Dec, 31, Tue, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U5927><U6B63><U5143><U5E74> 大正元年 */
> + "\xc2\xe7\xc0\xb5\xb8\xb5\xc7\xaf" },
> + { "Japanese era change, 1912, after transition year",
> + 1913, Jan, 1, Wed, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U5927><U6B63>02<U5E74> 大正02年 */
> + "\xc2\xe7\xc0\xb5""02\xc7\xaf" },
> +
> +
> + { "Japanese era change, 1926, before transition year",
> + 1925, Dec, 31, Thu, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U5927><U6B63>14<U5E74> 大正14年 */
> + "\xe5\xa4\xa7\xe6\xad\xa3""14\xe5\xb9\xb4" },
> + { "Japanese era change, 1926, start of transition year",
> + 1926, Jan, 1, Fri, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U5927><U6B63>15<U5E74> 大正15年 */
> + "\xe5\xa4\xa7\xe6\xad\xa3""15\xe5\xb9\xb4" },
> +
> + { "Japanese era change, 1926, before transition",
> + 1926, Dec, 24, Fri, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U5927><U6B63>15<U5E74> 大正15年 */
> + "\xe5\xa4\xa7\xe6\xad\xa3""15\xe5\xb9\xb4" },
> + { "Japanese era change, 1926, after transition",
> + 1926, Dec, 25, Sat, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U662D><U548C><U5143><U5E74> 昭和元年 */
> + "\xe6\x98\xad\xe5\x92\x8c\xe5\x85\x83\xe5\xb9\xb4" },
> +
> + { "Japanese era change, 1926, before end of transition year",
> + 1926, Dec, 31, Fri, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U662D><U548C><U5143><U5E74> 昭和元年 */
> + "\xe6\x98\xad\xe5\x92\x8c\xe5\x85\x83\xe5\xb9\xb4" },
> + { "Japanese era change, 1926, after transition year",
> + 1927, Jan, 1, Sat, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U662D><U548C>02<U5E74> 昭和02年 */
> + "\xe6\x98\xad\xe5\x92\x8c""02\xe5\xb9\xb4" },
> +
> +
> + { "Japanese era change, 1926, before transition year",
> + 1925, Dec, 31, Thu, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U5927><U6B63>14<U5E74> 大正14年 */
> + "\xc2\xe7\xc0\xb5""14\xc7\xaf" },
> + { "Japanese era change, 1926, start of transition year",
> + 1926, Jan, 1, Fri, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U5927><U6B63>15<U5E74> 大正15年 */
> + "\xc2\xe7\xc0\xb5""15\xc7\xaf" },
> +
> + { "Japanese era change, 1926, before transition",
> + 1926, Dec, 24, Fri, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U5927><U6B63>15<U5E74> 大正15年 */
> + "\xc2\xe7\xc0\xb5""15\xc7\xaf" },
> + { "Japanese era change, 1926, after transition",
> + 1926, Dec, 25, Sat, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U662D><U548C><U5143><U5E74> 昭和元年 */
> + "\xbe\xbc\xcf\xc2\xb8\xb5\xc7\xaf" },
> +
> + { "Japanese era change, 1926, before end of transition year",
> + 1926, Dec, 31, Fri, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U662D><U548C><U5143><U5E74> 昭和元年 */
> + "\xbe\xbc\xcf\xc2\xb8\xb5\xc7\xaf" },
> + { "Japanese era change, 1926, after transition year",
> + 1927, Jan, 1, Sat, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U662D><U548C>02<U5E74> 昭和02年 */
> + "\xbe\xbc\xcf\xc2""02\xc7\xaf" },
> +
> +
> + { "Japanese era change, 1989, before transition year",
> + 1988, Dec, 31, Sat, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U662D><U548C>63<U5E74> 昭和63年 */
> + "\xe6\x98\xad\xe5\x92\x8c""63\xe5\xb9\xb4" },
> + { "Japanese era change, 1989, start of transition year",
> + 1989, Jan, 1, Sun, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U662D><U548C>64<U5E74> 昭和64年 */
> + "\xe6\x98\xad\xe5\x92\x8c""64\xe5\xb9\xb4" },
> +
> + { "Japanese era change, 1989, before transition",
> + 1989, Jan, 7, Sat, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U662D><U548C>64<U5E74> 昭和64年 */
> + "\xe6\x98\xad\xe5\x92\x8c""64\xe5\xb9\xb4" },
> + { "Japanese era change, 1989, after transition",
> + 1989, Jan, 8, Sun, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U5E73><U6210><U5143><U5E74> 平成元年 */
> + "\xe5\xb9\xb3\xe6\x88\x90\xe5\x85\x83\xe5\xb9\xb4" },
> +
> + { "Japanese era change, 1989, end of transition year",
> + 1989, Dec, 31, Sun, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U5E73><U6210><U5143><U5E74> 平成元年 */
> + "\xe5\xb9\xb3\xe6\x88\x90\xe5\x85\x83\xe5\xb9\xb4" },
> + { "Japanese era change, 1989, after transition year",
> + 1990, Jan, 1, Mon, 12, 00, 00, "ja_JP.UTF-8", "%EY",
> + /* <U5E73><U6210>02<U5E74> 平成02年 */
> + "\xe5\xb9\xb3\xe6\x88\x90""02\xe5\xb9\xb4" },
> +
> +
> + { "Japanese era change, 1989, before transition year",
> + 1988, Dec, 31, Sat, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U662D><U548C>63<U5E74> 昭和63年 */
> + "\xbe\xbc\xcf\xc2""63\xc7\xaf" },
> + { "Japanese era change, 1989, start of transition year",
> + 1989, Jan, 1, Sun, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U662D><U548C>64<U5E74> 昭和64年 */
> + "\xbe\xbc\xcf\xc2""64\xc7\xaf" },
> +
> + { "Japanese era change, 1989, before transition",
> + 1989, Jan, 7, Sat, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U662D><U548C>64<U5E74> 昭和64年 */
> + "\xbe\xbc\xcf\xc2""64\xc7\xaf" },
> + { "Japanese era change, 1989, after transition",
> + 1989, Jan, 8, Sun, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U5E73><U6210><U5143><U5E74> 平成元年 */
> + "\xca\xbf\xc0\xae\xb8\xb5\xc7\xaf" },
> +
> + { "Japanese era change, 1989, end of transition year",
> + 1989, Dec, 31, Sun, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U5E73><U6210><U5143><U5E74> 平成元年 */
> + "\xca\xbf\xc0\xae\xb8\xb5\xc7\xaf" },
> + { "Japanese era change, 1989, after transition year",
> + 1990, Jan, 1, Mon, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
> + /* <U5E73><U6210>02<U5E74> 平成02年 */
> + "\xca\xbf\xc0\xae""02\xc7\xaf" },
> +};
> +
> +#define NDATA array_length(data)
> +
> +/* Size of buffer passed to strftime. */
> +#define STRBUFLEN 1000
> +/* Size of buffer passed to tm_to_printed. */
> +#define TMBUFLEN 50
> +
> +/* Helper function to compare strings and print out mismatches in a
> + format suitable for maintaining this test. TEST_COMPARE_STRINGS
> + prints out a less suitable format. */
> +
> +static void
> +print_string_hex (const char *header, const char *str)
> +{
> + int tictoc = 0;
> + const char *s = str;
> + wchar_t w[STRBUFLEN];
> + size_t i, wlen;
> +
> + printf ("%s : ", header);
> +
> + if (str == NULL)
> + {
> + printf ("<NULL>\n");
> + return;
> + }
> +
> + while (*s)
> + {
> + /* isgraph equivalent, but independent of current locale. */
> + if (' ' <= *s && *s <= '~')
> + putchar (*s);
> + else
> + {
> + if (tictoc)
> + printf ("\033[36m");
> + else
> + printf ("\033[31m");
> + tictoc = ! tictoc;
> +
> + printf ("\\x%02x\033[0m", (unsigned char) *s);
> + }
> +
> + ++ s;
> + }
> + printf (" - %s\n", str);
> +
> + s = str;
> + wlen = mbsrtowcs (w, &s, strlen (s), NULL);
> + printf ("%*s", (int) strlen (header) + 3, " ");
> + for (i = 0; i < wlen && i < strlen (str); i ++)
> + {
> + if (' ' <= w[i] && w[i] <= '~')
> + putchar (w[i]);
> + else
> + printf ("<U%04X>", w[i]);
> + }
> + printf ("\n");
> +}
> +
> +static void
> +compare_strings (const char *got, const char *expected,
> + const char *filename, int lineno)
> +{
> + if (got && expected && strcmp (got, expected) == 0)
> + return;
> + support_record_failure ();
> + printf ("%s:%d: error: strftime output incorrect\n", filename, lineno);
> + print_string_hex ("Got", got);
> + print_string_hex ("Exp", expected);
> +}
> +#define COMPARE_STRINGS(g,e) compare_strings (g, e, __FILE__, __LINE__)
> +
> +const char *weekday_name[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri",
> + "Sat" };
> +
> +/* Helper function to create a printable version of struct tm. */
> +static void
> +tm_to_printed (struct tm *tm, char *buffer)
> +{
> + const char *wn;
> + char temp[50];
> +
> + if (0 <= tm->tm_wday && tm->tm_wday <= 6)
> + wn = weekday_name[tm->tm_wday];
> + else
> + {
> + wn = temp;
> + sprintf (temp, "%d", tm->tm_wday);
> + }
> +
> + snprintf (buffer, TMBUFLEN, "%04d/%02d/%02d %02d:%02d:%02d %s",
> + tm->tm_year + 1900,
> + tm->tm_mon + 1,
> + tm->tm_mday,
> + tm->tm_hour,
> + tm->tm_min,
> + tm->tm_sec,
> + wn);
> +}
> +
> +static int
> +do_test (void)
> +{
> + int i;
> + char buffer[STRBUFLEN];
> + char expected_time[TMBUFLEN];
> + char got_time[TMBUFLEN];
> +
> + for (i = 0; i < NDATA; i ++)
> + {
> + const Data *d = &(data[i]);
> + struct tm tm;
> + struct tm tm2;
> + size_t rv;
> + char *rvp;
> +
> + /* Print this just to help debug failures. */
> + printf ("%s:\n\t%s %s %s\n", d->name, d->locale, d->format, d->printed);
> +
> + tm.tm_year = d->y - 1900;
> + tm.tm_mon = d->m;
> + tm.tm_mday = d->d;
> + tm.tm_wday = d->w;
> + tm.tm_hour = d->hh;
> + tm.tm_min = d->mm;
> + tm.tm_sec = d->ss;
> + tm.tm_isdst = -1;
> +
> + /* LC_ALL may interfere with the snprintf in tm_to_printed. */
> + if (setlocale (LC_TIME, d->locale) == NULL)
> + {
> + /* See the LOCALES list in the Makefile. */
> + printf ("locale %s does not exist!\n", d->locale);
> + exit (EXIT_FAILURE);
> + }
> + /* This is just for printing wide characters if there's an error. */
> + setlocale (LC_CTYPE, d->locale);
> +
> + rv = strftime (buffer, sizeof (buffer), d->format, &tm);
> +
> + TEST_COMPARE (rv, strlen (d->printed));
> + COMPARE_STRINGS (buffer, d->printed);
> +
> + /* Copy the original time, so that any fields not affected by
> + the call to strptime will match. */
> + tm2 = tm;
> +
> + rvp = strptime (d->printed, d->format, &tm2);
> +
> + TEST_COMPARE_STRING (rvp, "");
> +
> + tm_to_printed (&tm, expected_time);
> + tm_to_printed (&tm2, got_time);
> + TEST_COMPARE_STRING (got_time, expected_time);
> + }
> +
> + return 0;
> +}
> +
> +#include <support/test-driver.c>
OK.
@@ -1,3 +1,10 @@
+2019-03-29 DJ Delorie <dj@redhat.com>
+
+ [BZ #24394]
+ * time/strptime_l.c (%Ey): Fix fencepost error.
+ * time/tst-strftime3.c: New.
+ * time/Makefile (tests): Add tst-strftime3.
+
2019-02-26 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* math/math.h (fpclassify, isfinite, isnormal, isnan): Use builtin for
@@ -43,7 +43,7 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \
tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \
tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \
- tst-tzname tst-y2039 bug-mktime4 tst-strftime2
+ tst-tzname tst-y2039 bug-mktime4 tst-strftime2 tst-strftime3
include ../Rules
@@ -907,10 +907,15 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
{
int delta = ((tm->tm_year - era->offset)
* era->absolute_direction);
+ /* The difference between two sets of years
+ does not include the final year itself,
+ therefore add 1 to the difference to
+ account for that final year. */
match = (delta >= 0
&& delta < (((int64_t) era->stop_date[0]
- (int64_t) era->start_date[0])
- * era->absolute_direction));
+ * era->absolute_direction
+ + 1));
}
if (! match)
return NULL;
@@ -928,10 +933,12 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
{
int delta = ((tm->tm_year - era->offset)
* era->absolute_direction);
+ /* See comment above about year difference + 1. */
if (delta >= 0
&& delta < (((int64_t) era->stop_date[0]
- (int64_t) era->start_date[0])
- * era->absolute_direction))
+ * era->absolute_direction
+ + 1))
{
s.decided = loc;
break;
new file mode 100644
@@ -0,0 +1,453 @@
+/* Data-driven tests for strftime/strptime.
+ Copyright (C) 2019 Free Software Foundation, Inc. This file is
+ part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <locale.h>
+#include <wchar.h>
+
+#include <support/check.h>
+#include <array_length.h>
+
+/* These exist for the convenience of writing the test data, because
+ zero-based vs one-based. */
+typedef enum {
+ Sun, Mon, Tue, Wed, Thu, Fri, Sat
+} WeekDay;
+
+typedef enum {
+ Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec
+} Month;
+
+typedef struct Data {
+ /* A descriptive name of the test. */
+ const char *name;
+
+ /* The specific date and time to be tested. */
+ int y, m, d;
+ WeekDay w;
+ int hh, mm, ss;
+
+ /* The locale under which the conversion is done. */
+ const char *locale;
+
+ /* Format passed to strftime. */
+ const char *format;
+
+ /* Expected data, NUL terminated. */
+ const char *printed;
+
+} Data;
+
+/* Notes:
+
+ Years are full 4-digit years, the code compensates. Likewise,
+ use month and weekday enums (above) which are zero-based.
+
+ The encoded strings are multibyte strings in the C locale which
+ reflect the same binary data as the expected strings. When you run
+ the test, the strings are printed as-is to stdout, so if your
+ terminal is set for the correct encoding, they'll be printed
+ "correctly". Put the Unicode codes and UTF-8 samples in the
+ comments.
+
+ For convenience, mis-matched strings are printed in
+ paste-compatible format, raw text format, and Unicode format. Use
+ "" between a hex escape sequence (like \xe8) and a following hex
+ digit which should be considered as a printable character.
+
+ To verify text, save the correct text in a file, and use "od -tx1
+ -tc file" to see the raw hex values. */
+
+const Data data[] = {
+
+ { "Baseline test",
+ 2019, Mar, 27, Wed, 14, 3, 22, "en_US.ISO-8859-1", "%Y-%m-%d %T",
+ "2019-03-27 14:03:22" },
+
+
+ { "Japanese era change, BCE/CE, before transition",
+ 0, Dec, 31, Sun, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U7D00><U5143><U524D>01<U5E74> 紀元å‰01å¹´ */
+ "\xe7\xb4\x80\xe5\x85\x83\xe5\x89\x8d""01\xe5\xb9\xb4" },
+ { "Japanese era change, BCE/CE, after transition",
+ 1, Jan, 1, Mon, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U897F><U66A6>01<U5E74> 西暦01年 */
+ "\xe8\xa5\xbf\xe6\x9a\xa6""01\xe5\xb9\xb4" },
+
+ { "Japanese era change, BCE/CE, before transition",
+ 0, Dec, 31, Sun, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U7D00><U5143><U524D>01<U5E74> 紀元å‰01å¹´ */
+ "\xb5\xaa\xb8\xb5\xc1\xb0""01\xc7\xaf" },
+ { "Japanese era change, BCE/CE, after transition",
+ 1, Jan, 1, Mon, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U897F><U66A6>01<U5E74> 西暦01年 */
+ "\xc0\xbe\xce\xf1""01\xc7\xaf" },
+
+
+ { "Japanese era change, 1873, before transition",
+ 1872, Dec, 31, Tue, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U897F><U66A6>1872<U5E74> 西暦1872年 */
+ "\xe8\xa5\xbf\xe6\x9a\xa6""1872\xe5\xb9\xb4" },
+ { "Japanese era change, 1873, after transition",
+ 1873, Jan, 1, Wed, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U660E><U6CBB>06<U5E74> 明治06年 */
+ "\xe6\x98\x8e\xe6\xb2\xbb""06\xe5\xb9\xb4" },
+
+
+ { "Japanese era change, 1873, before transition",
+ 1872, Dec, 31, Tue, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U897F><U66A6>1872<U5E74> 西暦1872年 */
+ "\xc0\xbe\xce\xf1""1872\xc7\xaf" },
+ { "Japanese era change, 1873, after transition",
+ 1873, Jan, 1, Wed, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U660E><U6CBB>06<U5E74> 明治06年 */
+ "\xcc\xc0\xbc\xa3""06\xc7\xaf" },
+
+
+ { "Japanese era change, 1912, before transition year",
+ 1911, Dec, 31, Sun, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U660E><U6CBB>44<U5E74> 明治44年 */
+ "\xe6\x98\x8e\xe6\xb2\xbb""44\xe5\xb9\xb4" },
+ { "Japanese era change, 1912, start of transition year",
+ 1912, Jan, 1, Mon, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U660E><U6CBB>45<U5E74> 明治45年 */
+ "\xe6\x98\x8e\xe6\xb2\xbb""45\xe5\xb9\xb4" },
+
+ { "Japanese era change, 1912, before transition",
+ 1912, Jul, 29, Mon, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U660E><U6CBB>45<U5E74> 明治45年 */
+ "\xe6\x98\x8e\xe6\xb2\xbb""45\xe5\xb9\xb4" },
+ { "Japanese era change, 1912, after transition",
+ 1912, Jul, 30, Tue, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U5927><U6B63><U5143><U5E74> 大æ£å…ƒå¹´ */
+ "\xe5\xa4\xa7\xe6\xad\xa3\xe5\x85\x83\xe5\xb9\xb4" },
+
+ { "Japanese era change, 1912, before end of transition year",
+ 1912, Dec, 31, Tue, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U5927><U6B63><U5143><U5E74> 大æ£å…ƒå¹´ */
+ "\xe5\xa4\xa7\xe6\xad\xa3\xe5\x85\x83\xe5\xb9\xb4" },
+ { "Japanese era change, 1912, after transition year",
+ 1913, Jan, 1, Wed, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U5927><U6B63>02<U5E74> 大æ£02å¹´ */
+ "\xe5\xa4\xa7\xe6\xad\xa3""02\xe5\xb9\xb4" },
+
+
+ { "Japanese era change, 1912, before transition year",
+ 1911, Dec, 31, Sun, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U660E><U6CBB>44<U5E74> 明治44年 */
+ "\xcc\xc0\xbc\xa3""44\xc7\xaf" },
+ { "Japanese era change, 1912, start of transition year",
+ 1912, Jan, 1, Mon, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U660E><U6CBB>45<U5E74> 明治45年 */
+ "\xcc\xc0\xbc\xa3""45\xc7\xaf" },
+
+ { "Japanese era change, 1912, before transition",
+ 1912, Jul, 29, Mon, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U660E><U6CBB>45<U5E74> 明治45年 */
+ "\xcc\xc0\xbc\xa3""45\xc7\xaf" },
+ { "Japanese era change, 1912, after transition",
+ 1912, Jul, 30, Tue, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U5927><U6B63><U5143><U5E74> 大æ£å…ƒå¹´ */
+ "\xc2\xe7\xc0\xb5\xb8\xb5\xc7\xaf" },
+
+ { "Japanese era change, 1912, before end of transition year",
+ 1912, Dec, 31, Tue, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U5927><U6B63><U5143><U5E74> 大æ£å…ƒå¹´ */
+ "\xc2\xe7\xc0\xb5\xb8\xb5\xc7\xaf" },
+ { "Japanese era change, 1912, after transition year",
+ 1913, Jan, 1, Wed, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U5927><U6B63>02<U5E74> 大æ£02å¹´ */
+ "\xc2\xe7\xc0\xb5""02\xc7\xaf" },
+
+
+ { "Japanese era change, 1926, before transition year",
+ 1925, Dec, 31, Thu, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U5927><U6B63>14<U5E74> 大æ£14å¹´ */
+ "\xe5\xa4\xa7\xe6\xad\xa3""14\xe5\xb9\xb4" },
+ { "Japanese era change, 1926, start of transition year",
+ 1926, Jan, 1, Fri, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U5927><U6B63>15<U5E74> 大æ£15å¹´ */
+ "\xe5\xa4\xa7\xe6\xad\xa3""15\xe5\xb9\xb4" },
+
+ { "Japanese era change, 1926, before transition",
+ 1926, Dec, 24, Fri, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U5927><U6B63>15<U5E74> 大æ£15å¹´ */
+ "\xe5\xa4\xa7\xe6\xad\xa3""15\xe5\xb9\xb4" },
+ { "Japanese era change, 1926, after transition",
+ 1926, Dec, 25, Sat, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U662D><U548C><U5143><U5E74> æ˜å’Œå…ƒå¹´ */
+ "\xe6\x98\xad\xe5\x92\x8c\xe5\x85\x83\xe5\xb9\xb4" },
+
+ { "Japanese era change, 1926, before end of transition year",
+ 1926, Dec, 31, Fri, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U662D><U548C><U5143><U5E74> æ˜å’Œå…ƒå¹´ */
+ "\xe6\x98\xad\xe5\x92\x8c\xe5\x85\x83\xe5\xb9\xb4" },
+ { "Japanese era change, 1926, after transition year",
+ 1927, Jan, 1, Sat, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U662D><U548C>02<U5E74> æ˜å’Œ02å¹´ */
+ "\xe6\x98\xad\xe5\x92\x8c""02\xe5\xb9\xb4" },
+
+
+ { "Japanese era change, 1926, before transition year",
+ 1925, Dec, 31, Thu, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U5927><U6B63>14<U5E74> 大æ£14å¹´ */
+ "\xc2\xe7\xc0\xb5""14\xc7\xaf" },
+ { "Japanese era change, 1926, start of transition year",
+ 1926, Jan, 1, Fri, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U5927><U6B63>15<U5E74> 大æ£15å¹´ */
+ "\xc2\xe7\xc0\xb5""15\xc7\xaf" },
+
+ { "Japanese era change, 1926, before transition",
+ 1926, Dec, 24, Fri, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U5927><U6B63>15<U5E74> 大æ£15å¹´ */
+ "\xc2\xe7\xc0\xb5""15\xc7\xaf" },
+ { "Japanese era change, 1926, after transition",
+ 1926, Dec, 25, Sat, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U662D><U548C><U5143><U5E74> æ˜å’Œå…ƒå¹´ */
+ "\xbe\xbc\xcf\xc2\xb8\xb5\xc7\xaf" },
+
+ { "Japanese era change, 1926, before end of transition year",
+ 1926, Dec, 31, Fri, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U662D><U548C><U5143><U5E74> æ˜å’Œå…ƒå¹´ */
+ "\xbe\xbc\xcf\xc2\xb8\xb5\xc7\xaf" },
+ { "Japanese era change, 1926, after transition year",
+ 1927, Jan, 1, Sat, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U662D><U548C>02<U5E74> æ˜å’Œ02å¹´ */
+ "\xbe\xbc\xcf\xc2""02\xc7\xaf" },
+
+
+ { "Japanese era change, 1989, before transition year",
+ 1988, Dec, 31, Sat, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U662D><U548C>63<U5E74> æ˜å’Œ63å¹´ */
+ "\xe6\x98\xad\xe5\x92\x8c""63\xe5\xb9\xb4" },
+ { "Japanese era change, 1989, start of transition year",
+ 1989, Jan, 1, Sun, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U662D><U548C>64<U5E74> æ˜å’Œ64å¹´ */
+ "\xe6\x98\xad\xe5\x92\x8c""64\xe5\xb9\xb4" },
+
+ { "Japanese era change, 1989, before transition",
+ 1989, Jan, 7, Sat, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U662D><U548C>64<U5E74> æ˜å’Œ64å¹´ */
+ "\xe6\x98\xad\xe5\x92\x8c""64\xe5\xb9\xb4" },
+ { "Japanese era change, 1989, after transition",
+ 1989, Jan, 8, Sun, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U5E73><U6210><U5143><U5E74> å¹³æˆå…ƒå¹´ */
+ "\xe5\xb9\xb3\xe6\x88\x90\xe5\x85\x83\xe5\xb9\xb4" },
+
+ { "Japanese era change, 1989, end of transition year",
+ 1989, Dec, 31, Sun, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U5E73><U6210><U5143><U5E74> å¹³æˆå…ƒå¹´ */
+ "\xe5\xb9\xb3\xe6\x88\x90\xe5\x85\x83\xe5\xb9\xb4" },
+ { "Japanese era change, 1989, after transition year",
+ 1990, Jan, 1, Mon, 12, 00, 00, "ja_JP.UTF-8", "%EY",
+ /* <U5E73><U6210>02<U5E74> å¹³æˆ02å¹´ */
+ "\xe5\xb9\xb3\xe6\x88\x90""02\xe5\xb9\xb4" },
+
+
+ { "Japanese era change, 1989, before transition year",
+ 1988, Dec, 31, Sat, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U662D><U548C>63<U5E74> æ˜å’Œ63å¹´ */
+ "\xbe\xbc\xcf\xc2""63\xc7\xaf" },
+ { "Japanese era change, 1989, start of transition year",
+ 1989, Jan, 1, Sun, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U662D><U548C>64<U5E74> æ˜å’Œ64å¹´ */
+ "\xbe\xbc\xcf\xc2""64\xc7\xaf" },
+
+ { "Japanese era change, 1989, before transition",
+ 1989, Jan, 7, Sat, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U662D><U548C>64<U5E74> æ˜å’Œ64å¹´ */
+ "\xbe\xbc\xcf\xc2""64\xc7\xaf" },
+ { "Japanese era change, 1989, after transition",
+ 1989, Jan, 8, Sun, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U5E73><U6210><U5143><U5E74> å¹³æˆå…ƒå¹´ */
+ "\xca\xbf\xc0\xae\xb8\xb5\xc7\xaf" },
+
+ { "Japanese era change, 1989, end of transition year",
+ 1989, Dec, 31, Sun, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U5E73><U6210><U5143><U5E74> å¹³æˆå…ƒå¹´ */
+ "\xca\xbf\xc0\xae\xb8\xb5\xc7\xaf" },
+ { "Japanese era change, 1989, after transition year",
+ 1990, Jan, 1, Mon, 12, 00, 00, "ja_JP.EUC-JP", "%EY",
+ /* <U5E73><U6210>02<U5E74> å¹³æˆ02å¹´ */
+ "\xca\xbf\xc0\xae""02\xc7\xaf" },
+};
+
+#define NDATA array_length(data)
+
+/* Size of buffer passed to strftime. */
+#define STRBUFLEN 1000
+/* Size of buffer passed to tm_to_printed. */
+#define TMBUFLEN 50
+
+/* Helper function to compare strings and print out mismatches in a
+ format suitable for maintaining this test. TEST_COMPARE_STRINGS
+ prints out a less suitable format. */
+
+static void
+print_string_hex (const char *header, const char *str)
+{
+ int tictoc = 0;
+ const char *s = str;
+ wchar_t w[STRBUFLEN];
+ size_t i, wlen;
+
+ printf ("%s : ", header);
+
+ if (str == NULL)
+ {
+ printf ("<NULL>\n");
+ return;
+ }
+
+ while (*s)
+ {
+ /* isgraph equivalent, but independent of current locale. */
+ if (' ' <= *s && *s <= '~')
+ putchar (*s);
+ else
+ {
+ if (tictoc)
+ printf ("\033[36m");
+ else
+ printf ("\033[31m");
+ tictoc = ! tictoc;
+
+ printf ("\\x%02x\033[0m", (unsigned char) *s);
+ }
+
+ ++ s;
+ }
+ printf (" - %s\n", str);
+
+ s = str;
+ wlen = mbsrtowcs (w, &s, strlen (s), NULL);
+ printf ("%*s", (int) strlen (header) + 3, " ");
+ for (i = 0; i < wlen && i < strlen (str); i ++)
+ {
+ if (' ' <= w[i] && w[i] <= '~')
+ putchar (w[i]);
+ else
+ printf ("<U%04X>", w[i]);
+ }
+ printf ("\n");
+}
+
+static void
+compare_strings (const char *got, const char *expected,
+ const char *filename, int lineno)
+{
+ if (got && expected && strcmp (got, expected) == 0)
+ return;
+ support_record_failure ();
+ printf ("%s:%d: error: strftime output incorrect\n", filename, lineno);
+ print_string_hex ("Got", got);
+ print_string_hex ("Exp", expected);
+}
+#define COMPARE_STRINGS(g,e) compare_strings (g, e, __FILE__, __LINE__)
+
+const char *weekday_name[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri",
+ "Sat" };
+
+/* Helper function to create a printable version of struct tm. */
+static void
+tm_to_printed (struct tm *tm, char *buffer)
+{
+ const char *wn;
+ char temp[50];
+
+ if (0 <= tm->tm_wday && tm->tm_wday <= 6)
+ wn = weekday_name[tm->tm_wday];
+ else
+ {
+ wn = temp;
+ sprintf (temp, "%d", tm->tm_wday);
+ }
+
+ snprintf (buffer, TMBUFLEN, "%04d/%02d/%02d %02d:%02d:%02d %s",
+ tm->tm_year + 1900,
+ tm->tm_mon + 1,
+ tm->tm_mday,
+ tm->tm_hour,
+ tm->tm_min,
+ tm->tm_sec,
+ wn);
+}
+
+static int
+do_test (void)
+{
+ int i;
+ char buffer[STRBUFLEN];
+ char expected_time[TMBUFLEN];
+ char got_time[TMBUFLEN];
+
+ for (i = 0; i < NDATA; i ++)
+ {
+ const Data *d = &(data[i]);
+ struct tm tm;
+ struct tm tm2;
+ size_t rv;
+ char *rvp;
+
+ /* Print this just to help debug failures. */
+ printf ("%s:\n\t%s %s %s\n", d->name, d->locale, d->format, d->printed);
+
+ tm.tm_year = d->y - 1900;
+ tm.tm_mon = d->m;
+ tm.tm_mday = d->d;
+ tm.tm_wday = d->w;
+ tm.tm_hour = d->hh;
+ tm.tm_min = d->mm;
+ tm.tm_sec = d->ss;
+ tm.tm_isdst = -1;
+
+ /* LC_ALL may interfere with the snprintf in tm_to_printed. */
+ if (setlocale (LC_TIME, d->locale) == NULL)
+ {
+ /* See the LOCALES list in the Makefile. */
+ printf ("locale %s does not exist!\n", d->locale);
+ exit (EXIT_FAILURE);
+ }
+ /* This is just for printing wide characters if there's an error. */
+ setlocale (LC_CTYPE, d->locale);
+
+ rv = strftime (buffer, sizeof (buffer), d->format, &tm);
+
+ TEST_COMPARE (rv, strlen (d->printed));
+ COMPARE_STRINGS (buffer, d->printed);
+
+ /* Copy the original time, so that any fields not affected by
+ the call to strptime will match. */
+ tm2 = tm;
+
+ rvp = strptime (d->printed, d->format, &tm2);
+
+ TEST_COMPARE_STRING (rvp, "");
+
+ tm_to_printed (&tm, expected_time);
+ tm_to_printed (&tm2, got_time);
+ TEST_COMPARE_STRING (got_time, expected_time);
+ }
+
+ return 0;
+}
+
+#include <support/test-driver.c>