1998-10-02 14:31:24 +00:00
|
|
|
|
/* Parse dates for touch and date.
|
2004-08-02 20:34:27 +00:00
|
|
|
|
|
2005-04-09 13:28:25 +00:00
|
|
|
|
Copyright (C) 1989, 1990, 1991, 1998, 2000, 2001, 2002, 2003, 2004, 2005
|
2004-08-02 20:34:27 +00:00
|
|
|
|
Free Software Foundation Inc.
|
1998-09-06 22:57:00 +00:00
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
|
|
This program 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 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,
|
2005-05-14 07:58:06 +00:00
|
|
|
|
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
|
1998-09-06 22:57:00 +00:00
|
|
|
|
|
|
|
|
|
|
/* Yacc-based version written by Jim Kingdon and David MacKenzie.
|
|
|
|
|
|
Rewritten by Jim Meyering. */
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
|
|
# include <config.h>
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2003-06-06 19:18:54 +00:00
|
|
|
|
#include <stdbool.h>
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
|
1998-09-06 22:57:00 +00:00
|
|
|
|
#include <stdio.h>
|
2003-09-10 09:07:17 +00:00
|
|
|
|
#include <stdlib.h>
|
1998-09-06 22:57:00 +00:00
|
|
|
|
#include <sys/types.h>
|
2003-09-10 09:07:17 +00:00
|
|
|
|
#include <string.h>
|
1998-09-06 22:57:00 +00:00
|
|
|
|
|
|
|
|
|
|
#ifdef TM_IN_SYS_TIME
|
|
|
|
|
|
# include <sys/time.h>
|
|
|
|
|
|
#else
|
|
|
|
|
|
# include <time.h>
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
1998-09-07 02:36:36 +00:00
|
|
|
|
#include "posixtm.h"
|
2004-10-04 20:18:43 +00:00
|
|
|
|
|
|
|
|
|
|
#if USE_UNLOCKED_IO
|
|
|
|
|
|
# include "unlocked-io.h"
|
|
|
|
|
|
#endif
|
1998-09-07 02:36:36 +00:00
|
|
|
|
|
|
|
|
|
|
/* ISDIGIT differs from isdigit, as follows:
|
2006-07-09 16:59:05 +00:00
|
|
|
|
- Its arg may be any int or unsigned int; it need not be an unsigned char
|
|
|
|
|
|
or EOF.
|
1998-09-07 02:36:36 +00:00
|
|
|
|
- It's typically faster.
|
2002-01-16 22:37:35 +00:00
|
|
|
|
POSIX says that only '0' through '9' are digits. Prefer ISDIGIT to
|
2006-07-09 16:59:05 +00:00
|
|
|
|
isdigit unless it's important to use the locale's definition
|
2002-01-16 22:37:35 +00:00
|
|
|
|
of `digit' even when the host does not conform to POSIX. */
|
2004-08-02 20:34:27 +00:00
|
|
|
|
#define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9)
|
1998-09-07 02:36:36 +00:00
|
|
|
|
|
1998-09-06 22:57:00 +00:00
|
|
|
|
time_t mktime ();
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
POSIX requires:
|
|
|
|
|
|
|
|
|
|
|
|
touch -t [[CC]YY]mmddhhmm[.ss] FILE...
|
|
|
|
|
|
8, 10, or 12 digits, followed by optional .ss
|
|
|
|
|
|
(PDS_LEADING_YEAR | PDS_CENTURY | PDS_SECONDS)
|
|
|
|
|
|
|
2002-01-16 22:37:35 +00:00
|
|
|
|
touch mmddhhmm[YY] FILE... (obsoleted by POSIX 1003.1-2001)
|
2005-11-01 23:41:56 +00:00
|
|
|
|
8 or 10 digits, YY (if present) must be in the range 69-99
|
|
|
|
|
|
(PDS_TRAILING_YEAR | PDS_PRE_2000)
|
1998-09-06 22:57:00 +00:00
|
|
|
|
|
|
|
|
|
|
date mmddhhmm[[CC]YY]
|
|
|
|
|
|
8, 10, or 12 digits
|
|
|
|
|
|
(PDS_TRAILING_YEAR | PDS_CENTURY)
|
|
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2005-11-01 23:41:56 +00:00
|
|
|
|
year (struct tm *tm, const int *digit_pair, size_t n, unsigned int syntax_bits)
|
1998-09-06 22:57:00 +00:00
|
|
|
|
{
|
|
|
|
|
|
switch (n)
|
|
|
|
|
|
{
|
|
|
|
|
|
case 1:
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
tm->tm_year = *digit_pair;
|
1998-09-06 22:57:00 +00:00
|
|
|
|
/* Deduce the century based on the year.
|
2002-01-16 22:37:35 +00:00
|
|
|
|
POSIX requires that 00-68 be interpreted as 2000-2068,
|
|
|
|
|
|
and that 69-99 be interpreted as 1969-1999. */
|
1998-09-06 22:57:00 +00:00
|
|
|
|
if (digit_pair[0] <= 68)
|
2005-11-01 23:41:56 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (syntax_bits & PDS_PRE_2000)
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
tm->tm_year += 100;
|
|
|
|
|
|
}
|
1998-09-06 22:57:00 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 2:
|
2005-11-01 23:41:56 +00:00
|
|
|
|
if (! (syntax_bits & PDS_CENTURY))
|
1998-09-06 22:57:00 +00:00
|
|
|
|
return 1;
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
tm->tm_year = digit_pair[0] * 100 + digit_pair[1] - 1900;
|
1998-09-06 22:57:00 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 0:
|
|
|
|
|
|
{
|
|
|
|
|
|
time_t now;
|
|
|
|
|
|
struct tm *tmp;
|
|
|
|
|
|
|
|
|
|
|
|
/* Use current year. */
|
|
|
|
|
|
time (&now);
|
|
|
|
|
|
tmp = localtime (&now);
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
if (! tmp)
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
tm->tm_year = tmp->tm_year;
|
1998-09-06 22:57:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
posix_time_parse (struct tm *tm, const char *s, unsigned int syntax_bits)
|
1998-09-06 22:57:00 +00:00
|
|
|
|
{
|
1998-09-07 02:36:36 +00:00
|
|
|
|
const char *dot = NULL;
|
1998-09-06 22:57:00 +00:00
|
|
|
|
int pair[6];
|
|
|
|
|
|
int *p;
|
2004-08-02 20:34:27 +00:00
|
|
|
|
size_t i;
|
1998-09-06 22:57:00 +00:00
|
|
|
|
|
|
|
|
|
|
size_t s_len = strlen (s);
|
|
|
|
|
|
size_t len = (((syntax_bits & PDS_SECONDS) && (dot = strchr (s, '.')))
|
2001-12-09 22:56:16 +00:00
|
|
|
|
? (size_t) (dot - s)
|
1998-09-06 22:57:00 +00:00
|
|
|
|
: s_len);
|
|
|
|
|
|
|
|
|
|
|
|
if (len != 8 && len != 10 && len != 12)
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
|
|
if (dot)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!(syntax_bits & PDS_SECONDS))
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
|
|
if (s_len - len != 3)
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
|
|
if (!ISDIGIT (s[i]))
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
|
|
len /= 2;
|
|
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
|
|
pair[i] = 10 * (s[2*i] - '0') + s[2*i + 1] - '0';
|
|
|
|
|
|
|
|
|
|
|
|
p = pair;
|
|
|
|
|
|
if (syntax_bits & PDS_LEADING_YEAR)
|
|
|
|
|
|
{
|
2005-11-01 23:41:56 +00:00
|
|
|
|
if (year (tm, p, len - 4, syntax_bits))
|
1998-09-06 22:57:00 +00:00
|
|
|
|
return 1;
|
|
|
|
|
|
p += len - 4;
|
|
|
|
|
|
len = 4;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Handle 8 digits worth of `MMDDhhmm'. */
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
tm->tm_mon = *p++ - 1;
|
|
|
|
|
|
tm->tm_mday = *p++;
|
|
|
|
|
|
tm->tm_hour = *p++;
|
|
|
|
|
|
tm->tm_min = *p++;
|
|
|
|
|
|
len -= 4;
|
1998-09-06 22:57:00 +00:00
|
|
|
|
|
|
|
|
|
|
/* Handle any trailing year. */
|
|
|
|
|
|
if (syntax_bits & PDS_TRAILING_YEAR)
|
|
|
|
|
|
{
|
2005-11-01 23:41:56 +00:00
|
|
|
|
if (year (tm, p, len, syntax_bits))
|
1998-09-06 22:57:00 +00:00
|
|
|
|
return 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Handle seconds. */
|
|
|
|
|
|
if (!dot)
|
|
|
|
|
|
{
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
tm->tm_sec = 0;
|
1998-09-06 22:57:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
int seconds;
|
|
|
|
|
|
|
|
|
|
|
|
++dot;
|
|
|
|
|
|
if (!ISDIGIT (dot[0]) || !ISDIGIT (dot[1]))
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
seconds = 10 * (dot[0] - '0') + dot[1] - '0';
|
|
|
|
|
|
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
tm->tm_sec = seconds;
|
1998-09-06 22:57:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
/* Parse a POSIX-style date, returning true if successful. */
|
1998-09-06 22:57:00 +00:00
|
|
|
|
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
bool
|
|
|
|
|
|
posixtime (time_t *p, const char *s, unsigned int syntax_bits)
|
1998-09-06 22:57:00 +00:00
|
|
|
|
{
|
2005-07-03 21:10:31 +00:00
|
|
|
|
struct tm tm0
|
2005-04-09 13:28:25 +00:00
|
|
|
|
#ifdef lint
|
|
|
|
|
|
/* Placate gcc-4's -Wuninitialized.
|
2005-07-03 21:10:31 +00:00
|
|
|
|
posix_time_parse fails to set all of tm0 only when it returns
|
2005-04-09 13:28:25 +00:00
|
|
|
|
nonzero (due to year() returning nonzero), and in that case,
|
|
|
|
|
|
this code doesn't use the tm0 at all. */
|
2005-07-03 21:10:31 +00:00
|
|
|
|
= { 0, }
|
2005-04-09 13:28:25 +00:00
|
|
|
|
#endif
|
2005-07-03 21:10:31 +00:00
|
|
|
|
;
|
|
|
|
|
|
struct tm tm1;
|
|
|
|
|
|
struct tm const *tm;
|
|
|
|
|
|
time_t t;
|
2005-04-09 13:28:25 +00:00
|
|
|
|
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
if (posix_time_parse (&tm0, s, syntax_bits))
|
|
|
|
|
|
return false;
|
1998-09-06 22:57:00 +00:00
|
|
|
|
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
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;
|
1998-09-06 22:57:00 +00:00
|
|
|
|
}
|
1998-09-07 03:23:30 +00:00
|
|
|
|
|
|
|
|
|
|
#ifdef TEST_POSIXTIME
|
|
|
|
|
|
/*
|
|
|
|
|
|
Test mainly with syntax_bits == 13
|
|
|
|
|
|
(aka: (PDS_LEADING_YEAR | PDS_CENTURY | PDS_SECONDS))
|
|
|
|
|
|
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
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.
|
|
|
|
|
|
|
1998-09-07 03:23:30 +00:00
|
|
|
|
BEGIN-DATA
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
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
|
1998-09-07 03:23:30 +00:00
|
|
|
|
END-DATA
|
|
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
# define MAX_BUFF_LEN 1024
|
|
|
|
|
|
|
|
|
|
|
|
int
|
2003-09-10 09:07:17 +00:00
|
|
|
|
main (void)
|
1998-09-07 03:23:30 +00:00
|
|
|
|
{
|
|
|
|
|
|
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;
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
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))
|
2004-08-02 20:34:27 +00:00
|
|
|
|
printf ("%12ld %s", (long int) t, ctime (&t));
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
else
|
|
|
|
|
|
printf ("%12s %s", "*", "*\n");
|
|
|
|
|
|
}
|
1998-09-07 03:23:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
exit (0);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
Fix some minor time-related bugs with POSIX time arguments.
Some valid time stamps were being rejected (notably -1, and
time stamps before 1900 on 64-bit hosts). And some invalid
time stamps were being accepted, e.g. September 31.
* lib/posixtm.h (posixtime): Return bool instead of time_t, so
that we can return (time_t) -1 successfully.
* lib/posixtm.c: Likewise.
[HAVE_STDBOOL_H]: Include <stdbool.h>.
(bool, false, true) [!HAVE_STDBOOL_H]: New type.
(t): Remove static var.
(year, posix_time_parse): Now takes struct tm * arg to modify, instead
of static var. All uses changed.
(year): Do not reject years before 1900; they can occur with
64-bit time_t.
(posix_time_parse): Do not check for out-of-range components;
that is now the caller's responsibility, since our checks were
only approximations.
(posixtime): Use mktime to check for out-of-range components,
since it knows them exactly.
If mktime returns (time_t) -1, check whether an error actually occurred
by invoking localtime on -1.
(main) [TEST_POSIXTIME]: Check for input data errors, and report
posixtime failures better.
Improve the test data (in comments only).
2002-08-07 22:02:23 +00:00
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
Local Variables:
|
|
|
|
|
|
compile-command: "gcc -DTEST_POSIXTIME -DHAVE_CONFIG_H -I.. -g -O -Wall -W posixtm.c"
|
|
|
|
|
|
End:
|
|
|
|
|
|
*/
|