diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | time/Makefile | 2 | ||||
| -rw-r--r-- | time/strptime.c | 12 | ||||
| -rw-r--r-- | time/tst-strptime.c | 71 |
4 files changed, 85 insertions, 6 deletions
@@ -1,5 +1,11 @@ 1998-12-14 Ulrich Drepper <drepper@cygnus.com> + * time/Makefile (tests): Add tst-strptime. + * time/tst-strptime.c: New file. + * time/strptime.c: Correct bugs in weekday and yearday computation. + +1998-12-14 Ulrich Drepper <drepper@cygnus.com> + * time/strptime.c (strptime_internal): Set tm_wday and tm_yday in any of tm_year, tm_mon, or tm_mday was changed and the value itself wasn't specified. diff --git a/time/Makefile b/time/Makefile index 80aff61..7e45eaa 100644 --- a/time/Makefile +++ b/time/Makefile @@ -30,7 +30,7 @@ routines := offtime asctime clock ctime ctime_r difftime \ stime dysize timegm ftime \ strptime getdate strfxtime -tests := test_time clocktest tst-posixtz +tests := test_time clocktest tst-posixtz tst-strptime include ../Rules diff --git a/time/strptime.c b/time/strptime.c index d85dbfa..315af83 100644 --- a/time/strptime.c +++ b/time/strptime.c @@ -206,21 +206,23 @@ day_of_the_week (struct tm *tm) /* We know that January 1st 1970 was a Thursday (= 4). Compute the the difference between this data in the one on TM and so determine the weekday. */ - int corr_year = tm->tm_mon >= 2 ? tm->tm_year : tm->tm_year - 1; + int corr_year = 1900 + tm->tm_year - (tm->tm_mon < 2); int wday = (-473 - + (365 * (tm->tm_year - 1970)) + + (365 * (tm->tm_year - 70)) + (corr_year / 4) - ((corr_year / 4) / 25) + ((corr_year / 4) % 25 < 0) + (((corr_year / 4) / 25) / 4) + __mon_yday[0][tm->tm_mon] - + tm->tm_mday); - tm->tm_wday = wday; + + tm->tm_mday - 1); + tm->tm_wday = wday % 7; } +/* Compute the day of the year. */ static void day_of_the_year (struct tm *tm) { - tm->tm_yday = __mon_yday[__isleap (tm->tm_year)][tm->tm_mon] + tm->tm_mday; + tm->tm_yday = (__mon_yday[__isleap (1900 + tm->tm_year)][tm->tm_mon] + + (tm->tm_mday - 1)); } static char * diff --git a/time/tst-strptime.c b/time/tst-strptime.c new file mode 100644 index 0000000..52a7054 --- /dev/null +++ b/time/tst-strptime.c @@ -0,0 +1,71 @@ +/* Test for strptime. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <stdio.h> +#include <string.h> +#include <time.h> + + +static const struct +{ + const char *input; + const char *format; + int wday; + int yday; +} day_tests[] = +{ + { "2000-01-01", "%Y-%m-%d", 6, 0 }, + { "03/03/00", "%D", 5, 62 }, + { "9/9/99", "%x", 4, 251 }, +}; + + +int +main (int argc, char *argv[]) +{ + struct tm tm; + int i; + int result = 0; + + for (i = 0; i < sizeof (day_tests) / sizeof (day_tests[0]); ++i) + { + memset (&tm, '\0', sizeof (tm)); + + if (*strptime (day_tests[i].input, day_tests[i].format, &tm) != '\0') + { + printf ("not all of `%s' read\n", day_tests[i].input); + result = 1; + } + if (tm.tm_wday != day_tests[i].wday) + { + printf ("weekday for `%s' incorrect: %d instead of %d\n", + day_tests[i].input, tm.tm_wday, day_tests[i].wday); + result = 1; + } + if (tm.tm_yday != day_tests[i].yday) + { + printf ("yearday for `%s' incorrect: %d instead of %d\n", + day_tests[i].input, tm.tm_yday, day_tests[i].yday); + result = 1; + } + } + + return result; +} |