projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Accept Bison's NEWS format.
[gnulib.git]
/
lib
/
posixtm.c
diff --git
a/lib/posixtm.c
b/lib/posixtm.c
index
49e239c
..
fff53f5
100644
(file)
--- a/
lib/posixtm.c
+++ b/
lib/posixtm.c
@@
-1,10
+1,12
@@
/* Parse dates for touch and date.
/* Parse dates for touch and date.
- Copyright (C) 1989, 1990, 1991, 1998, 2000-2003 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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-12,46
+14,32
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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 <http://www.gnu.org/licenses/>. */
/* Yacc-based version written by Jim Kingdon and David MacKenzie.
Rewritten by Jim Meyering. */
/* Yacc-based version written by Jim Kingdon and David MacKenzie.
Rewritten by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
-#include
<stdbool.h>
+#include
"posixtm.h"
#include <stdio.h>
#include <stdio.h>
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
#include <sys/types.h>
#include <sys/types.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
-#ifdef TM_IN_SYS_TIME
-# include <sys/time.h>
-#else
-# include <time.h>
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
#endif
#endif
-#include "posixtm.h"
-#include "unlocked-io.h"
-
/* ISDIGIT differs from isdigit, as follows:
/* 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 says that only '0' through '9' are digits. Prefer ISDIGIT to
- It's typically faster.
POSIX says that only '0' through '9' are digits. Prefer ISDIGIT to
-
ISDIGIT_LOCALE
unless it's important to use the locale's definition
+
isdigit
unless it's important to use the locale's definition
of `digit' even when the host does not conform to POSIX. */
of `digit' even when the host does not conform to POSIX. */
-#define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)
+#define ISDIGIT(c) ((unsigned
int
) (c) - '0' <= 9)
time_t mktime ();
time_t mktime ();
@@
-63,8
+51,8
@@
time_t mktime ();
(PDS_LEADING_YEAR | PDS_CENTURY | PDS_SECONDS)
touch mmddhhmm[YY] FILE... (obsoleted by POSIX 1003.1-2001)
(PDS_LEADING_YEAR | PDS_CENTURY | PDS_SECONDS)
touch mmddhhmm[YY] FILE... (obsoleted by POSIX 1003.1-2001)
- 8 or 10 digits
- (PDS_TRAILING_YEAR)
+ 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
date mmddhhmm[[CC]YY]
8, 10, or 12 digits
@@
-73,7
+61,7
@@
time_t mktime ();
*/
static int
*/
static int
-year (struct tm *tm, 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)
{
{
switch (n)
{
@@
-83,11
+71,15
@@
year (struct tm *tm, const int *digit_pair, size_t n, int allow_century)
POSIX requires that 00-68 be interpreted as 2000-2068,
and that 69-99 be interpreted as 1969-1999. */
if (digit_pair[0] <= 68)
POSIX requires that 00-68 be interpreted as 2000-2068,
and that 69-99 be interpreted as 1969-1999. */
if (digit_pair[0] <= 68)
- tm->tm_year += 100;
+ {
+ if (syntax_bits & PDS_PRE_2000)
+ return 1;
+ tm->tm_year += 100;
+ }
break;
case 2:
break;
case 2:
- if (!
allow_century
)
+ if (!
(syntax_bits & PDS_CENTURY)
)
return 1;
tm->tm_year = digit_pair[0] * 100 + digit_pair[1] - 1900;
break;
return 1;
tm->tm_year = digit_pair[0] * 100 + digit_pair[1] - 1900;
break;
@@
-119,7
+111,7
@@
posix_time_parse (struct tm *tm, const char *s, unsigned int syntax_bits)
const char *dot = NULL;
int pair[6];
int *p;
const char *dot = NULL;
int pair[6];
int *p;
-
unsigned in
t i;
+
size_
t i;
size_t s_len = strlen (s);
size_t len = (((syntax_bits & PDS_SECONDS) && (dot = strchr (s, '.')))
size_t s_len = strlen (s);
size_t len = (((syntax_bits & PDS_SECONDS) && (dot = strchr (s, '.')))
@@
-149,7
+141,7
@@
posix_time_parse (struct tm *tm, const char *s, unsigned int syntax_bits)
p = pair;
if (syntax_bits & PDS_LEADING_YEAR)
{
p = pair;
if (syntax_bits & PDS_LEADING_YEAR)
{
- if (year (tm, p, len - 4, syntax_bits
& PDS_CENTURY
))
+ if (year (tm, p, len - 4, syntax_bits))
return 1;
p += len - 4;
len = 4;
return 1;
p += len - 4;
len = 4;
@@
-165,7
+157,7
@@
posix_time_parse (struct tm *tm, const char *s, unsigned int syntax_bits)
/* Handle any trailing year. */
if (syntax_bits & PDS_TRAILING_YEAR)
{
/* Handle any trailing year. */
if (syntax_bits & PDS_TRAILING_YEAR)
{
- if (year (tm, p, len, syntax_bits
& PDS_CENTURY
))
+ if (year (tm, p, len, syntax_bits))
return 1;
}
return 1;
}
@@
-194,7
+186,15
@@
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)
{
bool
posixtime (time_t *p, const char *s, unsigned int syntax_bits)
{
- struct tm tm0;
+ 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;
struct tm tm1;
struct tm const *tm;
time_t t;
@@
-294,7
+294,7
@@
END-DATA
# define MAX_BUFF_LEN 1024
int
# define MAX_BUFF_LEN 1024
int
-main ()
+main (
void
)
{
char buff[MAX_BUFF_LEN + 1];
{
char buff[MAX_BUFF_LEN + 1];
@@
-310,7
+310,7
@@
main ()
{
printf ("%-15s %2u ", time_str, syntax_bits);
if (posixtime (&t, time_str, syntax_bits))
{
printf ("%-15s %2u ", time_str, syntax_bits);
if (posixtime (&t, time_str, syntax_bits))
- printf ("%12ld %s", (long) t, ctime (&t));
+ printf ("%12ld %s", (long
int
) t, ctime (&t));
else
printf ("%12s %s", "*", "*\n");
}
else
printf ("%12s %s", "*", "*\n");
}
@@
-322,6
+322,6
@@
main ()
\f
/*
Local Variables:
\f
/*
Local Variables:
-compile-command: "gcc -DTEST_POSIXTIME -
DHAVE_CONFIG_H -I.. -
g -O -Wall -W posixtm.c"
+compile-command: "gcc -DTEST_POSIXTIME -g -O -Wall -W posixtm.c"
End:
*/
End:
*/