diff options
| author | Roland McGrath <roland@gnu.org> | 2005-02-16 10:23:18 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-02-16 10:23:18 +0000 |
| commit | a480577ab26dc7af24a5bd8e7fb40ed213bc8b44 (patch) | |
| tree | 2646eb5547b38b3cee9a1cac3d68711ba1768933 | |
| parent | 10e8cc12fad568d6cdce62df59657ebd4139df50 (diff) | |
| download | glibc-a480577ab26dc7af24a5bd8e7fb40ed213bc8b44.tar.gz glibc-a480577ab26dc7af24a5bd8e7fb40ed213bc8b44.tar.xz glibc-a480577ab26dc7af24a5bd8e7fb40ed213bc8b44.zip | |
2005-01-10 Jakub Jelinek <jakub@redhat.com>
[BZ #732] * time/tst-strptime.c (day_tests): Add 2 new tests. (test_tm, main): Issue an error instead of segfaulting if strptime returns NULL.
| -rw-r--r-- | time/tst-strptime.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/time/tst-strptime.c b/time/tst-strptime.c index a0b2ebedd2..6356aa0d41 100644 --- a/time/tst-strptime.c +++ b/time/tst-strptime.c @@ -42,6 +42,10 @@ static const struct { "C", "19990502123412", "%Y%m%d%H%M%S", 0, 121, 4, 2 }, { "C", "2001 20 Mon", "%Y %U %a", 1, 140, 4, 21 }, { "C", "2001 21 Mon", "%Y %W %a", 1, 140, 4, 21 }, + { "ja_JP.EUC-JP", "2000-01-01 08:12:21 AM", "%Y-%m-%d %I:%M:%S %p", + 6, 0, 0, 1 }, + { "en_US.ISO-8859-1", "2000-01-01 08:12:21 PM", "%Y-%m-%d %I:%M:%S %p", + 6, 0, 0, 1 }, { "ja_JP.EUC-JP", "2001 20 \xb7\xee", "%Y %U %a", 1, 140, 4, 21 }, { "ja_JP.EUC-JP", "2001 21 \xb7\xee", "%Y %W %a", 1, 140, 4, 21 }, }; @@ -73,7 +77,14 @@ test_tm (void) { memset (&tm, '\0', sizeof (tm)); - if (*strptime (tm_tests[i].input, tm_tests[i].format, &tm) != '\0') + char *ret = strptime (tm_tests[i].input, tm_tests[i].format, &tm); + if (ret == NULL) + { + printf ("strptime returned NULL for `%s'\n", tm_tests[i].input); + result = 1; + continue; + } + else if (*ret != '\0') { printf ("not all of `%s' read\n", tm_tests[i].input); result = 1; @@ -127,7 +138,14 @@ main (int argc, char *argv[]) exit (EXIT_FAILURE); } - if (*strptime (day_tests[i].input, day_tests[i].format, &tm) != '\0') + char *ret = strptime (day_tests[i].input, day_tests[i].format, &tm); + if (ret == NULL) + { + printf ("strptime returned NULL for `%s'\n", day_tests[i].input); + result = 1; + continue; + } + else if (*ret != '\0') { printf ("not all of `%s' read\n", day_tests[i].input); result = 1; |