Mercurial > gnulib
annotate lib/parse-datetime.y @ 40186:8964917f9574
autoupdate
author | Karl Berry <karl@freefriends.org> |
---|---|
date | Mon, 18 Feb 2019 08:02:49 -0800 |
parents | b06060465f09 |
children |
rev | line source |
---|---|
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1 %{ |
18663
caf9d6314c8f
maint: time stamp -> timestamp
Paul Eggert <eggert@cs.ucla.edu>
parents:
18645
diff
changeset
|
2 /* Parse a string into an internal timestamp. |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
3 |
40057
b06060465f09
maint: Run 'make update-copyright'
Paul Eggert <eggert@cs.ucla.edu>
parents:
39964
diff
changeset
|
4 Copyright (C) 1999-2000, 2002-2019 Free Software Foundation, Inc. |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
5 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
6 This program is free software: you can redistribute it and/or modify |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
7 it under the terms of the GNU General Public License as published by |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
8 the Free Software Foundation; either version 3 of the License, or |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
9 (at your option) any later version. |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
10 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
11 This program is distributed in the hope that it will be useful, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
12 but WITHOUT ANY WARRANTY; without even the implied warranty of |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
14 GNU General Public License for more details. |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
15 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
16 You should have received a copy of the GNU General Public License |
19190 | 17 along with this program. If not, see <https://www.gnu.org/licenses/>. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
18 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
19 /* Originally written by Steven M. Bellovin <smb@research.att.com> while |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
20 at the University of North Carolina at Chapel Hill. Later tweaked by |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
21 a couple of people on Usenet. Completely overhauled by Rich $alz |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
22 <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990. |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
23 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
24 Modified by Assaf Gordon <assafgordon@gmail.com> in 2016 to add |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
25 debug output. |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
26 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
27 Modified by Paul Eggert <eggert@twinsun.com> in 1999 to do the |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
28 right thing about local DST. Also modified by Paul Eggert |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
29 <eggert@cs.ucla.edu> in 2004 to support nanosecond-resolution |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
30 timestamps, in 2004 to support TZ strings in dates, and in 2017 to |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
31 check for integer overflow and to support longer-than-'long' |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
32 'time_t' and 'tv_nsec'. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
33 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
34 #include <config.h> |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
35 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
36 #include "parse-datetime.h" |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
37 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
38 #include "intprops.h" |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
39 #include "timespec.h" |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
40 #include "verify.h" |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
41 #include "strftime.h" |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
42 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
43 /* There's no need to extend the stack, so there's no need to involve |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
44 alloca. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
45 #define YYSTACK_USE_ALLOCA 0 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
46 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
47 /* Tell Bison how much stack space is needed. 20 should be plenty for |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
48 this grammar, which is not right recursive. Beware setting it too |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
49 high, since that might cause problems on machines whose |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
50 implementations have lame stack-overflow checking. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
51 #define YYMAXDEPTH 20 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
52 #define YYINITDEPTH YYMAXDEPTH |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
53 |
13770
d8cedb66335e
parse-datetime: do some more renaming
Paul Eggert <eggert@cs.ucla.edu>
parents:
13769
diff
changeset
|
54 /* Since the code of parse-datetime.y is not included in the Emacs executable |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
55 itself, there is no need to #define static in this file. Even if |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
56 the code were included in the Emacs executable, it probably |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
57 wouldn't do any harm to #undef it here; this will only cause |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
58 problems if we try to write to a static variable, which I don't |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
59 think this code needs to do. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
60 #ifdef emacs |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
61 # undef static |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
62 #endif |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
63 |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
64 #include <inttypes.h> |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
65 #include <c-ctype.h> |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
66 #include <limits.h> |
18817
a3e5469ebdd5
parse-datetime: make it standalone
Paul Eggert <eggert@cs.ucla.edu>
parents:
18804
diff
changeset
|
67 #include <stdarg.h> |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
68 #include <stdio.h> |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
69 #include <stdlib.h> |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
70 #include <string.h> |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
71 |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
72 #include "gettext.h" |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
73 |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
74 #define _(str) gettext (str) |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
75 |
13777
f757eb706a43
parse-datetime: avoid compilation failure on OpenBSD 4.7
Jim Meyering <meyering@redhat.com>
parents:
13770
diff
changeset
|
76 /* Bison's skeleton tests _STDLIB_H, while some stdlib.h headers |
f757eb706a43
parse-datetime: avoid compilation failure on OpenBSD 4.7
Jim Meyering <meyering@redhat.com>
parents:
13770
diff
changeset
|
77 use _STDLIB_H_ as witness. Map the latter to the one bison uses. */ |
f757eb706a43
parse-datetime: avoid compilation failure on OpenBSD 4.7
Jim Meyering <meyering@redhat.com>
parents:
13770
diff
changeset
|
78 /* FIXME: this is temporary. Remove when we have a mechanism to ensure |
f757eb706a43
parse-datetime: avoid compilation failure on OpenBSD 4.7
Jim Meyering <meyering@redhat.com>
parents:
13770
diff
changeset
|
79 that the version we're using is fixed, too. */ |
f757eb706a43
parse-datetime: avoid compilation failure on OpenBSD 4.7
Jim Meyering <meyering@redhat.com>
parents:
13770
diff
changeset
|
80 #ifdef _STDLIB_H_ |
f757eb706a43
parse-datetime: avoid compilation failure on OpenBSD 4.7
Jim Meyering <meyering@redhat.com>
parents:
13770
diff
changeset
|
81 # undef _STDLIB_H |
f757eb706a43
parse-datetime: avoid compilation failure on OpenBSD 4.7
Jim Meyering <meyering@redhat.com>
parents:
13770
diff
changeset
|
82 # define _STDLIB_H 1 |
f757eb706a43
parse-datetime: avoid compilation failure on OpenBSD 4.7
Jim Meyering <meyering@redhat.com>
parents:
13770
diff
changeset
|
83 #endif |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
84 |
18817
a3e5469ebdd5
parse-datetime: make it standalone
Paul Eggert <eggert@cs.ucla.edu>
parents:
18804
diff
changeset
|
85 /* The __attribute__ feature is available in gcc versions 2.5 and later. |
a3e5469ebdd5
parse-datetime: make it standalone
Paul Eggert <eggert@cs.ucla.edu>
parents:
18804
diff
changeset
|
86 The __-protected variants of the attributes 'format' and 'printf' are |
a3e5469ebdd5
parse-datetime: make it standalone
Paul Eggert <eggert@cs.ucla.edu>
parents:
18804
diff
changeset
|
87 accepted by gcc versions 2.6.4 (effectively 2.7) and later. |
a3e5469ebdd5
parse-datetime: make it standalone
Paul Eggert <eggert@cs.ucla.edu>
parents:
18804
diff
changeset
|
88 Enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because |
a3e5469ebdd5
parse-datetime: make it standalone
Paul Eggert <eggert@cs.ucla.edu>
parents:
18804
diff
changeset
|
89 gnulib and libintl do '#define printf __printf__' when they override |
a3e5469ebdd5
parse-datetime: make it standalone
Paul Eggert <eggert@cs.ucla.edu>
parents:
18804
diff
changeset
|
90 the 'printf' function. */ |
a3e5469ebdd5
parse-datetime: make it standalone
Paul Eggert <eggert@cs.ucla.edu>
parents:
18804
diff
changeset
|
91 #if 2 < __GNUC__ + (7 <= __GNUC_MINOR__) |
a3e5469ebdd5
parse-datetime: make it standalone
Paul Eggert <eggert@cs.ucla.edu>
parents:
18804
diff
changeset
|
92 # define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) |
a3e5469ebdd5
parse-datetime: make it standalone
Paul Eggert <eggert@cs.ucla.edu>
parents:
18804
diff
changeset
|
93 #else |
a3e5469ebdd5
parse-datetime: make it standalone
Paul Eggert <eggert@cs.ucla.edu>
parents:
18804
diff
changeset
|
94 # define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ |
a3e5469ebdd5
parse-datetime: make it standalone
Paul Eggert <eggert@cs.ucla.edu>
parents:
18804
diff
changeset
|
95 #endif |
a3e5469ebdd5
parse-datetime: make it standalone
Paul Eggert <eggert@cs.ucla.edu>
parents:
18804
diff
changeset
|
96 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
97 /* Shift A right by B bits portably, by dividing A by 2**B and |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
98 truncating towards minus infinity. A and B should be free of side |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
99 effects, and B should be in the range 0 <= B <= INT_BITS - 2, where |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
100 INT_BITS is the number of useful bits in an int. GNU code can |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
101 assume that INT_BITS is at least 32. |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
102 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
103 ISO C99 says that A >> B is implementation-defined if A < 0. Some |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
104 implementations (e.g., UNICOS 9.0 on a Cray Y-MP EL) don't shift |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
105 right in the usual way when A < 0, so SHR falls back on division if |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
106 ordinary A >> B doesn't seem to be the usual signed shift. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
107 #define SHR(a, b) \ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
108 (-1 >> 1 == -1 \ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
109 ? (a) >> (b) \ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
110 : (a) / (1 << (b)) - ((a) % (1 << (b)) < 0)) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
111 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
112 #define HOUR(x) (60 * 60 * (x)) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
113 |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
114 #define STREQ(a, b) (strcmp (a, b) == 0) |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
115 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
116 /* Verify that time_t is an integer as POSIX requires, and that every |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
117 time_t value fits in intmax_t. Please file a bug report if these |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
118 assumptions are false on your platform. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
119 verify (TYPE_IS_INTEGER (time_t)); |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
120 verify (!TYPE_SIGNED (time_t) || INTMAX_MIN <= TYPE_MINIMUM (time_t)); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
121 verify (TYPE_MAXIMUM (time_t) <= INTMAX_MAX); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
122 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
123 /* True if N is out of range for time_t. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
124 static bool |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
125 time_overflow (intmax_t n) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
126 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
127 return ! ((TYPE_SIGNED (time_t) ? TYPE_MINIMUM (time_t) <= n : 0 <= n) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
128 && n <= TYPE_MAXIMUM (time_t)); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
129 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
130 |
16964
b9ca6af780f5
parse-datetime: fix failure to diagnose invalid input
Jim Meyering <meyering@redhat.com>
parents:
16358
diff
changeset
|
131 /* Convert a possibly-signed character to an unsigned character. This is |
b9ca6af780f5
parse-datetime: fix failure to diagnose invalid input
Jim Meyering <meyering@redhat.com>
parents:
16358
diff
changeset
|
132 a bit safer than casting to unsigned char, since it catches some type |
b9ca6af780f5
parse-datetime: fix failure to diagnose invalid input
Jim Meyering <meyering@redhat.com>
parents:
16358
diff
changeset
|
133 errors that the cast doesn't. */ |
17190
6fa7c7fb76b2
parse-datetime, parse-duration: no 'static inline'
Paul Eggert <eggert@cs.ucla.edu>
parents:
16964
diff
changeset
|
134 static unsigned char to_uchar (char ch) { return ch; } |
16964
b9ca6af780f5
parse-datetime: fix failure to diagnose invalid input
Jim Meyering <meyering@redhat.com>
parents:
16358
diff
changeset
|
135 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
136 static void _GL_ATTRIBUTE_FORMAT ((__printf__, 1, 2)) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
137 dbg_printf (char const *msg, ...) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
138 { |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
139 va_list args; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
140 /* TODO: use gnulib's 'program_name' instead? */ |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
141 fputs ("date: ", stderr); |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
142 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
143 va_start (args, msg); |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
144 vfprintf (stderr, msg, args); |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
145 va_end (args); |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
146 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
147 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
148 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
149 /* An integer value, and the number of digits in its textual |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
150 representation. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
151 typedef struct |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
152 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
153 bool negative; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
154 intmax_t value; |
18804
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
155 ptrdiff_t digits; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
156 } textint; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
157 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
158 /* An entry in the lexical lookup table. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
159 typedef struct |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
160 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
161 char const *name; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
162 int type; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
163 int value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
164 } table; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
165 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
166 /* Meridian: am, pm, or 24-hour style. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
167 enum { MERam, MERpm, MER24 }; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
168 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
169 /* A reasonable upper bound for the buffer used in debug output. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
170 enum { DBGBUFSIZE = 100 }; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
171 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
172 enum { BILLION = 1000000000, LOG10_BILLION = 9 }; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
173 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
174 /* Relative times. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
175 typedef struct |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
176 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
177 /* Relative year, month, day, hour, minutes, seconds, and nanoseconds. */ |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
178 intmax_t year; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
179 intmax_t month; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
180 intmax_t day; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
181 intmax_t hour; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
182 intmax_t minutes; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
183 intmax_t seconds; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
184 int ns; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
185 } relative_time; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
186 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
187 #if HAVE_COMPOUND_LITERALS |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
188 # define RELATIVE_TIME_0 ((relative_time) { 0, 0, 0, 0, 0, 0, 0 }) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
189 #else |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
190 static relative_time const RELATIVE_TIME_0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
191 #endif |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
192 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
193 /* Information passed to and from the parser. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
194 typedef struct |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
195 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
196 /* The input string remaining to be parsed. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
197 const char *input; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
198 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
199 /* N, if this is the Nth Tuesday. */ |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
200 intmax_t day_ordinal; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
201 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
202 /* Day of week; Sunday is 0. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
203 int day_number; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
204 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
205 /* tm_isdst flag for the local zone. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
206 int local_isdst; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
207 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
208 /* Time zone, in seconds east of UT. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
209 int time_zone; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
210 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
211 /* Style used for time. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
212 int meridian; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
213 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
214 /* Gregorian year, month, day, hour, minutes, seconds, and nanoseconds. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
215 textint year; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
216 intmax_t month; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
217 intmax_t day; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
218 intmax_t hour; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
219 intmax_t minutes; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
220 struct timespec seconds; /* includes nanoseconds */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
221 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
222 /* Relative year, month, day, hour, minutes, seconds, and nanoseconds. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
223 relative_time rel; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
224 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
225 /* Presence or counts of nonterminals of various flavors parsed so far. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
226 bool timespec_seen; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
227 bool rels_seen; |
18804
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
228 ptrdiff_t dates_seen; |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
229 ptrdiff_t days_seen; |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
230 ptrdiff_t local_zones_seen; |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
231 ptrdiff_t dsts_seen; |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
232 ptrdiff_t times_seen; |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
233 ptrdiff_t zones_seen; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
234 bool year_seen; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
235 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
236 /* Print debugging output to stderr. */ |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
237 bool parse_datetime_debug; |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
238 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
239 /* Which of the 'seen' parts have been printed when debugging. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
240 bool debug_dates_seen; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
241 bool debug_days_seen; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
242 bool debug_local_zones_seen; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
243 bool debug_times_seen; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
244 bool debug_zones_seen; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
245 bool debug_year_seen; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
246 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
247 /* The user specified explicit ordinal day value. */ |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
248 bool debug_ordinal_day_seen; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
249 |
16358 | 250 /* Table of local time zone abbreviations, terminated by a null entry. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
251 table local_time_zone_table[3]; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
252 } parser_control; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
253 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
254 union YYSTYPE; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
255 static int yylex (union YYSTYPE *, parser_control *); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
256 static int yyerror (parser_control const *, char const *); |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
257 static bool time_zone_hhmm (parser_control *, textint, intmax_t); |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
258 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
259 /* Extract into *PC any date and time info from a string of digits |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
260 of the form e.g., YYYYMMDD, YYMMDD, HHMM, HH (and sometimes YYY, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
261 YYYY, ...). */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
262 static void |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
263 digits_to_date_time (parser_control *pc, textint text_int) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
264 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
265 if (pc->dates_seen && ! pc->year.digits |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
266 && ! pc->rels_seen && (pc->times_seen || 2 < text_int.digits)) |
18645
3a6160f59728
parse-datetime: fix debug message on lone year number
Assaf Gordon <assafgordon@gmail.com>
parents:
18644
diff
changeset
|
267 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
268 pc->year_seen = true; |
18645
3a6160f59728
parse-datetime: fix debug message on lone year number
Assaf Gordon <assafgordon@gmail.com>
parents:
18644
diff
changeset
|
269 pc->year = text_int; |
3a6160f59728
parse-datetime: fix debug message on lone year number
Assaf Gordon <assafgordon@gmail.com>
parents:
18644
diff
changeset
|
270 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
271 else |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
272 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
273 if (4 < text_int.digits) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
274 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
275 pc->dates_seen++; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
276 pc->day = text_int.value % 100; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
277 pc->month = (text_int.value / 100) % 100; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
278 pc->year.value = text_int.value / 10000; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
279 pc->year.digits = text_int.digits - 4; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
280 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
281 else |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
282 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
283 pc->times_seen++; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
284 if (text_int.digits <= 2) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
285 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
286 pc->hour = text_int.value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
287 pc->minutes = 0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
288 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
289 else |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
290 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
291 pc->hour = text_int.value / 100; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
292 pc->minutes = text_int.value % 100; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
293 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
294 pc->seconds.tv_sec = 0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
295 pc->seconds.tv_nsec = 0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
296 pc->meridian = MER24; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
297 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
298 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
299 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
300 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
301 /* Increment PC->rel by FACTOR * REL (FACTOR is 1 or -1). Return true |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
302 if successful, false if an overflow occurred. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
303 static bool |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
304 apply_relative_time (parser_control *pc, relative_time rel, int factor) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
305 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
306 if (factor < 0 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
307 ? (INT_SUBTRACT_WRAPV (pc->rel.ns, rel.ns, &pc->rel.ns) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
308 | INT_SUBTRACT_WRAPV (pc->rel.seconds, rel.seconds, &pc->rel.seconds) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
309 | INT_SUBTRACT_WRAPV (pc->rel.minutes, rel.minutes, &pc->rel.minutes) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
310 | INT_SUBTRACT_WRAPV (pc->rel.hour, rel.hour, &pc->rel.hour) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
311 | INT_SUBTRACT_WRAPV (pc->rel.day, rel.day, &pc->rel.day) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
312 | INT_SUBTRACT_WRAPV (pc->rel.month, rel.month, &pc->rel.month) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
313 | INT_SUBTRACT_WRAPV (pc->rel.year, rel.year, &pc->rel.year)) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
314 : (INT_ADD_WRAPV (pc->rel.ns, rel.ns, &pc->rel.ns) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
315 | INT_ADD_WRAPV (pc->rel.seconds, rel.seconds, &pc->rel.seconds) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
316 | INT_ADD_WRAPV (pc->rel.minutes, rel.minutes, &pc->rel.minutes) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
317 | INT_ADD_WRAPV (pc->rel.hour, rel.hour, &pc->rel.hour) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
318 | INT_ADD_WRAPV (pc->rel.day, rel.day, &pc->rel.day) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
319 | INT_ADD_WRAPV (pc->rel.month, rel.month, &pc->rel.month) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
320 | INT_ADD_WRAPV (pc->rel.year, rel.year, &pc->rel.year))) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
321 return false; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
322 pc->rels_seen = true; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
323 return true; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
324 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
325 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
326 /* Set PC-> hour, minutes, seconds and nanoseconds members from arguments. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
327 static void |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
328 set_hhmmss (parser_control *pc, intmax_t hour, intmax_t minutes, |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
329 time_t sec, int nsec) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
330 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
331 pc->hour = hour; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
332 pc->minutes = minutes; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
333 pc->seconds.tv_sec = sec; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
334 pc->seconds.tv_nsec = nsec; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
335 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
336 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
337 /* Return a textual representation of the day ordinal/number values |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
338 in the parser_control struct (e.g., "last wed", "this tues", "thu"). */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
339 static const char * |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
340 str_days (parser_control *pc, char *buffer, int n) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
341 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
342 /* TODO: use relative_time_table for reverse lookup. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
343 static char const ordinal_values[][11] = { |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
344 "last", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
345 "this", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
346 "next/first", |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
347 "(SECOND)", /* SECOND is commented out in relative_time_table. */ |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
348 "third", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
349 "fourth", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
350 "fifth", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
351 "sixth", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
352 "seventh", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
353 "eight", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
354 "ninth", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
355 "tenth", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
356 "eleventh", |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
357 "twelfth" |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
358 }; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
359 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
360 static char const days_values[][4] = { |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
361 "Sun", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
362 "Mon", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
363 "Tue", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
364 "Wed", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
365 "Thu", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
366 "Fri", |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
367 "Sat" |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
368 }; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
369 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
370 int len; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
371 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
372 /* Don't add an ordinal prefix if the user didn't specify it |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
373 (e.g., "this wed" vs "wed"). */ |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
374 if (pc->debug_ordinal_day_seen) |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
375 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
376 /* Use word description if possible (e.g., -1 = last, 3 = third). */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
377 len = (-1 <= pc->day_ordinal && pc->day_ordinal <= 12 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
378 ? snprintf (buffer, n, "%s", ordinal_values[pc->day_ordinal + 1]) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
379 : snprintf (buffer, n, "%"PRIdMAX, pc->day_ordinal)); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
380 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
381 else |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
382 { |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
383 buffer[0] = '\0'; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
384 len = 0; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
385 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
386 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
387 /* Add the day name */ |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
388 if (0 <= pc->day_number && pc->day_number <= 6 && 0 <= len && len < n) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
389 snprintf (buffer + len, n - len, &" %s"[len == 0], |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
390 days_values[pc->day_number]); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
391 else |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
392 { |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
393 /* invalid day_number value - should never happen */ |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
394 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
395 return buffer; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
396 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
397 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
398 /* Convert a time zone to its string representation. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
399 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
400 enum { TIME_ZONE_BUFSIZE = INT_STRLEN_BOUND (intmax_t) + sizeof ":MM:SS" } ; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
401 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
402 static char const * |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
403 time_zone_str (int time_zone, char time_zone_buf[TIME_ZONE_BUFSIZE]) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
404 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
405 char *p = time_zone_buf; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
406 char sign = time_zone < 0 ? '-' : '+'; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
407 int hour = abs (time_zone / (60 * 60)); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
408 p += sprintf (time_zone_buf, "%c%02d", sign, hour); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
409 int offset_from_hour = abs (time_zone % (60 * 60)); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
410 if (offset_from_hour != 0) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
411 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
412 int mm = offset_from_hour / 60; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
413 int ss = offset_from_hour % 60; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
414 *p++ = ':'; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
415 *p++ = '0' + mm / 10; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
416 *p++ = '0' + mm % 10; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
417 if (ss) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
418 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
419 *p++ = ':'; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
420 *p++ = '0' + ss / 10; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
421 *p++ = '0' + ss % 10; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
422 } |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
423 *p = '\0'; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
424 } |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
425 return time_zone_buf; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
426 } |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
427 |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
428 /* debugging: print the current time in the parser_control structure. |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
429 The parser will increment "*_seen" members for those which were parsed. |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
430 This function will print only newly seen parts. */ |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
431 static void |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
432 debug_print_current_time (char const *item, parser_control *pc) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
433 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
434 bool space = false; |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
435 |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
436 if (!pc->parse_datetime_debug) |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
437 return; |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
438 |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
439 /* no newline, more items printed below */ |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
440 dbg_printf (_("parsed %s part: "), item); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
441 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
442 if (pc->dates_seen && !pc->debug_dates_seen) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
443 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
444 /*TODO: use pc->year.negative? */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
445 fprintf (stderr, "(Y-M-D) %04"PRIdMAX"-%02"PRIdMAX"-%02"PRIdMAX, |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
446 pc->year.value, pc->month, pc->day); |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
447 pc->debug_dates_seen = true; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
448 space = true; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
449 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
450 |
18645
3a6160f59728
parse-datetime: fix debug message on lone year number
Assaf Gordon <assafgordon@gmail.com>
parents:
18644
diff
changeset
|
451 if (pc->year_seen != pc->debug_year_seen) |
3a6160f59728
parse-datetime: fix debug message on lone year number
Assaf Gordon <assafgordon@gmail.com>
parents:
18644
diff
changeset
|
452 { |
3a6160f59728
parse-datetime: fix debug message on lone year number
Assaf Gordon <assafgordon@gmail.com>
parents:
18644
diff
changeset
|
453 if (space) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
454 fputc (' ', stderr); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
455 fprintf (stderr, _("year: %04"PRIdMAX), pc->year.value); |
18645
3a6160f59728
parse-datetime: fix debug message on lone year number
Assaf Gordon <assafgordon@gmail.com>
parents:
18644
diff
changeset
|
456 |
3a6160f59728
parse-datetime: fix debug message on lone year number
Assaf Gordon <assafgordon@gmail.com>
parents:
18644
diff
changeset
|
457 pc->debug_year_seen = pc->year_seen; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
458 space = true; |
18645
3a6160f59728
parse-datetime: fix debug message on lone year number
Assaf Gordon <assafgordon@gmail.com>
parents:
18644
diff
changeset
|
459 } |
3a6160f59728
parse-datetime: fix debug message on lone year number
Assaf Gordon <assafgordon@gmail.com>
parents:
18644
diff
changeset
|
460 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
461 if (pc->times_seen && !pc->debug_times_seen) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
462 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
463 intmax_t sec = pc->seconds.tv_sec; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
464 fprintf (stderr, &" %02"PRIdMAX":%02"PRIdMAX":%02"PRIdMAX[!space], |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
465 pc->hour, pc->minutes, sec); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
466 if (pc->seconds.tv_nsec != 0) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
467 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
468 int nsec = pc->seconds.tv_nsec; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
469 fprintf (stderr, ".%09d", nsec); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
470 } |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
471 if (pc->meridian == MERpm) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
472 fputs ("pm", stderr); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
473 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
474 pc->debug_times_seen = true; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
475 space = true; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
476 } |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
477 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
478 if (pc->days_seen && !pc->debug_days_seen) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
479 { |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
480 if (space) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
481 fputc (' ', stderr); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
482 char tmp[DBGBUFSIZE]; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
483 fprintf (stderr, _("%s (day ordinal=%"PRIdMAX" number=%d)"), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
484 str_days (pc, tmp, sizeof tmp), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
485 pc->day_ordinal, pc->day_number); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
486 pc->debug_days_seen = true; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
487 space = true; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
488 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
489 |
18644
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
490 /* local zone strings only change the DST settings, |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
491 not the timezone value. If seen, inform about the DST. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
492 if (pc->local_zones_seen && !pc->debug_local_zones_seen) |
18644
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
493 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
494 fprintf (stderr, &" isdst=%d%s"[!space], |
39722
f7fc45eece35
Continue to use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
39719
diff
changeset
|
495 pc->local_isdst, pc->dsts_seen ? " DST" : ""); |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
496 pc->debug_local_zones_seen = true; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
497 space = true; |
18644
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
498 } |
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
499 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
500 if (pc->zones_seen && !pc->debug_zones_seen) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
501 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
502 char time_zone_buf[TIME_ZONE_BUFSIZE]; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
503 fprintf (stderr, &" UTC%s"[!space], |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
504 time_zone_str (pc->time_zone, time_zone_buf)); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
505 pc->debug_zones_seen = true; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
506 space = true; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
507 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
508 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
509 if (pc->timespec_seen) |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
510 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
511 intmax_t sec = pc->seconds.tv_sec; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
512 if (space) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
513 fputc (' ', stderr); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
514 fprintf (stderr, _("number of seconds: %"PRIdMAX), sec); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
515 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
516 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
517 fputc ('\n', stderr); |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
518 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
519 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
520 /* Debugging: print the current relative values. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
521 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
522 static bool |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
523 print_rel_part (bool space, intmax_t val, char const *name) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
524 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
525 if (val == 0) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
526 return space; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
527 fprintf (stderr, &" %+"PRIdMAX" %s"[!space], val, name); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
528 return true; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
529 } |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
530 |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
531 static void |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
532 debug_print_relative_time (char const *item, parser_control const *pc) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
533 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
534 bool space = false; |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
535 |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
536 if (!pc->parse_datetime_debug) |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
537 return; |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
538 |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
539 /* no newline, more items printed below */ |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
540 dbg_printf (_("parsed %s part: "), item); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
541 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
542 if (pc->rel.year == 0 && pc->rel.month == 0 && pc->rel.day == 0 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
543 && pc->rel.hour == 0 && pc->rel.minutes == 0 && pc->rel.seconds == 0 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
544 && pc->rel.ns == 0) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
545 { |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
546 /* Special case: relative time of this/today/now */ |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
547 fputs (_("today/this/now\n"), stderr); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
548 return; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
549 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
550 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
551 space = print_rel_part (space, pc->rel.year, "year(s)"); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
552 space = print_rel_part (space, pc->rel.month, "month(s)"); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
553 space = print_rel_part (space, pc->rel.day, "day(s)"); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
554 space = print_rel_part (space, pc->rel.hour, "hour(s)"); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
555 space = print_rel_part (space, pc->rel.minutes, "minutes"); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
556 space = print_rel_part (space, pc->rel.seconds, "seconds"); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
557 print_rel_part (space, pc->rel.ns, "nanoseconds"); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
558 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
559 fputc ('\n', stderr); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
560 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
561 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
562 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
563 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
564 %} |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
565 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
566 /* We want a reentrant parser, even if the TZ manipulation and the calls to |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
567 localtime and gmtime are not reentrant. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
568 %pure-parser |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
569 %parse-param { parser_control *pc } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
570 %lex-param { parser_control *pc } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
571 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
572 /* This grammar has 31 shift/reduce conflicts. */ |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
573 %expect 31 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
574 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
575 %union |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
576 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
577 intmax_t intval; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
578 textint textintval; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
579 struct timespec timespec; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
580 relative_time rel; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
581 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
582 |
15662
410c1c383d50
date: accept 'hence' as opposite of 'ago'
Eric Blake <eblake@redhat.com>
parents:
15544
diff
changeset
|
583 %token <intval> tAGO |
410c1c383d50
date: accept 'hence' as opposite of 'ago'
Eric Blake <eblake@redhat.com>
parents:
15544
diff
changeset
|
584 %token tDST |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
585 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
586 %token tYEAR_UNIT tMONTH_UNIT tHOUR_UNIT tMINUTE_UNIT tSEC_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
587 %token <intval> tDAY_UNIT tDAY_SHIFT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
588 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
589 %token <intval> tDAY tDAYZONE tLOCAL_ZONE tMERIDIAN |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
590 %token <intval> tMONTH tORDINAL tZONE |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
591 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
592 %token <textintval> tSNUMBER tUNUMBER |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
593 %token <timespec> tSDECIMAL_NUMBER tUDECIMAL_NUMBER |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
594 |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
595 %type <intval> o_colon_minutes |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
596 %type <timespec> seconds signed_seconds unsigned_seconds |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
597 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
598 %type <rel> relunit relunit_snumber dayshift |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
599 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
600 %% |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
601 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
602 spec: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
603 timespec |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
604 | items |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
605 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
606 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
607 timespec: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
608 '@' seconds |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
609 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
610 pc->seconds = $2; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
611 pc->timespec_seen = true; |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
612 debug_print_current_time (_("number of seconds"), pc); |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
613 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
614 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
615 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
616 items: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
617 /* empty */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
618 | items item |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
619 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
620 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
621 item: |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
622 datetime |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
623 { |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
624 pc->times_seen++; pc->dates_seen++; |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
625 debug_print_current_time (_("datetime"), pc); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
626 } |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
627 | time |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
628 { |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
629 pc->times_seen++; |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
630 debug_print_current_time (_("time"), pc); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
631 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
632 | local_zone |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
633 { |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
634 pc->local_zones_seen++; |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
635 debug_print_current_time (_("local_zone"), pc); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
636 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
637 | zone |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
638 { |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
639 pc->zones_seen++; |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
640 debug_print_current_time (_("zone"), pc); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
641 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
642 | date |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
643 { |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
644 pc->dates_seen++; |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
645 debug_print_current_time (_("date"), pc); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
646 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
647 | day |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
648 { |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
649 pc->days_seen++; |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
650 debug_print_current_time (_("day"), pc); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
651 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
652 | rel |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
653 { |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
654 debug_print_relative_time (_("relative"), pc); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
655 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
656 | number |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
657 { |
18640
dc370c41914f
parse-datetime: fix incorrect debug message on lone number
Assaf Gordon <assafgordon@gmail.com>
parents:
18626
diff
changeset
|
658 debug_print_current_time (_("number"), pc); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
659 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
660 | hybrid |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
661 { |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
662 debug_print_relative_time (_("hybrid"), pc); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
663 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
664 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
665 |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
666 datetime: |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
667 iso_8601_datetime |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
668 ; |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
669 |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
670 iso_8601_datetime: |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
671 iso_8601_date 'T' iso_8601_time |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
672 ; |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
673 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
674 time: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
675 tUNUMBER tMERIDIAN |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
676 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
677 set_hhmmss (pc, $1.value, 0, 0, 0); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
678 pc->meridian = $2; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
679 } |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
680 | tUNUMBER ':' tUNUMBER tMERIDIAN |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
681 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
682 set_hhmmss (pc, $1.value, $3.value, 0, 0); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
683 pc->meridian = $4; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
684 } |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
685 | tUNUMBER ':' tUNUMBER ':' unsigned_seconds tMERIDIAN |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
686 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
687 set_hhmmss (pc, $1.value, $3.value, $5.tv_sec, $5.tv_nsec); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
688 pc->meridian = $6; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
689 } |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
690 | iso_8601_time |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
691 ; |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
692 |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
693 iso_8601_time: |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
694 tUNUMBER zone_offset |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
695 { |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
696 set_hhmmss (pc, $1.value, 0, 0, 0); |
15544
c2b10d683d4c
maint: indent with spaces, not TABs
Jim Meyering <meyering@redhat.com>
parents:
15542
diff
changeset
|
697 pc->meridian = MER24; |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
698 } |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
699 | tUNUMBER ':' tUNUMBER o_zone_offset |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
700 { |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
701 set_hhmmss (pc, $1.value, $3.value, 0, 0); |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
702 pc->meridian = MER24; |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
703 } |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
704 | tUNUMBER ':' tUNUMBER ':' unsigned_seconds o_zone_offset |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
705 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
706 set_hhmmss (pc, $1.value, $3.value, $5.tv_sec, $5.tv_nsec); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
707 pc->meridian = MER24; |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
708 } |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
709 ; |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
710 |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
711 o_zone_offset: |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
712 /* empty */ |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
713 | zone_offset |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
714 ; |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
715 |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
716 zone_offset: |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
717 tSNUMBER o_colon_minutes |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
718 { |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
719 pc->zones_seen++; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
720 if (! time_zone_hhmm (pc, $1, $2)) YYABORT; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
721 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
722 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
723 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
724 /* Local zone strings affect only the DST setting, and take effect |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
725 only if the current TZ setting is relevant. |
18644
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
726 |
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
727 Example 1: |
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
728 'EEST' is parsed as tLOCAL_ZONE, as it relates to the effective TZ: |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
729 TZ='Europe/Helsinki' date -d '2016-06-30 EEST' |
18644
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
730 |
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
731 Example 2: |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
732 'EEST' is parsed as tDAYZONE: |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
733 TZ='Asia/Tokyo' date -d '2016-06-30 EEST' |
18644
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
734 |
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
735 This is implemented by probing the next three calendar quarters |
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
736 of the effective timezone and looking for DST changes - |
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
737 if found, the timezone name (EEST) is inserted into |
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
738 the lexical lookup table with type tLOCAL_ZONE. |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
739 (Search for 'quarter' comment in 'parse_datetime2'.) |
18644
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
740 */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
741 local_zone: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
742 tLOCAL_ZONE |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
743 { pc->local_isdst = $1; } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
744 | tLOCAL_ZONE tDST |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
745 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
746 pc->local_isdst = 1; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
747 pc->dsts_seen++; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
748 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
749 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
750 |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
751 /* Note 'T' is a special case, as it is used as the separator in ISO |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
752 8601 date and time of day representation. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
753 zone: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
754 tZONE |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
755 { pc->time_zone = $1; } |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
756 | 'T' |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
757 { pc->time_zone = HOUR (7); } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
758 | tZONE relunit_snumber |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
759 { pc->time_zone = $1; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
760 if (! apply_relative_time (pc, $2, 1)) YYABORT; |
18641
740edfed098e
parse-datetime: fix debug message of relative part after timezone
Assaf Gordon <assafgordon@gmail.com>
parents:
18640
diff
changeset
|
761 debug_print_relative_time (_("relative"), pc); |
740edfed098e
parse-datetime: fix debug message of relative part after timezone
Assaf Gordon <assafgordon@gmail.com>
parents:
18640
diff
changeset
|
762 } |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
763 | 'T' relunit_snumber |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
764 { pc->time_zone = HOUR (7); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
765 if (! apply_relative_time (pc, $2, 1)) YYABORT; |
18641
740edfed098e
parse-datetime: fix debug message of relative part after timezone
Assaf Gordon <assafgordon@gmail.com>
parents:
18640
diff
changeset
|
766 debug_print_relative_time (_("relative"), pc); |
740edfed098e
parse-datetime: fix debug message of relative part after timezone
Assaf Gordon <assafgordon@gmail.com>
parents:
18640
diff
changeset
|
767 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
768 | tZONE tSNUMBER o_colon_minutes |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
769 { if (! time_zone_hhmm (pc, $2, $3)) YYABORT; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
770 if (INT_ADD_WRAPV (pc->time_zone, $1, &pc->time_zone)) YYABORT; } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
771 | tDAYZONE |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
772 { pc->time_zone = $1 + 60 * 60; } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
773 | tZONE tDST |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
774 { pc->time_zone = $1 + 60 * 60; } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
775 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
776 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
777 day: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
778 tDAY |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
779 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
780 pc->day_ordinal = 0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
781 pc->day_number = $1; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
782 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
783 | tDAY ',' |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
784 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
785 pc->day_ordinal = 0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
786 pc->day_number = $1; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
787 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
788 | tORDINAL tDAY |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
789 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
790 pc->day_ordinal = $1; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
791 pc->day_number = $2; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
792 pc->debug_ordinal_day_seen = true; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
793 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
794 | tUNUMBER tDAY |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
795 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
796 pc->day_ordinal = $1.value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
797 pc->day_number = $2; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
798 pc->debug_ordinal_day_seen = true; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
799 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
800 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
801 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
802 date: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
803 tUNUMBER '/' tUNUMBER |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
804 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
805 pc->month = $1.value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
806 pc->day = $3.value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
807 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
808 | tUNUMBER '/' tUNUMBER '/' tUNUMBER |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
809 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
810 /* Interpret as YYYY/MM/DD if the first value has 4 or more digits, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
811 otherwise as MM/DD/YY. |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
812 The goal in recognizing YYYY/MM/DD is solely to support legacy |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
813 machine-generated dates like those in an RCS log listing. If |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
814 you want portability, use the ISO 8601 format. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
815 if (4 <= $1.digits) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
816 { |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
817 if (pc->parse_datetime_debug) |
18804
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
818 { |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
819 intmax_t digits = $1.digits; |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
820 dbg_printf (_("warning: value %"PRIdMAX" has %"PRIdMAX" digits. " |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
821 "Assuming YYYY/MM/DD\n"), |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
822 $1.value, digits); |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
823 } |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
824 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
825 pc->year = $1; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
826 pc->month = $3.value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
827 pc->day = $5.value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
828 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
829 else |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
830 { |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
831 if (pc->parse_datetime_debug) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
832 dbg_printf (_("warning: value %"PRIdMAX" has less than 4 digits. " |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
833 "Assuming MM/DD/YY[YY]\n"), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
834 $1.value); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
835 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
836 pc->month = $1.value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
837 pc->day = $3.value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
838 pc->year = $5; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
839 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
840 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
841 | tUNUMBER tMONTH tSNUMBER |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
842 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
843 /* E.g., 17-JUN-1992. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
844 pc->day = $1.value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
845 pc->month = $2; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
846 if (INT_SUBTRACT_WRAPV (0, $3.value, &pc->year.value)) YYABORT; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
847 pc->year.digits = $3.digits; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
848 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
849 | tMONTH tSNUMBER tSNUMBER |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
850 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
851 /* E.g., JUN-17-1992. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
852 pc->month = $1; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
853 if (INT_SUBTRACT_WRAPV (0, $2.value, &pc->day)) YYABORT; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
854 if (INT_SUBTRACT_WRAPV (0, $3.value, &pc->year.value)) YYABORT; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
855 pc->year.digits = $3.digits; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
856 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
857 | tMONTH tUNUMBER |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
858 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
859 pc->month = $1; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
860 pc->day = $2.value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
861 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
862 | tMONTH tUNUMBER ',' tUNUMBER |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
863 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
864 pc->month = $1; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
865 pc->day = $2.value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
866 pc->year = $4; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
867 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
868 | tUNUMBER tMONTH |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
869 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
870 pc->day = $1.value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
871 pc->month = $2; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
872 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
873 | tUNUMBER tMONTH tUNUMBER |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
874 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
875 pc->day = $1.value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
876 pc->month = $2; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
877 pc->year = $3; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
878 } |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
879 | iso_8601_date |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
880 ; |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
881 |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
882 iso_8601_date: |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
883 tUNUMBER tSNUMBER tSNUMBER |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
884 { |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
885 /* ISO 8601 format. YYYY-MM-DD. */ |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
886 pc->year = $1; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
887 if (INT_SUBTRACT_WRAPV (0, $2.value, &pc->month)) YYABORT; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
888 if (INT_SUBTRACT_WRAPV (0, $3.value, &pc->day)) YYABORT; |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
889 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
890 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
891 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
892 rel: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
893 relunit tAGO |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
894 { if (! apply_relative_time (pc, $1, $2)) YYABORT; } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
895 | relunit |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
896 { if (! apply_relative_time (pc, $1, 1)) YYABORT; } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
897 | dayshift |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
898 { if (! apply_relative_time (pc, $1, 1)) YYABORT; } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
899 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
900 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
901 relunit: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
902 tORDINAL tYEAR_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
903 { $$ = RELATIVE_TIME_0; $$.year = $1; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
904 | tUNUMBER tYEAR_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
905 { $$ = RELATIVE_TIME_0; $$.year = $1.value; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
906 | tYEAR_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
907 { $$ = RELATIVE_TIME_0; $$.year = 1; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
908 | tORDINAL tMONTH_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
909 { $$ = RELATIVE_TIME_0; $$.month = $1; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
910 | tUNUMBER tMONTH_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
911 { $$ = RELATIVE_TIME_0; $$.month = $1.value; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
912 | tMONTH_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
913 { $$ = RELATIVE_TIME_0; $$.month = 1; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
914 | tORDINAL tDAY_UNIT |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
915 { $$ = RELATIVE_TIME_0; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
916 if (INT_MULTIPLY_WRAPV ($1, $2, &$$.day)) YYABORT; } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
917 | tUNUMBER tDAY_UNIT |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
918 { $$ = RELATIVE_TIME_0; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
919 if (INT_MULTIPLY_WRAPV ($1.value, $2, &$$.day)) YYABORT; } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
920 | tDAY_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
921 { $$ = RELATIVE_TIME_0; $$.day = $1; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
922 | tORDINAL tHOUR_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
923 { $$ = RELATIVE_TIME_0; $$.hour = $1; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
924 | tUNUMBER tHOUR_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
925 { $$ = RELATIVE_TIME_0; $$.hour = $1.value; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
926 | tHOUR_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
927 { $$ = RELATIVE_TIME_0; $$.hour = 1; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
928 | tORDINAL tMINUTE_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
929 { $$ = RELATIVE_TIME_0; $$.minutes = $1; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
930 | tUNUMBER tMINUTE_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
931 { $$ = RELATIVE_TIME_0; $$.minutes = $1.value; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
932 | tMINUTE_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
933 { $$ = RELATIVE_TIME_0; $$.minutes = 1; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
934 | tORDINAL tSEC_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
935 { $$ = RELATIVE_TIME_0; $$.seconds = $1; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
936 | tUNUMBER tSEC_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
937 { $$ = RELATIVE_TIME_0; $$.seconds = $1.value; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
938 | tSDECIMAL_NUMBER tSEC_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
939 { $$ = RELATIVE_TIME_0; $$.seconds = $1.tv_sec; $$.ns = $1.tv_nsec; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
940 | tUDECIMAL_NUMBER tSEC_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
941 { $$ = RELATIVE_TIME_0; $$.seconds = $1.tv_sec; $$.ns = $1.tv_nsec; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
942 | tSEC_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
943 { $$ = RELATIVE_TIME_0; $$.seconds = 1; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
944 | relunit_snumber |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
945 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
946 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
947 relunit_snumber: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
948 tSNUMBER tYEAR_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
949 { $$ = RELATIVE_TIME_0; $$.year = $1.value; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
950 | tSNUMBER tMONTH_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
951 { $$ = RELATIVE_TIME_0; $$.month = $1.value; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
952 | tSNUMBER tDAY_UNIT |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
953 { $$ = RELATIVE_TIME_0; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
954 if (INT_MULTIPLY_WRAPV ($1.value, $2, &$$.day)) YYABORT; } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
955 | tSNUMBER tHOUR_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
956 { $$ = RELATIVE_TIME_0; $$.hour = $1.value; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
957 | tSNUMBER tMINUTE_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
958 { $$ = RELATIVE_TIME_0; $$.minutes = $1.value; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
959 | tSNUMBER tSEC_UNIT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
960 { $$ = RELATIVE_TIME_0; $$.seconds = $1.value; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
961 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
962 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
963 dayshift: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
964 tDAY_SHIFT |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
965 { $$ = RELATIVE_TIME_0; $$.day = $1; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
966 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
967 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
968 seconds: signed_seconds | unsigned_seconds; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
969 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
970 signed_seconds: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
971 tSDECIMAL_NUMBER |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
972 | tSNUMBER |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
973 { if (time_overflow ($1.value)) YYABORT; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
974 $$.tv_sec = $1.value; $$.tv_nsec = 0; } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
975 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
976 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
977 unsigned_seconds: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
978 tUDECIMAL_NUMBER |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
979 | tUNUMBER |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
980 { if (time_overflow ($1.value)) YYABORT; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
981 $$.tv_sec = $1.value; $$.tv_nsec = 0; } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
982 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
983 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
984 number: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
985 tUNUMBER |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
986 { digits_to_date_time (pc, $1); } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
987 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
988 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
989 hybrid: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
990 tUNUMBER relunit_snumber |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
991 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
992 /* Hybrid all-digit and relative offset, so that we accept e.g., |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
993 "YYYYMMDD +N days" as well as "YYYYMMDD N days". */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
994 digits_to_date_time (pc, $1); |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
995 if (! apply_relative_time (pc, $2, 1)) YYABORT; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
996 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
997 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
998 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
999 o_colon_minutes: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1000 /* empty */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1001 { $$ = -1; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1002 | ':' tUNUMBER |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1003 { $$ = $2.value; } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1004 ; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1005 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1006 %% |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1007 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1008 static table const meridian_table[] = |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1009 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1010 { "AM", tMERIDIAN, MERam }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1011 { "A.M.", tMERIDIAN, MERam }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1012 { "PM", tMERIDIAN, MERpm }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1013 { "P.M.", tMERIDIAN, MERpm }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1014 { NULL, 0, 0 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1015 }; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1016 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1017 static table const dst_table[] = |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1018 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1019 { "DST", tDST, 0 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1020 }; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1021 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1022 static table const month_and_day_table[] = |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1023 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1024 { "JANUARY", tMONTH, 1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1025 { "FEBRUARY", tMONTH, 2 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1026 { "MARCH", tMONTH, 3 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1027 { "APRIL", tMONTH, 4 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1028 { "MAY", tMONTH, 5 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1029 { "JUNE", tMONTH, 6 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1030 { "JULY", tMONTH, 7 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1031 { "AUGUST", tMONTH, 8 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1032 { "SEPTEMBER",tMONTH, 9 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1033 { "SEPT", tMONTH, 9 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1034 { "OCTOBER", tMONTH, 10 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1035 { "NOVEMBER", tMONTH, 11 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1036 { "DECEMBER", tMONTH, 12 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1037 { "SUNDAY", tDAY, 0 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1038 { "MONDAY", tDAY, 1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1039 { "TUESDAY", tDAY, 2 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1040 { "TUES", tDAY, 2 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1041 { "WEDNESDAY",tDAY, 3 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1042 { "WEDNES", tDAY, 3 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1043 { "THURSDAY", tDAY, 4 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1044 { "THUR", tDAY, 4 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1045 { "THURS", tDAY, 4 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1046 { "FRIDAY", tDAY, 5 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1047 { "SATURDAY", tDAY, 6 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1048 { NULL, 0, 0 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1049 }; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1050 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1051 static table const time_units_table[] = |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1052 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1053 { "YEAR", tYEAR_UNIT, 1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1054 { "MONTH", tMONTH_UNIT, 1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1055 { "FORTNIGHT",tDAY_UNIT, 14 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1056 { "WEEK", tDAY_UNIT, 7 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1057 { "DAY", tDAY_UNIT, 1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1058 { "HOUR", tHOUR_UNIT, 1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1059 { "MINUTE", tMINUTE_UNIT, 1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1060 { "MIN", tMINUTE_UNIT, 1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1061 { "SECOND", tSEC_UNIT, 1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1062 { "SEC", tSEC_UNIT, 1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1063 { NULL, 0, 0 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1064 }; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1065 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1066 /* Assorted relative-time words. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1067 static table const relative_time_table[] = |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1068 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1069 { "TOMORROW", tDAY_SHIFT, 1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1070 { "YESTERDAY",tDAY_SHIFT, -1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1071 { "TODAY", tDAY_SHIFT, 0 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1072 { "NOW", tDAY_SHIFT, 0 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1073 { "LAST", tORDINAL, -1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1074 { "THIS", tORDINAL, 0 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1075 { "NEXT", tORDINAL, 1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1076 { "FIRST", tORDINAL, 1 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1077 /*{ "SECOND", tORDINAL, 2 }, */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1078 { "THIRD", tORDINAL, 3 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1079 { "FOURTH", tORDINAL, 4 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1080 { "FIFTH", tORDINAL, 5 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1081 { "SIXTH", tORDINAL, 6 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1082 { "SEVENTH", tORDINAL, 7 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1083 { "EIGHTH", tORDINAL, 8 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1084 { "NINTH", tORDINAL, 9 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1085 { "TENTH", tORDINAL, 10 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1086 { "ELEVENTH", tORDINAL, 11 }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1087 { "TWELFTH", tORDINAL, 12 }, |
15662
410c1c383d50
date: accept 'hence' as opposite of 'ago'
Eric Blake <eblake@redhat.com>
parents:
15544
diff
changeset
|
1088 { "AGO", tAGO, -1 }, |
410c1c383d50
date: accept 'hence' as opposite of 'ago'
Eric Blake <eblake@redhat.com>
parents:
15544
diff
changeset
|
1089 { "HENCE", tAGO, 1 }, |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1090 { NULL, 0, 0 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1091 }; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1092 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1093 /* The universal time zone table. These labels can be used even for |
18663
caf9d6314c8f
maint: time stamp -> timestamp
Paul Eggert <eggert@cs.ucla.edu>
parents:
18645
diff
changeset
|
1094 timestamps that would not otherwise be valid, e.g., GMT timestamps |
caf9d6314c8f
maint: time stamp -> timestamp
Paul Eggert <eggert@cs.ucla.edu>
parents:
18645
diff
changeset
|
1095 oin London during summer. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1096 static table const universal_time_zone_table[] = |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1097 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1098 { "GMT", tZONE, HOUR ( 0) }, /* Greenwich Mean */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1099 { "UT", tZONE, HOUR ( 0) }, /* Universal (Coordinated) */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1100 { "UTC", tZONE, HOUR ( 0) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1101 { NULL, 0, 0 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1102 }; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1103 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1104 /* The time zone table. This table is necessarily incomplete, as time |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1105 zone abbreviations are ambiguous; e.g., Australians interpret "EST" |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1106 as Eastern time in Australia, not as US Eastern Standard Time. |
13770
d8cedb66335e
parse-datetime: do some more renaming
Paul Eggert <eggert@cs.ucla.edu>
parents:
13769
diff
changeset
|
1107 You cannot rely on parse_datetime to handle arbitrary time zone |
16235
18a38c9615f0
In commentary, do not use ` to quote.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16201
diff
changeset
|
1108 abbreviations; use numeric abbreviations like "-0500" instead. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1109 static table const time_zone_table[] = |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1110 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1111 { "WET", tZONE, HOUR ( 0) }, /* Western European */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1112 { "WEST", tDAYZONE, HOUR ( 0) }, /* Western European Summer */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1113 { "BST", tDAYZONE, HOUR ( 0) }, /* British Summer */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1114 { "ART", tZONE, -HOUR ( 3) }, /* Argentina */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1115 { "BRT", tZONE, -HOUR ( 3) }, /* Brazil */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1116 { "BRST", tDAYZONE, -HOUR ( 3) }, /* Brazil Summer */ |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1117 { "NST", tZONE, -(HOUR ( 3) + 30 * 60) }, /* Newfoundland Standard */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1118 { "NDT", tDAYZONE,-(HOUR ( 3) + 30 * 60) }, /* Newfoundland Daylight */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1119 { "AST", tZONE, -HOUR ( 4) }, /* Atlantic Standard */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1120 { "ADT", tDAYZONE, -HOUR ( 4) }, /* Atlantic Daylight */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1121 { "CLT", tZONE, -HOUR ( 4) }, /* Chile */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1122 { "CLST", tDAYZONE, -HOUR ( 4) }, /* Chile Summer */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1123 { "EST", tZONE, -HOUR ( 5) }, /* Eastern Standard */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1124 { "EDT", tDAYZONE, -HOUR ( 5) }, /* Eastern Daylight */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1125 { "CST", tZONE, -HOUR ( 6) }, /* Central Standard */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1126 { "CDT", tDAYZONE, -HOUR ( 6) }, /* Central Daylight */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1127 { "MST", tZONE, -HOUR ( 7) }, /* Mountain Standard */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1128 { "MDT", tDAYZONE, -HOUR ( 7) }, /* Mountain Daylight */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1129 { "PST", tZONE, -HOUR ( 8) }, /* Pacific Standard */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1130 { "PDT", tDAYZONE, -HOUR ( 8) }, /* Pacific Daylight */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1131 { "AKST", tZONE, -HOUR ( 9) }, /* Alaska Standard */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1132 { "AKDT", tDAYZONE, -HOUR ( 9) }, /* Alaska Daylight */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1133 { "HST", tZONE, -HOUR (10) }, /* Hawaii Standard */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1134 { "HAST", tZONE, -HOUR (10) }, /* Hawaii-Aleutian Standard */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1135 { "HADT", tDAYZONE, -HOUR (10) }, /* Hawaii-Aleutian Daylight */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1136 { "SST", tZONE, -HOUR (12) }, /* Samoa Standard */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1137 { "WAT", tZONE, HOUR ( 1) }, /* West Africa */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1138 { "CET", tZONE, HOUR ( 1) }, /* Central European */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1139 { "CEST", tDAYZONE, HOUR ( 1) }, /* Central European Summer */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1140 { "MET", tZONE, HOUR ( 1) }, /* Middle European */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1141 { "MEZ", tZONE, HOUR ( 1) }, /* Middle European */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1142 { "MEST", tDAYZONE, HOUR ( 1) }, /* Middle European Summer */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1143 { "MESZ", tDAYZONE, HOUR ( 1) }, /* Middle European Summer */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1144 { "EET", tZONE, HOUR ( 2) }, /* Eastern European */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1145 { "EEST", tDAYZONE, HOUR ( 2) }, /* Eastern European Summer */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1146 { "CAT", tZONE, HOUR ( 2) }, /* Central Africa */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1147 { "SAST", tZONE, HOUR ( 2) }, /* South Africa Standard */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1148 { "EAT", tZONE, HOUR ( 3) }, /* East Africa */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1149 { "MSK", tZONE, HOUR ( 3) }, /* Moscow */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1150 { "MSD", tDAYZONE, HOUR ( 3) }, /* Moscow Daylight */ |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1151 { "IST", tZONE, (HOUR ( 5) + 30 * 60) }, /* India Standard */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1152 { "SGT", tZONE, HOUR ( 8) }, /* Singapore */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1153 { "KST", tZONE, HOUR ( 9) }, /* Korea Standard */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1154 { "JST", tZONE, HOUR ( 9) }, /* Japan Standard */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1155 { "GST", tZONE, HOUR (10) }, /* Guam Standard */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1156 { "NZST", tZONE, HOUR (12) }, /* New Zealand Standard */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1157 { "NZDT", tDAYZONE, HOUR (12) }, /* New Zealand Daylight */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1158 { NULL, 0, 0 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1159 }; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1160 |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
1161 /* Military time zone table. |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
1162 |
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
1163 Note 'T' is a special case, as it is used as the separator in ISO |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1164 8601 date and time of day representation. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1165 static table const military_table[] = |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1166 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1167 { "A", tZONE, -HOUR ( 1) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1168 { "B", tZONE, -HOUR ( 2) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1169 { "C", tZONE, -HOUR ( 3) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1170 { "D", tZONE, -HOUR ( 4) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1171 { "E", tZONE, -HOUR ( 5) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1172 { "F", tZONE, -HOUR ( 6) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1173 { "G", tZONE, -HOUR ( 7) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1174 { "H", tZONE, -HOUR ( 8) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1175 { "I", tZONE, -HOUR ( 9) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1176 { "K", tZONE, -HOUR (10) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1177 { "L", tZONE, -HOUR (11) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1178 { "M", tZONE, -HOUR (12) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1179 { "N", tZONE, HOUR ( 1) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1180 { "O", tZONE, HOUR ( 2) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1181 { "P", tZONE, HOUR ( 3) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1182 { "Q", tZONE, HOUR ( 4) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1183 { "R", tZONE, HOUR ( 5) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1184 { "S", tZONE, HOUR ( 6) }, |
15542
9ad43fa113ac
parse-datetime: accept ISO 8601 date and time rep with "T" separator
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14843
diff
changeset
|
1185 { "T", 'T', 0 }, |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1186 { "U", tZONE, HOUR ( 8) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1187 { "V", tZONE, HOUR ( 9) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1188 { "W", tZONE, HOUR (10) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1189 { "X", tZONE, HOUR (11) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1190 { "Y", tZONE, HOUR (12) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1191 { "Z", tZONE, HOUR ( 0) }, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1192 { NULL, 0, 0 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1193 }; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1194 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1195 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1196 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1197 /* Convert a time zone expressed as HH:MM into an integer count of |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1198 seconds. If MM is negative, then S is of the form HHMM and needs |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1199 to be picked apart; otherwise, S is of the form HH. As specified in |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1200 http://www.opengroup.org/susv3xbd/xbd_chap08.html#tag_08_03, allow |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1201 only valid TZ range, and consider first two digits as hours, if no |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1202 minutes specified. Return true if successful. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1203 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1204 static bool |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1205 time_zone_hhmm (parser_control *pc, textint s, intmax_t mm) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1206 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1207 intmax_t n_minutes; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1208 bool overflow = false; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1209 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1210 /* If the length of S is 1 or 2 and no minutes are specified, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1211 interpret it as a number of hours. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1212 if (s.digits <= 2 && mm < 0) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1213 s.value *= 100; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1214 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1215 if (mm < 0) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1216 n_minutes = (s.value / 100) * 60 + s.value % 100; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1217 else |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1218 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1219 overflow |= INT_MULTIPLY_WRAPV (s.value, 60, &n_minutes); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1220 overflow |= (s.negative |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1221 ? INT_SUBTRACT_WRAPV (n_minutes, mm, &n_minutes) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1222 : INT_ADD_WRAPV (n_minutes, mm, &n_minutes)); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1223 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1224 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1225 if (overflow || ! (-24 * 60 <= n_minutes && n_minutes <= 24 * 60)) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1226 return false; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1227 pc->time_zone = n_minutes * 60; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1228 return true; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1229 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1230 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1231 static int |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1232 to_hour (intmax_t hours, int meridian) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1233 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1234 switch (meridian) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1235 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1236 default: /* Pacify GCC. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1237 case MER24: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1238 return 0 <= hours && hours < 24 ? hours : -1; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1239 case MERam: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1240 return 0 < hours && hours < 12 ? hours : hours == 12 ? 0 : -1; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1241 case MERpm: |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1242 return 0 < hours && hours < 12 ? hours + 12 : hours == 12 ? 12 : -1; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1243 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1244 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1245 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1246 enum { TM_YEAR_BASE = 1900 }; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1247 enum { TM_YEAR_BUFSIZE = INT_BUFSIZE_BOUND (int) + 1 }; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1248 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1249 /* Convert TM_YEAR, a year minus 1900, to a string that is numerically |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1250 correct even if subtracting 1900 would overflow. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1251 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1252 static char const * |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1253 tm_year_str (int tm_year, char buf[TM_YEAR_BUFSIZE]) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1254 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1255 verify (TM_YEAR_BASE % 100 == 0); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1256 sprintf (buf, &"-%02d%02d"[-TM_YEAR_BASE <= tm_year], |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1257 abs (tm_year / 100 + TM_YEAR_BASE / 100), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1258 abs (tm_year % 100)); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1259 return buf; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1260 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1261 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1262 /* Convert a text year number to a year minus 1900, working correctly |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1263 even if the input is in the range INT_MAX .. INT_MAX + 1900 - 1. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1264 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1265 static bool |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1266 to_tm_year (textint textyear, bool debug, int *tm_year) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1267 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1268 intmax_t year = textyear.value; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1269 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1270 /* XPG4 suggests that years 00-68 map to 2000-2068, and |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1271 years 69-99 map to 1969-1999. */ |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1272 if (0 <= year && textyear.digits == 2) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1273 { |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1274 year += year < 69 ? 2000 : 1900; |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1275 if (debug) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1276 dbg_printf (_("warning: adjusting year value %"PRIdMAX |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1277 " to %"PRIdMAX"\n"), |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1278 textyear.value, year); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1279 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1280 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1281 if (year < 0 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1282 ? INT_SUBTRACT_WRAPV (-TM_YEAR_BASE, year, tm_year) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1283 : INT_SUBTRACT_WRAPV (year, TM_YEAR_BASE, tm_year)) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1284 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1285 if (debug) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1286 dbg_printf (_("error: out-of-range year %"PRIdMAX"\n"), year); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1287 return false; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1288 } |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1289 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1290 return true; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1291 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1292 |
16128
6beadb731202
mark functions with const and pure attributes
Jim Meyering <meyering@redhat.com>
parents:
15662
diff
changeset
|
1293 static table const * _GL_ATTRIBUTE_PURE |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1294 lookup_zone (parser_control const *pc, char const *name) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1295 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1296 table const *tp; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1297 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1298 for (tp = universal_time_zone_table; tp->name; tp++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1299 if (strcmp (name, tp->name) == 0) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1300 return tp; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1301 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1302 /* Try local zone abbreviations before those in time_zone_table, as |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1303 the local ones are more likely to be right. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1304 for (tp = pc->local_time_zone_table; tp->name; tp++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1305 if (strcmp (name, tp->name) == 0) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1306 return tp; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1307 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1308 for (tp = time_zone_table; tp->name; tp++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1309 if (strcmp (name, tp->name) == 0) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1310 return tp; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1311 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1312 return NULL; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1313 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1314 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1315 #if ! HAVE_TM_GMTOFF |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1316 /* Yield the difference between *A and *B, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1317 measured in seconds, ignoring leap seconds. |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1318 The body of this function is taken directly from the GNU C Library; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1319 see strftime.c. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1320 static int |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1321 tm_diff (const struct tm *a, const struct tm *b) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1322 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1323 /* Compute intervening leap days correctly even if year is negative. |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1324 Take care to avoid int overflow in leap day calculations, |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1325 but it's OK to assume that A and B are close to each other. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1326 int a4 = SHR (a->tm_year, 2) + SHR (TM_YEAR_BASE, 2) - ! (a->tm_year & 3); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1327 int b4 = SHR (b->tm_year, 2) + SHR (TM_YEAR_BASE, 2) - ! (b->tm_year & 3); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1328 int a100 = a4 / 25 - (a4 % 25 < 0); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1329 int b100 = b4 / 25 - (b4 % 25 < 0); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1330 int a400 = SHR (a100, 2); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1331 int b400 = SHR (b100, 2); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1332 int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400); |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1333 int years = a->tm_year - b->tm_year; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1334 int days = (365 * years + intervening_leap_days |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1335 + (a->tm_yday - b->tm_yday)); |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1336 return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour)) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1337 + (a->tm_min - b->tm_min)) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1338 + (a->tm_sec - b->tm_sec)); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1339 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1340 #endif /* ! HAVE_TM_GMTOFF */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1341 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1342 static table const * |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1343 lookup_word (parser_control const *pc, char *word) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1344 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1345 char *p; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1346 char *q; |
18804
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
1347 ptrdiff_t wordlen; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1348 table const *tp; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1349 bool period_found; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1350 bool abbrev; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1351 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1352 /* Make it uppercase. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1353 for (p = word; *p; p++) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1354 *p = c_toupper (to_uchar (*p)); |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1355 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1356 for (tp = meridian_table; tp->name; tp++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1357 if (strcmp (word, tp->name) == 0) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1358 return tp; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1359 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1360 /* See if we have an abbreviation for a month. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1361 wordlen = strlen (word); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1362 abbrev = wordlen == 3 || (wordlen == 4 && word[3] == '.'); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1363 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1364 for (tp = month_and_day_table; tp->name; tp++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1365 if ((abbrev ? strncmp (word, tp->name, 3) : strcmp (word, tp->name)) == 0) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1366 return tp; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1367 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1368 if ((tp = lookup_zone (pc, word))) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1369 return tp; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1370 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1371 if (strcmp (word, dst_table[0].name) == 0) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1372 return dst_table; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1373 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1374 for (tp = time_units_table; tp->name; tp++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1375 if (strcmp (word, tp->name) == 0) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1376 return tp; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1377 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1378 /* Strip off any plural and try the units table again. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1379 if (word[wordlen - 1] == 'S') |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1380 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1381 word[wordlen - 1] = '\0'; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1382 for (tp = time_units_table; tp->name; tp++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1383 if (strcmp (word, tp->name) == 0) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1384 return tp; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1385 word[wordlen - 1] = 'S'; /* For "this" in relative_time_table. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1386 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1387 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1388 for (tp = relative_time_table; tp->name; tp++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1389 if (strcmp (word, tp->name) == 0) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1390 return tp; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1391 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1392 /* Military time zones. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1393 if (wordlen == 1) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1394 for (tp = military_table; tp->name; tp++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1395 if (word[0] == tp->name[0]) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1396 return tp; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1397 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1398 /* Drop out any periods and try the time zone table again. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1399 for (period_found = false, p = q = word; (*p = *q); q++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1400 if (*q == '.') |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1401 period_found = true; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1402 else |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1403 p++; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1404 if (period_found && (tp = lookup_zone (pc, word))) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1405 return tp; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1406 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1407 return NULL; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1408 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1409 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1410 static int |
17834
e0838da3bfe8
parse-datetime: avoid a compiler warning with byacc
Tim Rühsen <tim.ruehsen@gmx.de>
parents:
17745
diff
changeset
|
1411 yylex (union YYSTYPE *lvalp, parser_control *pc) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1412 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1413 unsigned char c; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1414 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1415 for (;;) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1416 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1417 while (c = *pc->input, c_isspace (c)) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1418 pc->input++; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1419 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1420 if (c_isdigit (c) || c == '-' || c == '+') |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1421 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1422 char const *p; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1423 int sign; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1424 intmax_t value = 0; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1425 if (c == '-' || c == '+') |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1426 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1427 sign = c == '-' ? -1 : 1; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1428 while (c = *++pc->input, c_isspace (c)) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1429 continue; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1430 if (! c_isdigit (c)) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1431 /* skip the '-' sign */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1432 continue; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1433 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1434 else |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1435 sign = 0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1436 p = pc->input; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1437 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1438 do |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1439 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1440 if (INT_MULTIPLY_WRAPV (value, 10, &value)) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1441 return '?'; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1442 if (INT_ADD_WRAPV (value, sign < 0 ? '0' - c : c - '0', &value)) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1443 return '?'; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1444 c = *++p; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1445 } |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1446 while (c_isdigit (c)); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1447 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1448 if ((c == '.' || c == ',') && c_isdigit (p[1])) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1449 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1450 time_t s; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1451 int ns; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1452 int digits; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1453 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1454 if (time_overflow (value)) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1455 return '?'; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1456 s = value; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1457 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1458 /* Accumulate fraction, to ns precision. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1459 p++; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1460 ns = *p++ - '0'; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1461 for (digits = 2; digits <= LOG10_BILLION; digits++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1462 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1463 ns *= 10; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1464 if (c_isdigit (*p)) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1465 ns += *p++ - '0'; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1466 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1467 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1468 /* Skip excess digits, truncating toward -Infinity. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1469 if (sign < 0) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1470 for (; c_isdigit (*p); p++) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1471 if (*p != '0') |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1472 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1473 ns++; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1474 break; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1475 } |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1476 while (c_isdigit (*p)) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1477 p++; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1478 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1479 /* Adjust to the timespec convention, which is that |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1480 tv_nsec is always a positive offset even if tv_sec is |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1481 negative. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1482 if (sign < 0 && ns) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1483 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1484 if (s == TYPE_MINIMUM (time_t)) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1485 return '?'; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1486 s--; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1487 ns = BILLION - ns; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1488 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1489 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1490 lvalp->timespec.tv_sec = s; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1491 lvalp->timespec.tv_nsec = ns; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1492 pc->input = p; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1493 return sign ? tSDECIMAL_NUMBER : tUDECIMAL_NUMBER; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1494 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1495 else |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1496 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1497 lvalp->textintval.negative = sign < 0; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1498 lvalp->textintval.value = value; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1499 lvalp->textintval.digits = p - pc->input; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1500 pc->input = p; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1501 return sign ? tSNUMBER : tUNUMBER; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1502 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1503 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1504 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1505 if (c_isalpha (c)) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1506 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1507 char buff[20]; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1508 char *p = buff; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1509 table const *tp; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1510 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1511 do |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1512 { |
17745
972097f4ddc2
parse-datetime: Avoid signed/unsigned comparison warning
Mats Erik Andersson <gnu@gisladisker.se>
parents:
17624
diff
changeset
|
1513 if (p < buff + sizeof buff - 1) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1514 *p++ = c; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1515 c = *++pc->input; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1516 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1517 while (c_isalpha (c) || c == '.'); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1518 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1519 *p = '\0'; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1520 tp = lookup_word (pc, buff); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1521 if (! tp) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1522 { |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1523 if (pc->parse_datetime_debug) |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1524 dbg_printf (_("error: unknown word '%s'\n"), buff); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1525 return '?'; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1526 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1527 lvalp->intval = tp->value; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1528 return tp->type; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1529 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1530 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1531 if (c != '(') |
16964
b9ca6af780f5
parse-datetime: fix failure to diagnose invalid input
Jim Meyering <meyering@redhat.com>
parents:
16358
diff
changeset
|
1532 return to_uchar (*pc->input++); |
b9ca6af780f5
parse-datetime: fix failure to diagnose invalid input
Jim Meyering <meyering@redhat.com>
parents:
16358
diff
changeset
|
1533 |
18804
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
1534 ptrdiff_t count = 0; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1535 do |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1536 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1537 c = *pc->input++; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1538 if (c == '\0') |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1539 return c; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1540 if (c == '(') |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1541 count++; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1542 else if (c == ')') |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1543 count--; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1544 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1545 while (count != 0); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1546 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1547 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1548 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1549 /* Do nothing if the parser reports an error. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1550 static int |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1551 yyerror (parser_control const *pc _GL_UNUSED, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1552 char const *s _GL_UNUSED) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1553 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1554 return 0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1555 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1556 |
39964
9b9947d1db86
parse-datetime: simplify test for mktime failure
Paul Eggert <eggert@cs.ucla.edu>
parents:
39722
diff
changeset
|
1557 /* If *TM0 is the old and *TM1 is the new value of a struct tm after |
9b9947d1db86
parse-datetime: simplify test for mktime failure
Paul Eggert <eggert@cs.ucla.edu>
parents:
39722
diff
changeset
|
1558 passing it to mktime_z, return true if it's OK. It's not OK if |
9b9947d1db86
parse-datetime: simplify test for mktime failure
Paul Eggert <eggert@cs.ucla.edu>
parents:
39722
diff
changeset
|
1559 mktime failed or if *TM0 has out-of-range mainline members. |
9b9947d1db86
parse-datetime: simplify test for mktime failure
Paul Eggert <eggert@cs.ucla.edu>
parents:
39722
diff
changeset
|
1560 The caller should set TM1->tm_wday to -1 before calling mktime, |
9b9947d1db86
parse-datetime: simplify test for mktime failure
Paul Eggert <eggert@cs.ucla.edu>
parents:
39722
diff
changeset
|
1561 as a negative tm_wday is how mktime failure is inferred. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1562 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1563 static bool |
39964
9b9947d1db86
parse-datetime: simplify test for mktime failure
Paul Eggert <eggert@cs.ucla.edu>
parents:
39722
diff
changeset
|
1564 mktime_ok (struct tm const *tm0, struct tm const *tm1) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1565 { |
39964
9b9947d1db86
parse-datetime: simplify test for mktime failure
Paul Eggert <eggert@cs.ucla.edu>
parents:
39722
diff
changeset
|
1566 if (tm1->tm_wday < 0) |
9b9947d1db86
parse-datetime: simplify test for mktime failure
Paul Eggert <eggert@cs.ucla.edu>
parents:
39722
diff
changeset
|
1567 return false; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1568 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1569 return ! ((tm0->tm_sec ^ tm1->tm_sec) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1570 | (tm0->tm_min ^ tm1->tm_min) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1571 | (tm0->tm_hour ^ tm1->tm_hour) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1572 | (tm0->tm_mday ^ tm1->tm_mday) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1573 | (tm0->tm_mon ^ tm1->tm_mon) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1574 | (tm0->tm_year ^ tm1->tm_year)); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1575 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1576 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1577 /* Debugging: format a 'struct tm' into a buffer, taking the parser's |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1578 timezone information into account (if pc != NULL). */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1579 static char const * |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1580 debug_strfdatetime (struct tm const *tm, parser_control const *pc, |
18804
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
1581 char *buf, int n) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1582 { |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1583 /* TODO: |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1584 1. find an optimal way to print date string in a clear and unambiguous |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1585 format. Currently, always add '(Y-M-D)' prefix. |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1586 Consider '2016y01m10d' or 'year(2016) month(01) day(10)'. |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1587 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1588 If the user needs debug printing, it means he/she already having |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1589 issues with the parsing - better to avoid formats that could |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1590 be mis-interpreted (e.g., just YYYY-MM-DD). |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1591 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1592 2. Can strftime be used instead? |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1593 depends if it is portable and can print invalid dates on all systems. |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1594 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1595 3. Print timezone information ? |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1596 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1597 4. Print DST information ? |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1598 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1599 5. Print nanosecond information ? |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1600 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1601 NOTE: |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1602 Printed date/time values might not be valid, e.g., '2016-02-31' |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1603 or '2016-19-2016' . These are the values as parsed from the user |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1604 string, before validation. |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1605 */ |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1606 int m = nstrftime (buf, n, "(Y-M-D) %Y-%m-%d %H:%M:%S", tm, 0, 0); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1607 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1608 /* If parser_control information was provided (for timezone), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1609 and there's enough space in the buffer, add timezone info. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1610 if (pc && m < n && pc->zones_seen) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1611 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1612 int tz = pc->time_zone; |
18644
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
1613 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1614 /* Account for DST if tLOCAL_ZONE was seen. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1615 if (pc->local_zones_seen && !pc->zones_seen && 0 < pc->local_isdst) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1616 tz += 60 * 60; |
18644
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
1617 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1618 char time_zone_buf[TIME_ZONE_BUFSIZE]; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1619 snprintf (&buf[m], n - m, " TZ=%s", time_zone_str (tz, time_zone_buf)); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1620 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1621 return buf; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1622 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1623 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1624 static char const * |
18804
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
1625 debug_strfdate (struct tm const *tm, char *buf, int n) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1626 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1627 char tm_year_buf[TM_YEAR_BUFSIZE]; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1628 snprintf (buf, n, "(Y-M-D) %s-%02d-%02d", |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1629 tm_year_str (tm->tm_year, tm_year_buf), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1630 tm->tm_mon + 1, tm->tm_mday); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1631 return buf; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1632 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1633 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1634 static char const * |
18804
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
1635 debug_strftime (struct tm const *tm, char *buf, int n) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1636 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1637 snprintf (buf, n, "%02d:%02d:%02d", tm->tm_hour, tm->tm_min, tm->tm_sec); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1638 return buf; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1639 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1640 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1641 /* If mktime_ok failed, display the failed time values, |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1642 and provide possible hints. Example output: |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1643 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1644 date: error: invalid date/time value: |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1645 date: user provided time: '(Y-M-D) 2006-04-02 02:45:00' |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1646 date: normalized time: '(Y-M-D) 2006-04-02 03:45:00' |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1647 date: __ |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1648 date: possible reasons: |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1649 date: non-existing due to daylight-saving time; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1650 date: numeric values overflow; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1651 date: missing timezone; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1652 */ |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1653 static void |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1654 debug_mktime_not_ok (struct tm const *tm0, struct tm const *tm1, |
18804
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
1655 parser_control const *pc, bool time_zone_seen) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1656 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1657 /* TODO: handle t == -1 (as in 'mktime_ok'). */ |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1658 char tmp[DBGBUFSIZE]; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1659 int i; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1660 const bool eq_sec = (tm0->tm_sec == tm1->tm_sec); |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1661 const bool eq_min = (tm0->tm_min == tm1->tm_min); |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1662 const bool eq_hour = (tm0->tm_hour == tm1->tm_hour); |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1663 const bool eq_mday = (tm0->tm_mday == tm1->tm_mday); |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1664 const bool eq_month = (tm0->tm_mon == tm1->tm_mon); |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1665 const bool eq_year = (tm0->tm_year == tm1->tm_year); |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1666 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1667 const bool dst_shift = eq_sec && eq_min && !eq_hour |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1668 && eq_mday && eq_month && eq_year; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1669 |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1670 if (!pc->parse_datetime_debug) |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1671 return; |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1672 |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1673 dbg_printf (_("error: invalid date/time value:\n")); |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1674 dbg_printf (_(" user provided time: '%s'\n"), |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1675 debug_strfdatetime (tm0, pc, tmp, sizeof tmp)); |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1676 dbg_printf (_(" normalized time: '%s'\n"), |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1677 debug_strfdatetime (tm1, pc, tmp, sizeof tmp)); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1678 /* The format must be aligned with debug_strfdatetime and the two |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1679 DEBUG statements above. This string is not translated. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1680 i = snprintf (tmp, sizeof tmp, |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1681 " %4s %2s %2s %2s %2s %2s", |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1682 eq_year ? "" : "----", |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1683 eq_month ? "" : "--", |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1684 eq_mday ? "" : "--", |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1685 eq_hour ? "" : "--", |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1686 eq_min ? "" : "--", |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1687 eq_sec ? "" : "--"); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1688 /* Trim trailing whitespace. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1689 if (0 <= i) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1690 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1691 if (sizeof tmp - 1 < i) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1692 i = sizeof tmp - 1; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1693 while (0 < i && tmp[i - 1] == ' ') |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1694 --i; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1695 tmp[i] = '\0'; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1696 } |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1697 dbg_printf ("%s\n", tmp); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1698 |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1699 dbg_printf (_(" possible reasons:\n")); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1700 if (dst_shift) |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1701 dbg_printf (_(" non-existing due to daylight-saving time;\n")); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1702 if (!eq_mday && !eq_month) |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1703 dbg_printf (_(" invalid day/month combination;\n")); |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1704 dbg_printf (_(" numeric values overflow;\n")); |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1705 dbg_printf (" %s\n", (time_zone_seen ? _("incorrect timezone") |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1706 : _("missing timezone"))); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1707 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1708 |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1709 /* The original interface: run with debug=false and the default timezone. */ |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1710 bool |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1711 parse_datetime (struct timespec *result, char const *p, |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1712 struct timespec const *now) |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1713 { |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1714 char const *tzstring = getenv ("TZ"); |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1715 timezone_t tz = tzalloc (tzstring); |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1716 if (!tz) |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1717 return false; |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1718 bool ok = parse_datetime2 (result, p, now, 0, tz, tzstring); |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1719 tzfree (tz); |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1720 return ok; |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1721 } |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1722 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1723 /* Parse a date/time string, storing the resulting time value into *RESULT. |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1724 The string itself is pointed to by P. Return true if successful. |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1725 P can be an incomplete or relative time specification; if so, use |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1726 *NOW as the basis for the returned time. Default to timezone |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1727 TZDEFAULT, which corresponds to tzalloc (TZSTRING). */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1728 bool |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1729 parse_datetime2 (struct timespec *result, char const *p, |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1730 struct timespec const *now, unsigned int flags, |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1731 timezone_t tzdefault, char const *tzstring) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1732 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1733 struct tm tm; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1734 struct tm tm0; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1735 char time_zone_buf[TIME_ZONE_BUFSIZE]; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1736 char dbg_tm[DBGBUFSIZE]; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1737 bool ok = false; |
18406
be6e23778bf1
parse-datetime: restrict debug output to input string
Pádraig Brady <P@draigBrady.com>
parents:
18393
diff
changeset
|
1738 char const *input_sentinel = p + strlen (p); |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1739 char *tz1alloc = NULL; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1740 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1741 /* A reasonable upper bound for the size of ordinary TZ strings. |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1742 Use heap allocation if TZ's length exceeds this. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1743 enum { TZBUFSIZE = 100 }; |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1744 char tz1buf[TZBUFSIZE]; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1745 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1746 struct timespec gettime_buffer; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1747 if (! now) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1748 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1749 gettime (&gettime_buffer); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1750 now = &gettime_buffer; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1751 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1752 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1753 time_t Start = now->tv_sec; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1754 int Start_ns = now->tv_nsec; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1755 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1756 unsigned char c; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1757 while (c = *p, c_isspace (c)) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1758 p++; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1759 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1760 timezone_t tz = tzdefault; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1761 |
39715
13210948175b
parse-datetime.y: avoid spurious GCC 9 warning
Jim Meyering <meyering@fb.com>
parents:
19484
diff
changeset
|
1762 /* Store a local copy prior to first "goto". Without this, a prior use |
13210948175b
parse-datetime.y: avoid spurious GCC 9 warning
Jim Meyering <meyering@fb.com>
parents:
19484
diff
changeset
|
1763 below of RELATIVE_TIME_0 on the RHS might translate to an assignment- |
13210948175b
parse-datetime.y: avoid spurious GCC 9 warning
Jim Meyering <meyering@fb.com>
parents:
19484
diff
changeset
|
1764 to-temporary, which would trigger a -Wjump-misses-init warning. */ |
39719
82f14d8df980
parse-datetime: accommodate gcc-4.8.5
Jim Meyering <meyering@fb.com>
parents:
39715
diff
changeset
|
1765 const relative_time rel_time_0 = RELATIVE_TIME_0; |
39715
13210948175b
parse-datetime.y: avoid spurious GCC 9 warning
Jim Meyering <meyering@fb.com>
parents:
19484
diff
changeset
|
1766 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1767 if (strncmp (p, "TZ=\"", 4) == 0) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1768 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1769 char const *tzbase = p + 4; |
18804
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
1770 ptrdiff_t tzsize = 1; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1771 char const *s; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1772 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1773 for (s = tzbase; *s; s++, tzsize++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1774 if (*s == '\\') |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1775 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1776 s++; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1777 if (! (*s == '\\' || *s == '"')) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1778 break; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1779 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1780 else if (*s == '"') |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1781 { |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1782 timezone_t tz1; |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1783 char *tz1string = tz1buf; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1784 char *z; |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1785 if (TZBUFSIZE < tzsize) |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1786 { |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1787 tz1alloc = malloc (tzsize); |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1788 if (!tz1alloc) |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1789 goto fail; |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1790 tz1string = tz1alloc; |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1791 } |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1792 z = tz1string; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1793 for (s = tzbase; *s != '"'; s++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1794 *z++ = *(s += *s == '\\'); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1795 *z = '\0'; |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1796 tz1 = tzalloc (tz1string); |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1797 if (!tz1) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1798 goto fail; |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1799 tz = tz1; |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1800 tzstring = tz1string; |
17624
3cf8cbc50647
parse-datetime: fix crash or infloop in TZ="" parsing
Pádraig Brady <P@draigBrady.com>
parents:
17576
diff
changeset
|
1801 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1802 p = s + 1; |
17624
3cf8cbc50647
parse-datetime: fix crash or infloop in TZ="" parsing
Pádraig Brady <P@draigBrady.com>
parents:
17576
diff
changeset
|
1803 while (c = *p, c_isspace (c)) |
3cf8cbc50647
parse-datetime: fix crash or infloop in TZ="" parsing
Pádraig Brady <P@draigBrady.com>
parents:
17576
diff
changeset
|
1804 p++; |
3cf8cbc50647
parse-datetime: fix crash or infloop in TZ="" parsing
Pádraig Brady <P@draigBrady.com>
parents:
17576
diff
changeset
|
1805 |
3cf8cbc50647
parse-datetime: fix crash or infloop in TZ="" parsing
Pádraig Brady <P@draigBrady.com>
parents:
17576
diff
changeset
|
1806 break; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1807 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1808 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1809 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1810 struct tm tmp; |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1811 if (! localtime_rz (tz, &now->tv_sec, &tmp)) |
18919
96603b9cbc5e
parse-datetime: Fix memleak
Tim Rühsen <tim.ruehsen@gmx.de>
parents:
18817
diff
changeset
|
1812 goto fail; |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1813 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1814 /* As documented, be careful to treat the empty string just like |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1815 a date string of "0". Without this, an empty string would be |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1816 declared invalid when parsed during a DST transition. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1817 if (*p == '\0') |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1818 p = "0"; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1819 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1820 parser_control pc; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1821 pc.input = p; |
18978
cd40cccb9b18
parse-datetime: fix uninit var bug
Paul Eggert <eggert@cs.ucla.edu>
parents:
18919
diff
changeset
|
1822 pc.parse_datetime_debug = (flags & PARSE_DATETIME_DEBUG) != 0; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1823 if (INT_ADD_WRAPV (tmp.tm_year, TM_YEAR_BASE, &pc.year.value)) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1824 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1825 if (pc.parse_datetime_debug) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1826 dbg_printf (_("error: initial year out of range\n")); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1827 goto fail; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1828 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1829 pc.year.digits = 0; |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1830 pc.month = tmp.tm_mon + 1; |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1831 pc.day = tmp.tm_mday; |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1832 pc.hour = tmp.tm_hour; |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1833 pc.minutes = tmp.tm_min; |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1834 pc.seconds.tv_sec = tmp.tm_sec; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1835 pc.seconds.tv_nsec = Start_ns; |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1836 tm.tm_isdst = tmp.tm_isdst; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1837 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1838 pc.meridian = MER24; |
39715
13210948175b
parse-datetime.y: avoid spurious GCC 9 warning
Jim Meyering <meyering@fb.com>
parents:
19484
diff
changeset
|
1839 pc.rel = rel_time_0; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1840 pc.timespec_seen = false; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1841 pc.rels_seen = false; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1842 pc.dates_seen = 0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1843 pc.days_seen = 0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1844 pc.times_seen = 0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1845 pc.local_zones_seen = 0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1846 pc.dsts_seen = 0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1847 pc.zones_seen = 0; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1848 pc.year_seen = false; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1849 pc.debug_dates_seen = false; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1850 pc.debug_days_seen = false; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1851 pc.debug_times_seen = false; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1852 pc.debug_local_zones_seen = false; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1853 pc.debug_zones_seen = false; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1854 pc.debug_year_seen = false; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1855 pc.debug_ordinal_day_seen = false; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1856 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1857 #if HAVE_STRUCT_TM_TM_ZONE |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1858 pc.local_time_zone_table[0].name = tmp.tm_zone; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1859 pc.local_time_zone_table[0].type = tLOCAL_ZONE; |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1860 pc.local_time_zone_table[0].value = tmp.tm_isdst; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1861 pc.local_time_zone_table[1].name = NULL; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1862 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1863 /* Probe the names used in the next three calendar quarters, looking |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1864 for a tm_isdst different from the one we already have. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1865 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1866 int quarter; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1867 for (quarter = 1; quarter <= 3; quarter++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1868 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1869 intmax_t iprobe; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1870 if (INT_ADD_WRAPV (Start, quarter * (90 * 24 * 60 * 60), &iprobe) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1871 || time_overflow (iprobe)) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1872 break; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1873 time_t probe = iprobe; |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1874 struct tm probe_tm; |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1875 if (localtime_rz (tz, &probe, &probe_tm) && probe_tm.tm_zone |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1876 && probe_tm.tm_isdst != pc.local_time_zone_table[0].value) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1877 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1878 { |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1879 pc.local_time_zone_table[1].name = probe_tm.tm_zone; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1880 pc.local_time_zone_table[1].type = tLOCAL_ZONE; |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1881 pc.local_time_zone_table[1].value = probe_tm.tm_isdst; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1882 pc.local_time_zone_table[2].name = NULL; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1883 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1884 break; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1885 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1886 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1887 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1888 #else |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1889 #if HAVE_TZNAME |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1890 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1891 # if !HAVE_DECL_TZNAME |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1892 extern char *tzname[]; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1893 # endif |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1894 int i; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1895 for (i = 0; i < 2; i++) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1896 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1897 pc.local_time_zone_table[i].name = tzname[i]; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1898 pc.local_time_zone_table[i].type = tLOCAL_ZONE; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1899 pc.local_time_zone_table[i].value = i; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1900 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1901 pc.local_time_zone_table[i].name = NULL; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1902 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1903 #else |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1904 pc.local_time_zone_table[0].name = NULL; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1905 #endif |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1906 #endif |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1907 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1908 if (pc.local_time_zone_table[0].name && pc.local_time_zone_table[1].name |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1909 && ! strcmp (pc.local_time_zone_table[0].name, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1910 pc.local_time_zone_table[1].name)) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1911 { |
16358 | 1912 /* This locale uses the same abbreviation for standard and |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1913 daylight times. So if we see that abbreviation, we don't |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1914 know whether it's daylight time. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1915 pc.local_time_zone_table[0].value = -1; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1916 pc.local_time_zone_table[1].name = NULL; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1917 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1918 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1919 if (yyparse (&pc) != 0) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1920 { |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1921 if (pc.parse_datetime_debug) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1922 dbg_printf ((input_sentinel <= pc.input |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1923 ? _("error: parsing failed\n") |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1924 : _("error: parsing failed, stopped at '%s'\n")), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1925 pc.input); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1926 goto fail; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1927 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1928 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1929 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1930 /* Determine effective timezone source. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1931 |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1932 if (pc.parse_datetime_debug) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1933 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1934 dbg_printf (_("input timezone: ")); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1935 |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1936 if (pc.timespec_seen) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1937 fprintf (stderr, _("'@timespec' - always UTC")); |
18644
5b6cad6b835a
parse-datetime: fix local timezone debug messages
Assaf Gordon <assafgordon@gmail.com>
parents:
18643
diff
changeset
|
1938 else if (pc.zones_seen) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1939 fprintf (stderr, _("parsed date/time string")); |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1940 else if (tzstring) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1941 { |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1942 if (tz != tzdefault) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1943 fprintf (stderr, _("TZ=\"%s\" in date string"), tzstring); |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
1944 else if (STREQ (tzstring, "UTC0")) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1945 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1946 /* Special case: 'date -u' sets TZ="UTC0". */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1947 fprintf (stderr, _("TZ=\"UTC0\" environment value or -u")); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1948 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1949 else |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1950 fprintf (stderr, _("TZ=\"%s\" environment value"), tzstring); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1951 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1952 else |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1953 fprintf (stderr, _("system default")); |
18643
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
1954 |
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
1955 /* Account for DST changes if tLOCAL_ZONE was seen. |
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
1956 local timezone only changes DST and is relative to the |
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
1957 default timezone.*/ |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1958 if (pc.local_zones_seen && !pc.zones_seen && 0 < pc.local_isdst) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1959 fprintf (stderr, ", dst"); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1960 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1961 if (pc.zones_seen) |
39722
f7fc45eece35
Continue to use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
39719
diff
changeset
|
1962 fprintf (stderr, " (%s)", time_zone_str (pc.time_zone, time_zone_buf)); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1963 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1964 fputc ('\n', stderr); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1965 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1966 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1967 if (pc.timespec_seen) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1968 *result = pc.seconds; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1969 else |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1970 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1971 if (1 < (pc.times_seen | pc.dates_seen | pc.days_seen | pc.dsts_seen |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1972 | (pc.local_zones_seen + pc.zones_seen))) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1973 { |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1974 if (pc.parse_datetime_debug) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1975 { |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1976 if (pc.times_seen > 1) |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1977 dbg_printf ("error: seen multiple time parts\n"); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1978 if (pc.dates_seen > 1) |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1979 dbg_printf ("error: seen multiple date parts\n"); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1980 if (pc.days_seen > 1) |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1981 dbg_printf ("error: seen multiple days parts\n"); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1982 if (pc.dsts_seen > 1) |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1983 dbg_printf ("error: seen multiple daylight-saving parts\n"); |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1984 if ((pc.local_zones_seen + pc.zones_seen) > 1) |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
1985 dbg_printf ("error: seen multiple time-zone parts\n"); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1986 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1987 goto fail; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
1988 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1989 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1990 if (! to_tm_year (pc.year, pc.parse_datetime_debug, &tm.tm_year) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1991 || INT_ADD_WRAPV (pc.month, -1, &tm.tm_mon) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1992 || INT_ADD_WRAPV (pc.day, 0, &tm.tm_mday)) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1993 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1994 if (pc.parse_datetime_debug) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1995 dbg_printf (_("error: year, month, or day overflow\n")); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1996 goto fail; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
1997 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1998 if (pc.times_seen || (pc.rels_seen && ! pc.dates_seen && ! pc.days_seen)) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
1999 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2000 tm.tm_hour = to_hour (pc.hour, pc.meridian); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2001 if (tm.tm_hour < 0) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2002 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2003 char const *mrd = (pc.meridian == MERam ? "am" |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2004 : pc.meridian == MERpm ?"pm" : ""); |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2005 if (pc.parse_datetime_debug) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2006 dbg_printf (_("error: invalid hour %"PRIdMAX"%s\n"), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2007 pc.hour, mrd); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2008 goto fail; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2009 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2010 tm.tm_min = pc.minutes; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2011 tm.tm_sec = pc.seconds.tv_sec; |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2012 if (pc.parse_datetime_debug) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2013 dbg_printf ((pc.times_seen |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2014 ? _("using specified time as starting value: '%s'\n") |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2015 : _("using current time as starting value: '%s'\n")), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2016 debug_strftime (&tm, dbg_tm, sizeof dbg_tm)); |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2017 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2018 else |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2019 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2020 tm.tm_hour = tm.tm_min = tm.tm_sec = 0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2021 pc.seconds.tv_nsec = 0; |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2022 if (pc.parse_datetime_debug) |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2023 dbg_printf ("warning: using midnight as starting time: 00:00:00\n"); |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2024 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2025 |
18663
caf9d6314c8f
maint: time stamp -> timestamp
Paul Eggert <eggert@cs.ucla.edu>
parents:
18645
diff
changeset
|
2026 /* Let mktime deduce tm_isdst if we have an absolute timestamp. */ |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2027 if (pc.dates_seen | pc.days_seen | pc.times_seen) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2028 tm.tm_isdst = -1; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2029 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2030 /* But if the input explicitly specifies local time with or without |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2031 DST, give mktime that information. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2032 if (pc.local_zones_seen) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2033 tm.tm_isdst = pc.local_isdst; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2034 |
19207
8fb5c3282663
parse-datetime, posixtm: avoid uninit access
Paul Eggert <eggert@cs.ucla.edu>
parents:
19190
diff
changeset
|
2035 tm0.tm_sec = tm.tm_sec; |
8fb5c3282663
parse-datetime, posixtm: avoid uninit access
Paul Eggert <eggert@cs.ucla.edu>
parents:
19190
diff
changeset
|
2036 tm0.tm_min = tm.tm_min; |
8fb5c3282663
parse-datetime, posixtm: avoid uninit access
Paul Eggert <eggert@cs.ucla.edu>
parents:
19190
diff
changeset
|
2037 tm0.tm_hour = tm.tm_hour; |
8fb5c3282663
parse-datetime, posixtm: avoid uninit access
Paul Eggert <eggert@cs.ucla.edu>
parents:
19190
diff
changeset
|
2038 tm0.tm_mday = tm.tm_mday; |
8fb5c3282663
parse-datetime, posixtm: avoid uninit access
Paul Eggert <eggert@cs.ucla.edu>
parents:
19190
diff
changeset
|
2039 tm0.tm_mon = tm.tm_mon; |
8fb5c3282663
parse-datetime, posixtm: avoid uninit access
Paul Eggert <eggert@cs.ucla.edu>
parents:
19190
diff
changeset
|
2040 tm0.tm_year = tm.tm_year; |
8fb5c3282663
parse-datetime, posixtm: avoid uninit access
Paul Eggert <eggert@cs.ucla.edu>
parents:
19190
diff
changeset
|
2041 tm0.tm_isdst = tm.tm_isdst; |
39964
9b9947d1db86
parse-datetime: simplify test for mktime failure
Paul Eggert <eggert@cs.ucla.edu>
parents:
39722
diff
changeset
|
2042 tm.tm_wday = -1; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2043 |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
2044 Start = mktime_z (tz, &tm); |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2045 |
39964
9b9947d1db86
parse-datetime: simplify test for mktime failure
Paul Eggert <eggert@cs.ucla.edu>
parents:
39722
diff
changeset
|
2046 if (! mktime_ok (&tm0, &tm)) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2047 { |
18804
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
2048 bool repaired = false; |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
2049 bool time_zone_seen = pc.zones_seen != 0; |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
2050 if (time_zone_seen) |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2051 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2052 /* Guard against falsely reporting errors near the time_t |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2053 boundaries when parsing times in other time zones. For |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2054 example, suppose the input string "1969-12-31 23:00:00 -0100", |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2055 the current time zone is 8 hours ahead of UTC, and the min |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2056 time_t value is 1970-01-01 00:00:00 UTC. Then the min |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2057 localtime value is 1970-01-01 08:00:00, and mktime will |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2058 therefore fail on 1969-12-31 23:00:00. To work around the |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2059 problem, set the time zone to 1 hour behind UTC temporarily |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2060 by setting TZ="XXX1:00" and try mktime again. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2061 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2062 char tz2buf[sizeof "XXX" - 1 + TIME_ZONE_BUFSIZE]; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2063 tz2buf[0] = tz2buf[1] = tz2buf[2] = 'X'; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2064 time_zone_str (pc.time_zone, &tz2buf[3]); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2065 timezone_t tz2 = tzalloc (tz2buf); |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
2066 if (!tz2) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2067 { |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2068 if (pc.parse_datetime_debug) |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
2069 dbg_printf (_("error: tzalloc (\"%s\") failed\n"), tz2buf); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2070 goto fail; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2071 } |
19207
8fb5c3282663
parse-datetime, posixtm: avoid uninit access
Paul Eggert <eggert@cs.ucla.edu>
parents:
19190
diff
changeset
|
2072 tm.tm_sec = tm0.tm_sec; |
8fb5c3282663
parse-datetime, posixtm: avoid uninit access
Paul Eggert <eggert@cs.ucla.edu>
parents:
19190
diff
changeset
|
2073 tm.tm_min = tm0.tm_min; |
8fb5c3282663
parse-datetime, posixtm: avoid uninit access
Paul Eggert <eggert@cs.ucla.edu>
parents:
19190
diff
changeset
|
2074 tm.tm_hour = tm0.tm_hour; |
8fb5c3282663
parse-datetime, posixtm: avoid uninit access
Paul Eggert <eggert@cs.ucla.edu>
parents:
19190
diff
changeset
|
2075 tm.tm_mday = tm0.tm_mday; |
8fb5c3282663
parse-datetime, posixtm: avoid uninit access
Paul Eggert <eggert@cs.ucla.edu>
parents:
19190
diff
changeset
|
2076 tm.tm_mon = tm0.tm_mon; |
8fb5c3282663
parse-datetime, posixtm: avoid uninit access
Paul Eggert <eggert@cs.ucla.edu>
parents:
19190
diff
changeset
|
2077 tm.tm_year = tm0.tm_year; |
8fb5c3282663
parse-datetime, posixtm: avoid uninit access
Paul Eggert <eggert@cs.ucla.edu>
parents:
19190
diff
changeset
|
2078 tm.tm_isdst = tm0.tm_isdst; |
39964
9b9947d1db86
parse-datetime: simplify test for mktime failure
Paul Eggert <eggert@cs.ucla.edu>
parents:
39722
diff
changeset
|
2079 tm.tm_wday = -1; |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
2080 Start = mktime_z (tz2, &tm); |
39964
9b9947d1db86
parse-datetime: simplify test for mktime failure
Paul Eggert <eggert@cs.ucla.edu>
parents:
39722
diff
changeset
|
2081 repaired = mktime_ok (&tm0, &tm); |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
2082 tzfree (tz2); |
18804
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
2083 } |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
2084 |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
2085 if (! repaired) |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
2086 { |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
2087 debug_mktime_not_ok (&tm0, &tm, &pc, time_zone_seen); |
4664849367d4
parse-datetime: fix %z and prefer signed int
Paul Eggert <eggert@cs.ucla.edu>
parents:
18795
diff
changeset
|
2088 goto fail; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2089 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2090 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2091 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2092 char dbg_ord[DBGBUFSIZE]; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2093 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2094 if (pc.days_seen && ! pc.dates_seen) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2095 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2096 intmax_t dayincr; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2097 if (INT_MULTIPLY_WRAPV ((pc.day_ordinal |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2098 - (0 < pc.day_ordinal |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2099 && tm.tm_wday != pc.day_number)), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2100 7, &dayincr) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2101 || INT_ADD_WRAPV ((pc.day_number - tm.tm_wday + 7) % 7, |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2102 dayincr, &dayincr) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2103 || INT_ADD_WRAPV (dayincr, tm.tm_mday, &tm.tm_mday)) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2104 Start = -1; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2105 else |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2106 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2107 tm.tm_isdst = -1; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2108 Start = mktime_z (tz, &tm); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2109 } |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2110 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2111 if (Start == (time_t) -1) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2112 { |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2113 if (pc.parse_datetime_debug) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2114 dbg_printf (_("error: day '%s' " |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2115 "(day ordinal=%"PRIdMAX" number=%d) " |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2116 "resulted in an invalid date: '%s'\n"), |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2117 str_days (&pc, dbg_ord, sizeof dbg_ord), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2118 pc.day_ordinal, pc.day_number, |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2119 debug_strfdatetime (&tm, &pc, dbg_tm, |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2120 sizeof dbg_tm)); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2121 goto fail; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2122 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2123 |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2124 if (pc.parse_datetime_debug) |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2125 dbg_printf (_("new start date: '%s' is '%s'\n"), |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2126 str_days (&pc, dbg_ord, sizeof dbg_ord), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2127 debug_strfdatetime (&tm, &pc, dbg_tm, sizeof dbg_tm)); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2128 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2129 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2130 |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2131 if (pc.parse_datetime_debug) |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2132 { |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2133 if (!pc.dates_seen && !pc.days_seen) |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2134 dbg_printf (_("using current date as starting value: '%s'\n"), |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2135 debug_strfdate (&tm, dbg_tm, sizeof dbg_tm)); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2136 |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2137 if (pc.days_seen && pc.dates_seen) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2138 dbg_printf (_("warning: day (%s) ignored when explicit dates " |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2139 "are given\n"), |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2140 str_days (&pc, dbg_ord, sizeof dbg_ord)); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2141 |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2142 dbg_printf (_("starting date/time: '%s'\n"), |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2143 debug_strfdatetime (&tm, &pc, dbg_tm, sizeof dbg_tm)); |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2144 } |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2145 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2146 /* Add relative date. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2147 if (pc.rel.year | pc.rel.month | pc.rel.day) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2148 { |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2149 if (pc.parse_datetime_debug) |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2150 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2151 if ((pc.rel.year != 0 || pc.rel.month != 0) && tm.tm_mday != 15) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2152 dbg_printf (_("warning: when adding relative months/years, " |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2153 "it is recommended to specify the 15th of the " |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2154 "months\n")); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2155 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2156 if (pc.rel.day != 0 && tm.tm_hour != 12) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2157 dbg_printf (_("warning: when adding relative days, " |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2158 "it is recommended to specify noon\n")); |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2159 } |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2160 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2161 int year, month, day; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2162 if (INT_ADD_WRAPV (tm.tm_year, pc.rel.year, &year) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2163 || INT_ADD_WRAPV (tm.tm_mon, pc.rel.month, &month) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2164 || INT_ADD_WRAPV (tm.tm_mday, pc.rel.day, &day)) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2165 { |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2166 if (pc.parse_datetime_debug) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2167 dbg_printf (_("error: %s:%d\n"), __FILE__, __LINE__); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2168 goto fail; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2169 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2170 tm.tm_year = year; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2171 tm.tm_mon = month; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2172 tm.tm_mday = day; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2173 tm.tm_hour = tm0.tm_hour; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2174 tm.tm_min = tm0.tm_min; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2175 tm.tm_sec = tm0.tm_sec; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2176 tm.tm_isdst = tm0.tm_isdst; |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
2177 Start = mktime_z (tz, &tm); |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2178 if (Start == (time_t) -1) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2179 { |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2180 if (pc.parse_datetime_debug) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2181 dbg_printf (_("error: adding relative date resulted " |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2182 "in an invalid date: '%s'\n"), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2183 debug_strfdatetime (&tm, &pc, dbg_tm, |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2184 sizeof dbg_tm)); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2185 goto fail; |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2186 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2187 |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2188 if (pc.parse_datetime_debug) |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2189 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2190 dbg_printf (_("after date adjustment " |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2191 "(%+"PRIdMAX" years, %+"PRIdMAX" months, " |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2192 "%+"PRIdMAX" days),\n"), |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2193 pc.rel.year, pc.rel.month, pc.rel.day); |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2194 dbg_printf (_(" new date/time = '%s'\n"), |
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2195 debug_strfdatetime (&tm, &pc, dbg_tm, |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2196 sizeof dbg_tm)); |
18642
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2197 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2198 /* Warn about crossing DST due to time adjustment. |
18643
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2199 Example: https://bugs.gnu.org/8357 |
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2200 env TZ=Europe/Helsinki \ |
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2201 date --debug \ |
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2202 -d 'Mon Mar 28 00:36:07 2011 EEST 1 day ago' |
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2203 |
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2204 This case is different than DST changes due to time adjustment, |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2205 i.e., "1 day ago" vs "24 hours ago" are calculated in different |
18643
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2206 places. |
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2207 |
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2208 'tm0.tm_isdst' contains the DST of the input date, |
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2209 'tm.tm_isdst' is the normalized result after calling |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2210 mktime (&tm). |
18643
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2211 */ |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2212 if (tm0.tm_isdst != -1 && tm.tm_isdst != tm0.tm_isdst) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2213 dbg_printf (_("warning: daylight saving time changed after " |
18643
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2214 "date adjustment\n")); |
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2215 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2216 /* Warn if the user did not ask to adjust days but mday changed, |
18642
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2217 or |
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2218 user did not ask to adjust months/days but the month changed. |
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2219 |
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2220 Example for first case: |
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2221 2016-05-31 + 1 month => 2016-06-31 => 2016-07-01. |
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2222 User asked to adjust month, but the day changed from 31 to 01. |
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2223 |
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2224 Example for second case: |
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2225 2016-02-29 + 1 year => 2017-02-29 => 2017-03-01. |
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2226 User asked to adjust year, but the month changed from 02 to 03. |
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2227 */ |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2228 if (pc.rel.day == 0 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2229 && (tm.tm_mday != day |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2230 || (pc.rel.month == 0 && tm.tm_mon != month))) |
18642
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2231 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2232 dbg_printf (_("warning: month/year adjustment resulted in " |
18642
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2233 "shifted dates:\n")); |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2234 char tm_year_buf[TM_YEAR_BUFSIZE]; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2235 dbg_printf (_(" adjusted Y M D: %s %02d %02d\n"), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2236 tm_year_str (year, tm_year_buf), month + 1, day); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2237 dbg_printf (_(" normalized Y M D: %s %02d %02d\n"), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2238 tm_year_str (tm.tm_year, tm_year_buf), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2239 tm.tm_mon + 1, tm.tm_mday); |
18642
2d1f7859b313
parse-datetime: add debug warning about date arithmetic
Assaf Gordon <assafgordon@gmail.com>
parents:
18641
diff
changeset
|
2240 } |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2241 } |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2242 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2243 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2244 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2245 /* The only "output" of this if-block is an updated Start value, |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2246 so this block must follow others that clobber Start. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2247 if (pc.zones_seen) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2248 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2249 intmax_t delta = pc.time_zone, t1; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2250 bool overflow = false; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2251 #ifdef HAVE_TM_GMTOFF |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2252 long int utcoff = tm.tm_gmtoff; |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2253 #else |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2254 time_t t = Start; |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
2255 struct tm gmt; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2256 int utcoff = (gmtime_r (&t, &gmt) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2257 ? tm_diff (&tm, &gmt) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2258 : (overflow = true, 0)); |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2259 #endif |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2260 overflow |= INT_SUBTRACT_WRAPV (delta, utcoff, &delta); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2261 overflow |= INT_SUBTRACT_WRAPV (Start, delta, &t1); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2262 if (overflow || time_overflow (t1)) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2263 { |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2264 if (pc.parse_datetime_debug) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2265 dbg_printf (_("error: timezone %d caused time_t overflow\n"), |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2266 pc.time_zone); |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2267 goto fail; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2268 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2269 Start = t1; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2270 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2271 |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2272 if (pc.parse_datetime_debug) |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2273 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2274 intmax_t Starti = Start; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2275 dbg_printf (_("'%s' = %"PRIdMAX" epoch-seconds\n"), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2276 debug_strfdatetime (&tm, &pc, dbg_tm, sizeof dbg_tm), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2277 Starti); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2278 } |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2279 |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2280 |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2281 /* Add relative hours, minutes, and seconds. On hosts that support |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2282 leap seconds, ignore the possibility of leap seconds; e.g., |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2283 "+ 10 minutes" adds 600 seconds, even if one of them is a |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2284 leap second. Typically this is not what the user wants, but it's |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2285 too hard to do it the other way, because the time zone indicator |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2286 must be applied before relative times, and if mktime is applied |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2287 again the time zone will be lost. */ |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2288 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2289 intmax_t orig_ns = pc.seconds.tv_nsec; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2290 intmax_t sum_ns = orig_ns + pc.rel.ns; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2291 int normalized_ns = (sum_ns % BILLION + BILLION) % BILLION; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2292 int d4 = (sum_ns - normalized_ns) / BILLION; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2293 intmax_t d1, t1, d2, t2, t3, t4; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2294 if (INT_MULTIPLY_WRAPV (pc.rel.hour, 60 * 60, &d1) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2295 || INT_ADD_WRAPV (Start, d1, &t1) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2296 || INT_MULTIPLY_WRAPV (pc.rel.minutes, 60, &d2) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2297 || INT_ADD_WRAPV (t1, d2, &t2) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2298 || INT_ADD_WRAPV (t2, pc.rel.seconds, &t3) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2299 || INT_ADD_WRAPV (t3, d4, &t4) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2300 || time_overflow (t4)) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2301 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2302 if (pc.parse_datetime_debug) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2303 dbg_printf (_("error: adding relative time caused an " |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2304 "overflow\n")); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2305 goto fail; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2306 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2307 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2308 result->tv_sec = t4; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2309 result->tv_nsec = normalized_ns; |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2310 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2311 if (pc.parse_datetime_debug |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2312 && (pc.rel.hour | pc.rel.minutes | pc.rel.seconds | pc.rel.ns)) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2313 { |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2314 dbg_printf (_("after time adjustment (%+"PRIdMAX" hours, " |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2315 "%+"PRIdMAX" minutes, " |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2316 "%+"PRIdMAX" seconds, %+d ns),\n"), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2317 pc.rel.hour, pc.rel.minutes, pc.rel.seconds, |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2318 pc.rel.ns); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2319 dbg_printf (_(" new time = %"PRIdMAX" epoch-seconds\n"), t4); |
18643
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2320 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2321 /* Warn about crossing DST due to time adjustment. |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2322 Example: https://bugs.gnu.org/8357 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2323 env TZ=Europe/Helsinki \ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2324 date --debug \ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2325 -d 'Mon Mar 28 00:36:07 2011 EEST 24 hours ago' |
18643
4bfd942ea4a6
parse-datetime: add debug warning about DST changes
Assaf Gordon <assafgordon@gmail.com>
parents:
18642
diff
changeset
|
2326 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2327 This case is different than DST changes due to days adjustment, |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2328 i.e., "1 day ago" vs "24 hours ago" are calculated in different |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2329 places. |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2330 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2331 'tm.tm_isdst' contains the date after date adjustment. */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2332 struct tm lmt; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2333 if (tm.tm_isdst != -1 && localtime_rz (tz, &result->tv_sec, &lmt) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2334 && tm.tm_isdst != lmt.tm_isdst) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2335 dbg_printf (_("warning: daylight saving time changed after " |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2336 "time adjustment\n")); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2337 } |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2338 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2339 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2340 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2341 if (pc.parse_datetime_debug) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2342 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2343 /* Special case: using 'date -u' simply set TZ=UTC0 */ |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2344 if (! tzstring) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2345 dbg_printf (_("timezone: system default\n")); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2346 else if (STREQ (tzstring, "UTC0")) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2347 dbg_printf (_("timezone: Universal Time\n")); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2348 else |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2349 dbg_printf (_("timezone: TZ=\"%s\" environment value\n"), tzstring); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2350 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2351 intmax_t sec = result->tv_sec; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2352 int nsec = result->tv_nsec; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2353 dbg_printf (_("final: %"PRIdMAX".%09d (epoch-seconds)\n"), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2354 sec, nsec); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2355 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2356 struct tm gmt, lmt; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2357 bool got_utc = !!gmtime_r (&result->tv_sec, &gmt); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2358 if (got_utc) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2359 dbg_printf (_("final: %s (UTC)\n"), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2360 debug_strfdatetime (&gmt, NULL, |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2361 dbg_tm, sizeof dbg_tm)); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2362 if (localtime_rz (tz, &result->tv_sec, &lmt)) |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2363 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2364 #ifdef HAVE_TM_GMTOFF |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2365 bool got_utcoff = true; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2366 long int utcoff = lmt.tm_gmtoff; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2367 #else |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2368 bool got_utcoff = got_utc; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2369 int utcoff; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2370 if (got_utcoff) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2371 utcoff = tm_diff (&lmt, &gmt); |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2372 #endif |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2373 if (got_utcoff) |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2374 dbg_printf (_("final: %s (UTC%s)\n"), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2375 debug_strfdatetime (&lmt, NULL, dbg_tm, sizeof dbg_tm), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2376 time_zone_str (utcoff, time_zone_buf)); |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2377 else |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2378 dbg_printf (_("final: %s (unknown time zone offset)\n"), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2379 debug_strfdatetime (&lmt, NULL, dbg_tm, sizeof dbg_tm)); |
18382
0e4c96966001
parse-datetime: improve debug implementation
Assaf Gordon <assafgordon@gmail.com>
parents:
18364
diff
changeset
|
2380 } |
18364
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2381 } |
b6fc97004a30
parse-datetime: add optional debug printing
Assaf Gordon <assafgordon@gmail.com>
parents:
18189
diff
changeset
|
2382 |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2383 ok = true; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2384 |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2385 fail: |
18684
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
2386 if (tz != tzdefault) |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
2387 tzfree (tz); |
f4174f4c7fff
parse-datetime: handle timezones reentrantly
Paul Eggert <eggert@cs.ucla.edu>
parents:
18663
diff
changeset
|
2388 free (tz1alloc); |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2389 return ok; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2390 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2391 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2392 #if TEST |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2393 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2394 int |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2395 main (int ac, char **av) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2396 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2397 char buff[BUFSIZ]; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2398 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2399 printf ("Enter date, or blank line to exit.\n\t> "); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2400 fflush (stdout); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2401 |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2402 buff[BUFSIZ - 1] = '\0'; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2403 while (fgets (buff, BUFSIZ - 1, stdin) && buff[0]) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2404 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2405 struct timespec d; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2406 struct tm const *tm; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2407 if (! parse_datetime (&d, buff, NULL)) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2408 printf ("Bad format - couldn't convert.\n"); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2409 else if (! (tm = localtime (&d.tv_sec))) |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2410 { |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2411 intmax_t sec = d.tv_sec; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2412 printf ("localtime (%"PRIdMAX") failed\n", sec); |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2413 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2414 else |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2415 { |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2416 int ns = d.tv_nsec; |
18795
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2417 char tm_year_buf[TM_YEAR_BUFSIZE]; |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2418 printf ("%s-%02d-%02d %02d:%02d:%02d.%09d\n", |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2419 tm_year_str (tm->tm_year, tm_year_buf), |
54a2192cf271
parse-datetime: overflow and debug cleanups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18684
diff
changeset
|
2420 tm->tm_mon + 1, tm->tm_mday, |
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2421 tm->tm_hour, tm->tm_min, tm->tm_sec, ns); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2422 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2423 printf ("\t> "); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2424 fflush (stdout); |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2425 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2426 return 0; |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2427 } |
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
diff
changeset
|
2428 #endif /* TEST */ |