X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fposixtm.c;h=fff53f50b95bac8df3f651e2539f2f761f0e4589;hb=90f8d0d3e4ce4b1f4118d35eba6a051558323ace;hp=cbeca6f21158b4be6bc3a5d0119f16443eeaaf6a;hpb=25c8e140b2c90bf248f7bcef63a69ac39bcaf7b3;p=gnulib.git diff --git a/lib/posixtm.c b/lib/posixtm.c index cbeca6f21..fff53f50b 100644 --- a/lib/posixtm.c +++ b/lib/posixtm.c @@ -1,10 +1,12 @@ /* Parse dates for touch and date. - Copyright (C) 1989, 1990, 1991, 1998, 2000, 2001 Free Software Foundation Inc. - This program is free software; you can redistribute it and/or modify + Copyright (C) 1989, 1990, 1991, 1998, 2000, 2001, 2002, 2003, 2004, + 2005, 2006, 2007 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 - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -12,48 +14,32 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + along with this program. If not, see . */ /* Yacc-based version written by Jim Kingdon and David MacKenzie. Rewritten by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include + +#include "posixtm.h" #include -#if HAVE_STDLIB_H -# include -#endif +#include #include -#if HAVE_STRING_H -# include -#else -# include -#endif +#include -#ifdef TM_IN_SYS_TIME -# include -#else -# include +#if USE_UNLOCKED_IO +# include "unlocked-io.h" #endif -#include "posixtm.h" -#include "unlocked-io.h" - /* ISDIGIT differs from isdigit, as follows: - - Its arg may be any int or unsigned int; it need not be an unsigned char. - - It's guaranteed to evaluate its argument exactly once. + - Its arg may be any int or unsigned int; it need not be an unsigned char + or EOF. - It's typically faster. - Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that - only '0' through '9' are digits. Prefer ISDIGIT to isdigit unless - it's important to use the locale's definition of `digit' even when the - host does not conform to Posix. */ -#define ISDIGIT(c) ((unsigned) (c) - '0' <= 9) - -/* The return value. */ -static struct tm t; + POSIX says that only '0' through '9' are digits. Prefer ISDIGIT to + isdigit unless it's important to use the locale's definition + of `digit' even when the host does not conform to POSIX. */ +#define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9) time_t mktime (); @@ -64,9 +50,9 @@ time_t mktime (); 8, 10, or 12 digits, followed by optional .ss (PDS_LEADING_YEAR | PDS_CENTURY | PDS_SECONDS) - touch mmddhhmm[YY] FILE... (obsolescent) - 8 or 10 digits - (PDS_TRAILING_YEAR) + touch mmddhhmm[YY] FILE... (obsoleted by POSIX 1003.1-2001) + 8 or 10 digits, YY (if present) must be in the range 69-99 + (PDS_TRAILING_YEAR | PDS_PRE_2000) date mmddhhmm[[CC]YY] 8, 10, or 12 digits @@ -75,25 +61,27 @@ time_t mktime (); */ static int -year (const int *digit_pair, size_t n, int allow_century) +year (struct tm *tm, const int *digit_pair, size_t n, unsigned int syntax_bits) { switch (n) { case 1: - t.tm_year = *digit_pair; + tm->tm_year = *digit_pair; /* Deduce the century based on the year. - See POSIX.2 section 4.63.3. */ + POSIX requires that 00-68 be interpreted as 2000-2068, + and that 69-99 be interpreted as 1969-1999. */ if (digit_pair[0] <= 68) - t.tm_year += 100; + { + if (syntax_bits & PDS_PRE_2000) + return 1; + tm->tm_year += 100; + } break; case 2: - if (!allow_century) - return 1; - t.tm_year = digit_pair[0] * 100 + digit_pair[1]; - if (t.tm_year < 1900) + if (! (syntax_bits & PDS_CENTURY)) return 1; - t.tm_year -= 1900; + tm->tm_year = digit_pair[0] * 100 + digit_pair[1] - 1900; break; case 0: @@ -104,7 +92,9 @@ year (const int *digit_pair, size_t n, int allow_century) /* Use current year. */ time (&now); tmp = localtime (&now); - t.tm_year = tmp->tm_year; + if (! tmp) + return 1; + tm->tm_year = tmp->tm_year; } break; @@ -116,12 +106,12 @@ year (const int *digit_pair, size_t n, int allow_century) } static int -posix_time_parse (const char *s, unsigned int syntax_bits) +posix_time_parse (struct tm *tm, const char *s, unsigned int syntax_bits) { const char *dot = NULL; int pair[6]; int *p; - unsigned int i; + size_t i; size_t s_len = strlen (s); size_t len = (((syntax_bits & PDS_SECONDS) && (dot = strchr (s, '.'))) @@ -151,44 +141,30 @@ posix_time_parse (const char *s, unsigned int syntax_bits) p = pair; if (syntax_bits & PDS_LEADING_YEAR) { - if (year (p, len - 4, syntax_bits & PDS_CENTURY)) + if (year (tm, p, len - 4, syntax_bits)) return 1; p += len - 4; len = 4; } /* Handle 8 digits worth of `MMDDhhmm'. */ - if (*p < 1 || *p > 12) - return 1; - t.tm_mon = *p - 1; - ++p; --len; - - if (*p < 1 || *p > 31) - return 1; - t.tm_mday = *p; - ++p; --len; - - if (*p < 0 || *p > 23) - return 1; - t.tm_hour = *p; - ++p; --len; - - if (*p < 0 || *p > 59) - return 1; - t.tm_min = *p; - ++p; --len; + tm->tm_mon = *p++ - 1; + tm->tm_mday = *p++; + tm->tm_hour = *p++; + tm->tm_min = *p++; + len -= 4; /* Handle any trailing year. */ if (syntax_bits & PDS_TRAILING_YEAR) { - if (year (p, len, syntax_bits & PDS_CENTURY)) + if (year (tm, p, len, syntax_bits)) return 1; } /* Handle seconds. */ if (!dot) { - t.tm_sec = 0; + tm->tm_sec = 0; } else { @@ -199,34 +175,59 @@ posix_time_parse (const char *s, unsigned int syntax_bits) return 1; seconds = 10 * (dot[0] - '0') + dot[1] - '0'; - if (seconds < 0 || seconds > 61) - return 1; - t.tm_sec = seconds; + tm->tm_sec = seconds; } return 0; } -/* Parse a POSIX-style date and return it, or (time_t)-1 for an error. */ +/* Parse a POSIX-style date, returning true if successful. */ -time_t -posixtime (const char *s, unsigned int syntax_bits) +bool +posixtime (time_t *p, const char *s, unsigned int syntax_bits) { - t.tm_isdst = -1; - if (posix_time_parse (s, syntax_bits)) - return (time_t)-1; - else - return mktime (&t); -} + 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 tm1; + struct tm const *tm; + time_t t; -/* Parse a POSIX-style date and return it, or NULL for an error. */ + if (posix_time_parse (&tm0, s, syntax_bits)) + return false; -struct tm * -posixtm (const char *s, unsigned int syntax_bits) -{ - if (posixtime (s, syntax_bits) == -1) - return NULL; - return &t; + tm1 = tm0; + tm1.tm_isdst = -1; + t = mktime (&tm1); + + if (t != (time_t) -1) + tm = &tm1; + else + { + /* mktime returns -1 for errors, but -1 is also a valid time_t + value. Check whether an error really occurred. */ + tm = localtime (&t); + if (! tm) + return false; + } + + /* Reject dates like "September 31" and times like "25:61". */ + 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 @@ -234,20 +235,58 @@ posixtm (const char *s, unsigned int syntax_bits) 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 -1112131415 13 1323807300 Tue Dec 13 14:15:00 2011 -1112131415.16 13 1323807316 Tue Dec 13 14:15:16 2011 -201112131415.16 13 1323807316 Tue Dec 13 14:15:16 2011 -191112131415.16 13 -1 *** -203712131415.16 13 2144348116 Sun Dec 13 14:15:16 2037 -3712131415.16 13 2144348116 Sun Dec 13 14:15:16 2037 -6812131415.16 13 -1 *** -6912131415.16 13 -1 *** -7012131415.16 13 29967316 Sun Dec 13 14:15:16 1970 -12131415.16 13 913580116 Sun Dec 13 14:15:16 1998 - -1213141599 2 945116100 Mon Dec 13 14:15:00 1999 -1213141500 2 976738500 Wed Dec 13 14:15:00 2000 +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 */ @@ -255,7 +294,7 @@ END-DATA # define MAX_BUFF_LEN 1024 int -main () +main (void) { char buff[MAX_BUFF_LEN + 1]; @@ -265,13 +304,24 @@ main () char time_str[MAX_BUFF_LEN]; unsigned int syntax_bits; time_t t; - char *result; - sscanf (buff, "%s %u", time_str, &syntax_bits); - t = posixtime (time_str, syntax_bits); - result = (t == (time_t) -1 ? "***" : ctime (&t)); - printf ("%d %s\n", (int) t, result); + 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"); + } } exit (0); } #endif + +/* +Local Variables: +compile-command: "gcc -DTEST_POSIXTIME -g -O -Wall -W posixtm.c" +End: +*/