X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fposixtm.c;h=b94c3410d263606755aa115ba9f2be7b1cf9df84;hb=26c5fd742f9136e2ddbd4695a9172c3fa30ea260;hp=fff53f50b95bac8df3f651e2539f2f761f0e4589;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git diff --git a/lib/posixtm.c b/lib/posixtm.c index fff53f50b..b94c3410d 100644 --- a/lib/posixtm.c +++ b/lib/posixtm.c @@ -1,7 +1,7 @@ /* Parse dates for touch and date. Copyright (C) 1989, 1990, 1991, 1998, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 Free Software Foundation Inc. + 2005, 2006, 2007, 2009 Free Software Foundation Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,8 +41,6 @@ of `digit' even when the host does not conform to POSIX. */ #define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9) -time_t mktime (); - /* POSIX requires: @@ -186,15 +184,7 @@ posix_time_parse (struct tm *tm, const char *s, unsigned int syntax_bits) bool posixtime (time_t *p, const char *s, unsigned int syntax_bits) { - struct tm tm0 -#ifdef lint - /* Placate gcc-4's -Wuninitialized. - posix_time_parse fails to set all of tm0 only when it returns - nonzero (due to year() returning nonzero), and in that case, - this code doesn't use the tm0 at all. */ - = { 0, } -#endif - ; + struct tm tm0; struct tm tm1; struct tm const *tm; time_t t; @@ -217,111 +207,30 @@ posixtime (time_t *p, const char *s, unsigned int syntax_bits) return false; } - /* Reject dates like "September 31" and times like "25:61". */ + /* Reject dates like "September 31" and times like "25:61". + Do not reject times that specify "60" as the number of seconds. */ if ((tm0.tm_year ^ tm->tm_year) | (tm0.tm_mon ^ tm->tm_mon) | (tm0.tm_mday ^ tm->tm_mday) | (tm0.tm_hour ^ tm->tm_hour) | (tm0.tm_min ^ tm->tm_min) | (tm0.tm_sec ^ tm->tm_sec)) - return false; - - *p = t; - return true; -} - -#ifdef TEST_POSIXTIME -/* - Test mainly with syntax_bits == 13 - (aka: (PDS_LEADING_YEAR | PDS_CENTURY | PDS_SECONDS)) - - This test data assumes Universal Time, e.g., TZ="UTC0". - - This test data also assumes that time_t is signed and is at least - 39 bits wide, so that it can represent all years from 0000 through - 9999. A host with 32-bit signed time_t can represent only time - stamps in the range 1901-12-13 20:45:52 through 2038-01-18 - 03:14:07 UTC, assuming POSIX time_t with no leap seconds, so test - cases outside this range will not work on such a host. - - Also, the first two lines of test data assume that the current - year is 2002. - -BEGIN-DATA -12131415.16 13 1039788916 Fri Dec 13 14:15:16 2002 -12131415.16 13 1039788916 Fri Dec 13 14:15:16 2002 -000001010000.00 13 -62167132800 Sun Jan 1 00:00:00 0000 -190112132045.52 13 -2147483648 Fri Dec 13 20:45:52 1901 -190112132045.53 13 -2147483647 Fri Dec 13 20:45:53 1901 -190112132046.52 13 -2147483588 Fri Dec 13 20:46:52 1901 -190112132145.52 13 -2147480048 Fri Dec 13 21:45:52 1901 -190112142045.52 13 -2147397248 Sat Dec 14 20:45:52 1901 -190201132045.52 13 -2144805248 Mon Jan 13 20:45:52 1902 -196912312359.59 13 -1 Wed Dec 31 23:59:59 1969 -197001010000.00 13 0 Thu Jan 1 00:00:00 1970 -197001010000.01 13 1 Thu Jan 1 00:00:01 1970 -197001010001.00 13 60 Thu Jan 1 00:01:00 1970 -197001010100.00 13 3600 Thu Jan 1 01:00:00 1970 -197001020000.00 13 86400 Fri Jan 2 00:00:00 1970 -197002010000.00 13 2678400 Sun Feb 1 00:00:00 1970 -197101010000.00 13 31536000 Fri Jan 1 00:00:00 1971 -197001000000.00 13 * * -197000010000.00 13 * * -197001010000.60 13 * * -197001010060.00 13 * * -197001012400.00 13 * * -197001320000.00 13 * * -197013010000.00 13 * * -203801190314.06 13 2147483646 Tue Jan 19 03:14:06 2038 -203801190314.07 13 2147483647 Tue Jan 19 03:14:07 2038 -203801190314.08 13 2147483648 Tue Jan 19 03:14:08 2038 -999912312359.59 13 253402300799 Fri Dec 31 23:59:59 9999 -1112131415 13 1323785700 Tue Dec 13 14:15:00 2011 -1112131415.16 13 1323785716 Tue Dec 13 14:15:16 2011 -201112131415.16 13 1323785716 Tue Dec 13 14:15:16 2011 -191112131415.16 13 -1831974284 Wed Dec 13 14:15:16 1911 -203712131415.16 13 2144326516 Sun Dec 13 14:15:16 2037 -3712131415.16 13 2144326516 Sun Dec 13 14:15:16 2037 -6812131415.16 13 3122633716 Thu Dec 13 14:15:16 2068 -6912131415.16 13 -1590284 Sat Dec 13 14:15:16 1969 -7012131415.16 13 29945716 Sun Dec 13 14:15:16 1970 -1213141599 2 945094500 Mon Dec 13 14:15:00 1999 -1213141500 2 976716900 Wed Dec 13 14:15:00 2000 -END-DATA - -*/ - -# define MAX_BUFF_LEN 1024 - -int -main (void) -{ - char buff[MAX_BUFF_LEN + 1]; - - buff[MAX_BUFF_LEN] = 0; - while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0]) { - char time_str[MAX_BUFF_LEN]; - unsigned int syntax_bits; - time_t t; - if (sscanf (buff, "%s %u", time_str, &syntax_bits) != 2) - printf ("*\n"); - else - { - printf ("%-15s %2u ", time_str, syntax_bits); - if (posixtime (&t, time_str, syntax_bits)) - printf ("%12ld %s", (long int) t, ctime (&t)); - else - printf ("%12s %s", "*", "*\n"); - } + /* Any mismatch without 60 in the tm_sec field is invalid. */ + if (tm0.tm_sec != 60) + return false; + + { + /* Allow times like 01:35:60 or 23:59:60. */ + time_t dummy; + char buf[16]; + char *b = stpcpy (buf, s); + strcpy (b - 2, "59"); + if (!posixtime (&dummy, buf, syntax_bits)) + return false; + } } - exit (0); + *p = t; + return true; } -#endif - -/* -Local Variables: -compile-command: "gcc -DTEST_POSIXTIME -g -O -Wall -W posixtm.c" -End: -*/