X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fposixtm.c;h=c786adb878860fbfb25ae547921860f02b7ad450;hb=870daa58035b4bb39549f15d20ad1422dd649d63;hp=03aaaf20aeba9b815172828d1490af2f9853aef4;hpb=5d41f26437058590697fd573f1051bc3b8064c16;p=gnulib.git
diff --git a/lib/posixtm.c b/lib/posixtm.c
index 03aaaf20a..c786adb87 100644
--- a/lib/posixtm.c
+++ b/lib/posixtm.c
@@ -1,10 +1,11 @@
-/* Parse dates for touch.
- Copyright (C) 1989, 1990, 1991, 1998 Free Software Foundation Inc.
+/* Parse dates for touch and date.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1989-1991, 1998, 2000-2010 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,46 +13,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
+#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"
-
/* 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;
-
-time_t mktime ();
+ 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)
/*
POSIX requires:
@@ -60,9 +47,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
@@ -71,36 +58,40 @@ 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)
- return 1;
- t.tm_year -= 1900;
+ if (! (syntax_bits & PDS_CENTURY))
+ return 1;
+ tm->tm_year = digit_pair[0] * 100 + digit_pair[1] - 1900;
break;
case 0:
{
- time_t now;
- struct tm *tmp;
-
- /* Use current year. */
- time (&now);
- tmp = localtime (&now);
- t.tm_year = tmp->tm_year;
+ time_t now;
+ struct tm *tmp;
+
+ /* Use current year. */
+ time (&now);
+ tmp = localtime (&now);
+ if (! tmp)
+ return 1;
+ tm->tm_year = tmp->tm_year;
}
break;
@@ -112,17 +103,17 @@ 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;
- int i;
+ size_t i;
size_t s_len = strlen (s);
size_t len = (((syntax_bits & PDS_SECONDS) && (dot = strchr (s, '.')))
- ? dot - s
- : s_len);
+ ? (size_t) (dot - s)
+ : s_len);
if (len != 8 && len != 10 && len != 12)
return 1;
@@ -130,10 +121,10 @@ posix_time_parse (const char *s, unsigned int syntax_bits)
if (dot)
{
if (!(syntax_bits & PDS_SECONDS))
- return 1;
+ return 1;
if (s_len - len != 3)
- return 1;
+ return 1;
}
for (i = 0; i < len; i++)
@@ -147,44 +138,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))
- return 1;
+ 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))
- return 1;
+ if (year (tm, p, len, syntax_bits))
+ return 1;
}
/* Handle seconds. */
if (!dot)
{
- t.tm_sec = 0;
+ tm->tm_sec = 0;
}
else
{
@@ -192,82 +169,67 @@ posix_time_parse (const char *s, unsigned int syntax_bits)
++dot;
if (!ISDIGIT (dot[0]) || !ISDIGIT (dot[1]))
- return 1;
+ 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);
-}
-
-/* Parse a POSIX-style date and return it, or NULL for an error. */
+ struct tm tm0;
+ struct tm tm1;
+ struct tm const *tm;
+ time_t t;
-struct tm *
-posixtm (const char *s, unsigned int syntax_bits)
-{
- if (posixtime (s, syntax_bits) == -1)
- return NULL;
- return &t;
-}
-
-#ifdef TEST_POSIXTIME
-/*
- Test mainly with syntax_bits == 13
- (aka: (PDS_LEADING_YEAR | PDS_CENTURY | PDS_SECONDS))
-
-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
-END-DATA
-
-*/
+ if (posix_time_parse (&tm0, s, syntax_bits))
+ return false;
-# define MAX_BUFF_LEN 1024
+ tm1 = tm0;
+ tm1.tm_isdst = -1;
+ t = mktime (&tm1);
-int
-main ()
-{
- char buff[MAX_BUFF_LEN + 1];
+ 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;
+ }
- buff[MAX_BUFF_LEN] = 0;
- while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
+ /* 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))
{
- 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);
+ /* 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