Mercurial > hg > octave-nkf > gnulib-hg
annotate lib/mktime.c @ 17334:bb52d9cece01
unsetenv etc.: port to Solaris 11 + GNU Emacs
* lib/canonicalize-lgpl.c, lib/getaddrinfo.c, lib/getdelim.c:
* lib/glob.c, lib/random_r.c, lib/setenv.c, lib/tsearch.c:
* lib/unsetenv.c (_GL_ARG_NONNULL): Define before including <config.h>.
GNU Emacs's <config.h> includes <stdlib.h> (which is not a great
idea but is too painful to fix right now), and without this gnulib
change <stdlib.h> was defining _GL_ARG_NONNULL incorrectly when
compiling unsetenv.c on Solaris 11. Fix the problem for
unsetenv.c, and fix other similar occurrences.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Mon, 11 Feb 2013 14:58:56 -0800 |
| parents | e542fd46ad6f |
| children | 344018b6e5d7 |
| rev | line source |
|---|---|
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
1 /* Convert a 'struct tm' to a time_t value. |
|
17249
e542fd46ad6f
maint: update all copyright year number ranges
Eric Blake <eblake@redhat.com>
parents:
17049
diff
changeset
|
2 Copyright (C) 1993-2013 Free Software Foundation, Inc. |
| 1713 | 3 This file is part of the GNU C Library. |
| 7294 | 4 Contributed by Paul Eggert <eggert@twinsun.com>. |
| 508 | 5 |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
6 The GNU C Library is free software; you can redistribute it and/or |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
7 modify it under the terms of the GNU Lesser General Public |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
8 License as published by the Free Software Foundation; either |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
9 version 2.1 of the License, or (at your option) any later version. |
| 9 | 10 |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
11 The GNU C Library is distributed in the hope that it will be useful, |
| 782 | 12 but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
14 Lesser General Public License for more details. |
| 9 | 15 |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
16 You should have received a copy of the GNU Lesser General Public |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
17 License along with the GNU C Library; if not, see |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
18 <http://www.gnu.org/licenses/>. */ |
| 9 | 19 |
| 187 | 20 /* Define this to have a standalone program to test this implementation of |
| 21 mktime. */ | |
| 508 | 22 /* #define DEBUG 1 */ |
| 187 | 23 |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
24 #ifndef _LIBC |
| 1109 | 25 # include <config.h> |
| 9 | 26 #endif |
| 27 | |
| 508 | 28 /* Assume that leap seconds are possible, unless told otherwise. |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
29 If the host has a 'zic' command with a '-L leapsecondfilename' option, |
| 508 | 30 then it supports leap seconds; otherwise it probably doesn't. */ |
| 31 #ifndef LEAP_SECONDS_POSSIBLE | |
| 1109 | 32 # define LEAP_SECONDS_POSSIBLE 1 |
| 508 | 33 #endif |
| 34 | |
| 187 | 35 #include <time.h> |
| 36 | |
|
4354
7b5fd4dc4f90
Assume freestanding C89 or better.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4352
diff
changeset
|
37 #include <limits.h> |
| 9 | 38 |
| 16877 | 39 #include <string.h> /* For the real memcpy prototype. */ |
|
5932
8ef7d6084536
* mktime.c: Include <string.h> even if !DEBUG. (From glibc.)
Paul Eggert <eggert@cs.ucla.edu>
parents:
5848
diff
changeset
|
40 |
| 508 | 41 #if DEBUG |
| 1109 | 42 # include <stdio.h> |
| 4666 | 43 # include <stdlib.h> |
| 508 | 44 /* Make it work even if the system's libc has its own mktime routine. */ |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
45 # undef mktime |
| 1109 | 46 # define mktime my_mktime |
| 508 | 47 #endif /* DEBUG */ |
| 9 | 48 |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
49 /* Some of the code in this file assumes that signed integer overflow |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
50 silently wraps around. This assumption can't easily be programmed |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
51 around, nor can it be checked for portably at compile-time or |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
52 easily eliminated at run-time. |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
53 |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
54 Define WRAPV to 1 if the assumption is valid and if |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
55 #pragma GCC optimize ("wrapv") |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
56 does not trigger GCC bug 51793 |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
57 <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51793>. |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
58 Otherwise, define it to 0; this forces the use of slower code that, |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
59 while not guaranteed by the C Standard, works on all production |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
60 platforms that we know about. */ |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
61 #ifndef WRAPV |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
62 # if (((__GNUC__ == 4 && 4 <= __GNUC_MINOR__) || 4 < __GNUC__) \ |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
63 && defined __GLIBC__) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
64 # pragma GCC optimize ("wrapv") |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
65 # define WRAPV 1 |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
66 # else |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
67 # define WRAPV 0 |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
68 # endif |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
69 #endif |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
70 |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
71 /* Verify a requirement at compile-time (unlike assert, which is runtime). */ |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
72 #define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; } |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
73 |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
74 /* A signed type that is at least one bit wider than int. */ |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
75 #if INT_MAX <= LONG_MAX / 2 |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
76 typedef long int long_int; |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
77 #else |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
78 typedef long long int long_int; |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
79 #endif |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
80 verify (long_int_is_wide_enough, INT_MAX == INT_MAX * (long_int) 2 / 2); |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
81 |
|
5409
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
82 /* Shift A right by B bits portably, by dividing A by 2**B and |
|
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
83 truncating towards minus infinity. A and B should be free of side |
|
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
84 effects, and B should be in the range 0 <= B <= INT_BITS - 2, where |
|
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
85 INT_BITS is the number of useful bits in an int. GNU code can |
|
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
86 assume that INT_BITS is at least 32. |
|
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
87 |
|
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
88 ISO C99 says that A >> B is implementation-defined if A < 0. Some |
|
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
89 implementations (e.g., UNICOS 9.0 on a Cray Y-MP EL) don't shift |
|
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
90 right in the usual way when A < 0, so SHR falls back on division if |
|
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
91 ordinary A >> B doesn't seem to be the usual signed shift. */ |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
92 #define SHR(a, b) \ |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
93 ((-1 >> 1 == -1 \ |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
94 && (long_int) -1 >> 1 == -1 \ |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
95 && ((time_t) -1 >> 1 == -1 || ! TYPE_SIGNED (time_t))) \ |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
96 ? (a) >> (b) \ |
|
5409
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
97 : (a) / (1 << (b)) - ((a) % (1 << (b)) < 0)) |
|
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
98 |
|
5691
ec62790f0938
Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents:
5689
diff
changeset
|
99 /* The extra casts in the following macros work around compiler bugs, |
|
ec62790f0938
Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents:
5689
diff
changeset
|
100 e.g., in Cray C 5.0.3.0. */ |
|
ec62790f0938
Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents:
5689
diff
changeset
|
101 |
|
ec62790f0938
Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents:
5689
diff
changeset
|
102 /* True if the arithmetic type T is an integer type. bool counts as |
|
ec62790f0938
Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents:
5689
diff
changeset
|
103 an integer. */ |
|
ec62790f0938
Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents:
5689
diff
changeset
|
104 #define TYPE_IS_INTEGER(t) ((t) 1.5 == 1) |
|
ec62790f0938
Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents:
5689
diff
changeset
|
105 |
|
5775
73ab05626d30
Propagate intprops.h comment fixes to mktime.c and strftime.c.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5704
diff
changeset
|
106 /* True if negative values of the signed integer type T use two's |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
107 complement, or if T is an unsigned integer type. */ |
|
5704
e5769b367399
* mktime.c (TYPE_TWOS_COMPLEMENT, TYPE_ONES_COMPLEMENT,
Paul Eggert <eggert@cs.ucla.edu>
parents:
5691
diff
changeset
|
108 #define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1) |
|
5691
ec62790f0938
Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents:
5689
diff
changeset
|
109 |
|
ec62790f0938
Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents:
5689
diff
changeset
|
110 /* True if the arithmetic type T is signed. */ |
|
1225
ad80e742371b
(__mktime_internal): Work around bug in Irix4.0.5's
Jim Meyering <jim@meyering.net>
parents:
1126
diff
changeset
|
111 #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) |
|
5691
ec62790f0938
Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents:
5689
diff
changeset
|
112 |
|
ec62790f0938
Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents:
5689
diff
changeset
|
113 /* The maximum and minimum values for the integer type T. These |
|
5704
e5769b367399
* mktime.c (TYPE_TWOS_COMPLEMENT, TYPE_ONES_COMPLEMENT,
Paul Eggert <eggert@cs.ucla.edu>
parents:
5691
diff
changeset
|
114 macros have undefined behavior if T is signed and has padding bits. |
|
e5769b367399
* mktime.c (TYPE_TWOS_COMPLEMENT, TYPE_ONES_COMPLEMENT,
Paul Eggert <eggert@cs.ucla.edu>
parents:
5691
diff
changeset
|
115 If this is a problem for you, please let us know how to fix it for |
|
e5769b367399
* mktime.c (TYPE_TWOS_COMPLEMENT, TYPE_ONES_COMPLEMENT,
Paul Eggert <eggert@cs.ucla.edu>
parents:
5691
diff
changeset
|
116 your host. */ |
|
e5769b367399
* mktime.c (TYPE_TWOS_COMPLEMENT, TYPE_ONES_COMPLEMENT,
Paul Eggert <eggert@cs.ucla.edu>
parents:
5691
diff
changeset
|
117 #define TYPE_MINIMUM(t) \ |
|
e5769b367399
* mktime.c (TYPE_TWOS_COMPLEMENT, TYPE_ONES_COMPLEMENT,
Paul Eggert <eggert@cs.ucla.edu>
parents:
5691
diff
changeset
|
118 ((t) (! TYPE_SIGNED (t) \ |
| 16877 | 119 ? (t) 0 \ |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
120 : ~ TYPE_MAXIMUM (t))) |
|
5704
e5769b367399
* mktime.c (TYPE_TWOS_COMPLEMENT, TYPE_ONES_COMPLEMENT,
Paul Eggert <eggert@cs.ucla.edu>
parents:
5691
diff
changeset
|
121 #define TYPE_MAXIMUM(t) \ |
|
e5769b367399
* mktime.c (TYPE_TWOS_COMPLEMENT, TYPE_ONES_COMPLEMENT,
Paul Eggert <eggert@cs.ucla.edu>
parents:
5691
diff
changeset
|
122 ((t) (! TYPE_SIGNED (t) \ |
| 16877 | 123 ? (t) -1 \ |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
124 : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) |
|
1225
ad80e742371b
(__mktime_internal): Work around bug in Irix4.0.5's
Jim Meyering <jim@meyering.net>
parents:
1126
diff
changeset
|
125 |
| 508 | 126 #ifndef TIME_T_MIN |
|
1225
ad80e742371b
(__mktime_internal): Work around bug in Irix4.0.5's
Jim Meyering <jim@meyering.net>
parents:
1126
diff
changeset
|
127 # define TIME_T_MIN TYPE_MINIMUM (time_t) |
| 508 | 128 #endif |
| 129 #ifndef TIME_T_MAX | |
|
1225
ad80e742371b
(__mktime_internal): Work around bug in Irix4.0.5's
Jim Meyering <jim@meyering.net>
parents:
1126
diff
changeset
|
130 # define TIME_T_MAX TYPE_MAXIMUM (time_t) |
| 508 | 131 #endif |
|
5409
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
132 #define TIME_T_MIDPOINT (SHR (TIME_T_MIN + TIME_T_MAX, 1) + 1) |
| 508 | 133 |
|
5691
ec62790f0938
Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents:
5689
diff
changeset
|
134 verify (time_t_is_integer, TYPE_IS_INTEGER (time_t)); |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
135 verify (twos_complement_arithmetic, |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
136 (TYPE_TWOS_COMPLEMENT (int) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
137 && TYPE_TWOS_COMPLEMENT (long_int) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
138 && TYPE_TWOS_COMPLEMENT (time_t))); |
| 508 | 139 |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
140 #define EPOCH_YEAR 1970 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
141 #define TM_YEAR_BASE 1900 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
142 verify (base_year_is_a_multiple_of_100, TM_YEAR_BASE % 100 == 0); |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
143 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
144 /* Return 1 if YEAR + TM_YEAR_BASE is a leap year. */ |
|
17049
eaa24b775e15
mktime: avoid 'static inline'
Paul Eggert <eggert@cs.ucla.edu>
parents:
16881
diff
changeset
|
145 static int |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
146 leapyear (long_int year) |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
147 { |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
148 /* Don't add YEAR to TM_YEAR_BASE, as that might overflow. |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
149 Also, work even if YEAR is negative. */ |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
150 return |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
151 ((year & 3) == 0 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
152 && (year % 100 != 0 |
| 16877 | 153 || ((year / 100) & 3) == (- (TM_YEAR_BASE / 100) & 3))); |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
154 } |
| 508 | 155 |
| 156 /* How many days come before each month (0-12). */ | |
|
4026
c4a75407123a
Sync from libc, now that it has the latest fix.
Jim Meyering <jim@meyering.net>
parents:
4018
diff
changeset
|
157 #ifndef _LIBC |
|
c4a75407123a
Sync from libc, now that it has the latest fix.
Jim Meyering <jim@meyering.net>
parents:
4018
diff
changeset
|
158 static |
|
c4a75407123a
Sync from libc, now that it has the latest fix.
Jim Meyering <jim@meyering.net>
parents:
4018
diff
changeset
|
159 #endif |
|
c4a75407123a
Sync from libc, now that it has the latest fix.
Jim Meyering <jim@meyering.net>
parents:
4018
diff
changeset
|
160 const unsigned short int __mon_yday[2][13] = |
| 187 | 161 { |
| 162 /* Normal years. */ | |
| 508 | 163 { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, |
| 187 | 164 /* Leap years. */ |
| 508 | 165 { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } |
| 187 | 166 }; |
| 167 | |
| 168 | |
|
4621
3d28ad4e18e2
Add time_r module. Change timegm, mktime, and strftime to use localtime_r
Paul Eggert <eggert@cs.ucla.edu>
parents:
4417
diff
changeset
|
169 #ifndef _LIBC |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
170 /* Portable standalone applications should supply a <time.h> that |
|
4621
3d28ad4e18e2
Add time_r module. Change timegm, mktime, and strftime to use localtime_r
Paul Eggert <eggert@cs.ucla.edu>
parents:
4417
diff
changeset
|
171 declares a POSIX-compliant localtime_r, for the benefit of older |
|
3d28ad4e18e2
Add time_r module. Change timegm, mktime, and strftime to use localtime_r
Paul Eggert <eggert@cs.ucla.edu>
parents:
4417
diff
changeset
|
172 implementations that lack localtime_r or have a nonstandard one. |
|
3d28ad4e18e2
Add time_r module. Change timegm, mktime, and strftime to use localtime_r
Paul Eggert <eggert@cs.ucla.edu>
parents:
4417
diff
changeset
|
173 See the gnulib time_r module for one way to implement this. */ |
|
3d28ad4e18e2
Add time_r module. Change timegm, mktime, and strftime to use localtime_r
Paul Eggert <eggert@cs.ucla.edu>
parents:
4417
diff
changeset
|
174 # undef __localtime_r |
|
3d28ad4e18e2
Add time_r module. Change timegm, mktime, and strftime to use localtime_r
Paul Eggert <eggert@cs.ucla.edu>
parents:
4417
diff
changeset
|
175 # define __localtime_r localtime_r |
|
4931
3743557233a8
(__mktime_internal) [!_LIBC]: Define to mktime_internal
Jim Meyering <jim@meyering.net>
parents:
4666
diff
changeset
|
176 # define __mktime_internal mktime_internal |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
177 # include "mktime-internal.h" |
|
4621
3d28ad4e18e2
Add time_r module. Change timegm, mktime, and strftime to use localtime_r
Paul Eggert <eggert@cs.ucla.edu>
parents:
4417
diff
changeset
|
178 #endif |
| 187 | 179 |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
180 /* Return 1 if the values A and B differ according to the rules for |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
181 tm_isdst: A and B differ if one is zero and the other positive. */ |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
182 static int |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
183 isdst_differ (int a, int b) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
184 { |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
185 return (!a != !b) && (0 <= a) && (0 <= b); |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
186 } |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
187 |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
188 /* Return an integer value measuring (YEAR1-YDAY1 HOUR1:MIN1:SEC1) - |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
189 (YEAR0-YDAY0 HOUR0:MIN0:SEC0) in seconds, assuming that the clocks |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
190 were not adjusted between the time stamps. |
| 9 | 191 |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
192 The YEAR values uses the same numbering as TP->tm_year. Values |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
193 need not be in the usual range. However, YEAR1 must not be less |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
194 than 2 * INT_MIN or greater than 2 * INT_MAX. |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
195 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
196 The result may overflow. It is the caller's responsibility to |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
197 detect overflow. */ |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
198 |
|
17049
eaa24b775e15
mktime: avoid 'static inline'
Paul Eggert <eggert@cs.ucla.edu>
parents:
16881
diff
changeset
|
199 static time_t |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
200 ydhms_diff (long_int year1, long_int yday1, int hour1, int min1, int sec1, |
| 16877 | 201 int year0, int yday0, int hour0, int min0, int sec0) |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
202 { |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
203 verify (C99_integer_division, -1 / 2 == 0); |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
204 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
205 /* Compute intervening leap days correctly even if year is negative. |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
206 Take care to avoid integer overflow here. */ |
|
5409
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
207 int a4 = SHR (year1, 2) + SHR (TM_YEAR_BASE, 2) - ! (year1 & 3); |
|
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
208 int b4 = SHR (year0, 2) + SHR (TM_YEAR_BASE, 2) - ! (year0 & 3); |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
209 int a100 = a4 / 25 - (a4 % 25 < 0); |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
210 int b100 = b4 / 25 - (b4 % 25 < 0); |
|
5409
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
211 int a400 = SHR (a100, 2); |
|
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
212 int b400 = SHR (b100, 2); |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
213 int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400); |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
214 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
215 /* Compute the desired time in time_t precision. Overflow might |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
216 occur here. */ |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
217 time_t tyear1 = year1; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
218 time_t years = tyear1 - year0; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
219 time_t days = 365 * years + yday1 - yday0 + intervening_leap_days; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
220 time_t hours = 24 * days + hour1 - hour0; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
221 time_t minutes = 60 * hours + min1 - min0; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
222 time_t seconds = 60 * minutes + sec1 - sec0; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
223 return seconds; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
224 } |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
225 |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
226 /* Return the average of A and B, even if A + B would overflow. */ |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
227 static time_t |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
228 time_t_avg (time_t a, time_t b) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
229 { |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
230 return SHR (a, 1) + SHR (b, 1) + (a & b & 1); |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
231 } |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
232 |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
233 /* Return 1 if A + B does not overflow. If time_t is unsigned and if |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
234 B's top bit is set, assume that the sum represents A - -B, and |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
235 return 1 if the subtraction does not wrap around. */ |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
236 static int |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
237 time_t_add_ok (time_t a, time_t b) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
238 { |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
239 if (! TYPE_SIGNED (time_t)) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
240 { |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
241 time_t sum = a + b; |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
242 return (sum < a) == (TIME_T_MIDPOINT <= b); |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
243 } |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
244 else if (WRAPV) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
245 { |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
246 time_t sum = a + b; |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
247 return (sum < a) == (b < 0); |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
248 } |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
249 else |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
250 { |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
251 time_t avg = time_t_avg (a, b); |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
252 return TIME_T_MIN / 2 <= avg && avg <= TIME_T_MAX / 2; |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
253 } |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
254 } |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
255 |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
256 /* Return 1 if A + B does not overflow. */ |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
257 static int |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
258 time_t_int_add_ok (time_t a, int b) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
259 { |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
260 verify (int_no_wider_than_time_t, INT_MAX <= TIME_T_MAX); |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
261 if (WRAPV) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
262 { |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
263 time_t sum = a + b; |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
264 return (sum < a) == (b < 0); |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
265 } |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
266 else |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
267 { |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
268 int a_odd = a & 1; |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
269 time_t avg = SHR (a, 1) + (SHR (b, 1) + (a_odd & b)); |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
270 return TIME_T_MIN / 2 <= avg && avg <= TIME_T_MAX / 2; |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
271 } |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
272 } |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
273 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
274 /* Return a time_t value corresponding to (YEAR-YDAY HOUR:MIN:SEC), |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
275 assuming that *T corresponds to *TP and that no clock adjustments |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
276 occurred between *TP and the desired time. |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
277 If TP is null, return a value not equal to *T; this avoids false matches. |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
278 If overflow occurs, yield the minimal or maximal value, except do not |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
279 yield a value equal to *T. */ |
| 508 | 280 static time_t |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
281 guess_time_tm (long_int year, long_int yday, int hour, int min, int sec, |
| 16877 | 282 const time_t *t, const struct tm *tp) |
| 187 | 283 { |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
284 if (tp) |
| 1109 | 285 { |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
286 time_t d = ydhms_diff (year, yday, hour, min, sec, |
| 16877 | 287 tp->tm_year, tp->tm_yday, |
| 288 tp->tm_hour, tp->tm_min, tp->tm_sec); | |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
289 if (time_t_add_ok (*t, d)) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
290 return *t + d; |
| 1109 | 291 } |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
292 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
293 /* Overflow occurred one way or another. Return the nearest result |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
294 that is actually in range, except don't report a zero difference |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
295 if the actual difference is nonzero, as that would cause a false |
|
7276
4be2c469b318
* config/srclist.txt: Temporarily comment out mktime.c until glibc bug
Paul Eggert <eggert@cs.ucla.edu>
parents:
6243
diff
changeset
|
296 match; and don't oscillate between two values, as that would |
|
4be2c469b318
* config/srclist.txt: Temporarily comment out mktime.c until glibc bug
Paul Eggert <eggert@cs.ucla.edu>
parents:
6243
diff
changeset
|
297 confuse the spring-forward gap detector. */ |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
298 return (*t < TIME_T_MIDPOINT |
| 16877 | 299 ? (*t <= TIME_T_MIN + 1 ? *t + 1 : TIME_T_MIN) |
| 300 : (TIME_T_MAX - 1 <= *t ? *t - 1 : TIME_T_MAX)); | |
| 295 | 301 } |
| 302 | |
| 1109 | 303 /* Use CONVERT to convert *T to a broken down time in *TP. |
| 304 If *T is out of range for conversion, adjust it so that | |
| 305 it is the nearest in-range value and then convert that. */ | |
| 306 static struct tm * | |
| 1557 | 307 ranged_convert (struct tm *(*convert) (const time_t *, struct tm *), |
| 16877 | 308 time_t *t, struct tm *tp) |
| 1109 | 309 { |
|
5932
8ef7d6084536
* mktime.c: Include <string.h> even if !DEBUG. (From glibc.)
Paul Eggert <eggert@cs.ucla.edu>
parents:
5848
diff
changeset
|
310 struct tm *r = convert (t, tp); |
| 1109 | 311 |
|
5932
8ef7d6084536
* mktime.c: Include <string.h> even if !DEBUG. (From glibc.)
Paul Eggert <eggert@cs.ucla.edu>
parents:
5848
diff
changeset
|
312 if (!r && *t) |
| 1109 | 313 { |
| 314 time_t bad = *t; | |
| 315 time_t ok = 0; | |
| 316 | |
| 317 /* BAD is a known unconvertible time_t, and OK is a known good one. | |
| 16877 | 318 Use binary search to narrow the range between BAD and OK until |
| 319 they differ by 1. */ | |
| 1109 | 320 while (bad != ok + (bad < 0 ? -1 : 1)) |
| 16877 | 321 { |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
322 time_t mid = *t = time_t_avg (ok, bad); |
| 16877 | 323 r = convert (t, tp); |
| 324 if (r) | |
| 325 ok = mid; | |
| 326 else | |
| 327 bad = mid; | |
| 328 } | |
| 1109 | 329 |
| 330 if (!r && ok) | |
| 16877 | 331 { |
| 332 /* The last conversion attempt failed; | |
| 333 revert to the most recent successful attempt. */ | |
| 334 *t = ok; | |
| 335 r = convert (t, tp); | |
| 336 } | |
| 1109 | 337 } |
| 338 | |
| 339 return r; | |
| 340 } | |
| 341 | |
| 342 | |
| 508 | 343 /* Convert *TP to a time_t value, inverting |
| 344 the monotonic and mostly-unit-linear conversion function CONVERT. | |
| 345 Use *OFFSET to keep track of a guess at the offset of the result, | |
| 346 compared to what the result would be for UTC without leap seconds. | |
|
4931
3743557233a8
(__mktime_internal) [!_LIBC]: Define to mktime_internal
Jim Meyering <jim@meyering.net>
parents:
4666
diff
changeset
|
347 If *OFFSET's guess is correct, only one CONVERT call is needed. |
|
3743557233a8
(__mktime_internal) [!_LIBC]: Define to mktime_internal
Jim Meyering <jim@meyering.net>
parents:
4666
diff
changeset
|
348 This function is external because it is used also by timegm.c. */ |
|
4026
c4a75407123a
Sync from libc, now that it has the latest fix.
Jim Meyering <jim@meyering.net>
parents:
4018
diff
changeset
|
349 time_t |
| 1557 | 350 __mktime_internal (struct tm *tp, |
| 16877 | 351 struct tm *(*convert) (const time_t *, struct tm *), |
| 352 time_t *offset) | |
| 508 | 353 { |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
354 time_t t, gt, t0, t1, t2; |
| 508 | 355 struct tm tm; |
| 356 | |
| 357 /* The maximum number of probes (calls to CONVERT) should be enough | |
| 358 to handle any combinations of time zone rule changes, solar time, | |
|
1517
3f9b7ee1667a
(__mktime_internal): When the requested time falls
Jim Meyering <jim@meyering.net>
parents:
1516
diff
changeset
|
359 leap seconds, and oscillations around a spring-forward gap. |
|
3f9b7ee1667a
(__mktime_internal): When the requested time falls
Jim Meyering <jim@meyering.net>
parents:
1516
diff
changeset
|
360 POSIX.1 prohibits leap seconds, but some hosts have them anyway. */ |
|
3f9b7ee1667a
(__mktime_internal): When the requested time falls
Jim Meyering <jim@meyering.net>
parents:
1516
diff
changeset
|
361 int remaining_probes = 6; |
| 508 | 362 |
| 363 /* Time requested. Copy it in case CONVERT modifies *TP; this can | |
| 364 occur if TP is localtime's returned value and CONVERT is localtime. */ | |
| 365 int sec = tp->tm_sec; | |
| 366 int min = tp->tm_min; | |
| 367 int hour = tp->tm_hour; | |
| 368 int mday = tp->tm_mday; | |
| 369 int mon = tp->tm_mon; | |
| 370 int year_requested = tp->tm_year; | |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
371 int isdst = tp->tm_isdst; |
| 508 | 372 |
|
4018
ad164b161300
Merge in changes from libc.
Jim Meyering <jim@meyering.net>
parents:
4016
diff
changeset
|
373 /* 1 if the previous probe was DST. */ |
|
ad164b161300
Merge in changes from libc.
Jim Meyering <jim@meyering.net>
parents:
4016
diff
changeset
|
374 int dst2; |
|
ad164b161300
Merge in changes from libc.
Jim Meyering <jim@meyering.net>
parents:
4016
diff
changeset
|
375 |
| 508 | 376 /* Ensure that mon is in range, and set year accordingly. */ |
| 377 int mon_remainder = mon % 12; | |
| 378 int negative_mon_remainder = mon_remainder < 0; | |
| 379 int mon_years = mon / 12 - negative_mon_remainder; | |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
380 long_int lyear_requested = year_requested; |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
381 long_int year = lyear_requested + mon_years; |
| 508 | 382 |
| 383 /* The other values need not be in range: | |
| 384 the remaining code handles minor overflows correctly, | |
| 385 assuming int and time_t arithmetic wraps around. | |
| 386 Major overflows are caught at the end. */ | |
| 387 | |
| 388 /* Calculate day of year from year, month, and day of month. | |
| 389 The result need not be in range. */ | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
390 int mon_yday = ((__mon_yday[leapyear (year)] |
| 16877 | 391 [mon_remainder + 12 * negative_mon_remainder]) |
| 392 - 1); | |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
393 long_int lmday = mday; |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
394 long_int yday = mon_yday + lmday; |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
395 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
396 time_t guessed_offset = *offset; |
| 508 | 397 |
| 1030 | 398 int sec_requested = sec; |
|
4018
ad164b161300
Merge in changes from libc.
Jim Meyering <jim@meyering.net>
parents:
4016
diff
changeset
|
399 |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
400 if (LEAP_SECONDS_POSSIBLE) |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
401 { |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
402 /* Handle out-of-range seconds specially, |
| 16877 | 403 since ydhms_tm_diff assumes every minute has 60 seconds. */ |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
404 if (sec < 0) |
| 16877 | 405 sec = 0; |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
406 if (59 < sec) |
| 16877 | 407 sec = 59; |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
408 } |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
409 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
410 /* Invert CONVERT by probing. First assume the same offset as last |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
411 time. */ |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
412 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
413 t0 = ydhms_diff (year, yday, hour, min, sec, |
| 16877 | 414 EPOCH_YEAR - TM_YEAR_BASE, 0, 0, 0, - guessed_offset); |
| 508 | 415 |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
416 if (TIME_T_MAX / INT_MAX / 366 / 24 / 60 / 60 < 3) |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
417 { |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
418 /* time_t isn't large enough to rule out overflows, so check |
| 16877 | 419 for major overflows. A gross check suffices, since if t0 |
| 420 has overflowed, it is off by a multiple of TIME_T_MAX - | |
| 421 TIME_T_MIN + 1. So ignore any component of the difference | |
| 422 that is bounded by a small value. */ | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
423 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
424 /* Approximate log base 2 of the number of time units per |
| 16877 | 425 biennium. A biennium is 2 years; use this unit instead of |
| 426 years to avoid integer overflow. For example, 2 average | |
| 427 Gregorian years are 2 * 365.2425 * 24 * 60 * 60 seconds, | |
| 428 which is 63113904 seconds, and rint (log2 (63113904)) is | |
| 429 26. */ | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
430 int ALOG2_SECONDS_PER_BIENNIUM = 26; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
431 int ALOG2_MINUTES_PER_BIENNIUM = 20; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
432 int ALOG2_HOURS_PER_BIENNIUM = 14; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
433 int ALOG2_DAYS_PER_BIENNIUM = 10; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
434 int LOG2_YEARS_PER_BIENNIUM = 1; |
| 508 | 435 |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
436 int approx_requested_biennia = |
| 16877 | 437 (SHR (year_requested, LOG2_YEARS_PER_BIENNIUM) |
| 438 - SHR (EPOCH_YEAR - TM_YEAR_BASE, LOG2_YEARS_PER_BIENNIUM) | |
| 439 + SHR (mday, ALOG2_DAYS_PER_BIENNIUM) | |
| 440 + SHR (hour, ALOG2_HOURS_PER_BIENNIUM) | |
| 441 + SHR (min, ALOG2_MINUTES_PER_BIENNIUM) | |
| 442 + (LEAP_SECONDS_POSSIBLE | |
| 443 ? 0 | |
| 444 : SHR (sec, ALOG2_SECONDS_PER_BIENNIUM))); | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
445 |
|
5409
bf796f27ccfc
(SHR): New macro, which is a portable
Paul Eggert <eggert@cs.ucla.edu>
parents:
5371
diff
changeset
|
446 int approx_biennia = SHR (t0, ALOG2_SECONDS_PER_BIENNIUM); |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
447 int diff = approx_biennia - approx_requested_biennia; |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
448 int approx_abs_diff = diff < 0 ? -1 - diff : diff; |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
449 |
|
14241
36eacd15d26a
mktime: fix misspelling in comment
Paul Eggert <eggert@cs.ucla.edu>
parents:
14079
diff
changeset
|
450 /* IRIX 4.0.5 cc miscalculates TIME_T_MIN / 3: it erroneously |
| 16877 | 451 gives a positive value of 715827882. Setting a variable |
| 452 first then doing math on it seems to work. | |
| 453 (ghazi@caip.rutgers.edu) */ | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
454 time_t time_t_max = TIME_T_MAX; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
455 time_t time_t_min = TIME_T_MIN; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
456 time_t overflow_threshold = |
| 16877 | 457 (time_t_max / 3 - time_t_min / 3) >> ALOG2_SECONDS_PER_BIENNIUM; |
| 508 | 458 |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
459 if (overflow_threshold < approx_abs_diff) |
| 16877 | 460 { |
| 461 /* Overflow occurred. Try repairing it; this might work if | |
| 462 the time zone offset is enough to undo the overflow. */ | |
| 463 time_t repaired_t0 = -1 - t0; | |
| 464 approx_biennia = SHR (repaired_t0, ALOG2_SECONDS_PER_BIENNIUM); | |
| 465 diff = approx_biennia - approx_requested_biennia; | |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
466 approx_abs_diff = diff < 0 ? -1 - diff : diff; |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
467 if (overflow_threshold < approx_abs_diff) |
| 16877 | 468 return -1; |
| 469 guessed_offset += repaired_t0 - t0; | |
| 470 t0 = repaired_t0; | |
| 471 } | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
472 } |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
473 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
474 /* Repeatedly use the error to improve the guess. */ |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
475 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
476 for (t = t1 = t2 = t0, dst2 = 0; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
477 (gt = guess_time_tm (year, yday, hour, min, sec, &t, |
| 16877 | 478 ranged_convert (convert, &t, &tm)), |
| 479 t != gt); | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
480 t1 = t2, t2 = t, t = gt, dst2 = tm.tm_isdst != 0) |
|
1517
3f9b7ee1667a
(__mktime_internal): When the requested time falls
Jim Meyering <jim@meyering.net>
parents:
1516
diff
changeset
|
481 if (t == t1 && t != t2 |
| 16877 | 482 && (tm.tm_isdst < 0 |
| 483 || (isdst < 0 | |
| 484 ? dst2 <= (tm.tm_isdst != 0) | |
| 485 : (isdst != 0) != (tm.tm_isdst != 0)))) | |
|
1517
3f9b7ee1667a
(__mktime_internal): When the requested time falls
Jim Meyering <jim@meyering.net>
parents:
1516
diff
changeset
|
486 /* We can't possibly find a match, as we are oscillating |
| 16877 | 487 between two values. The requested time probably falls |
| 488 within a spring-forward gap of size GT - T. Follow the common | |
| 489 practice in this case, which is to return a time that is GT - T | |
| 490 away from the requested time, preferring a time whose | |
| 491 tm_isdst differs from the requested value. (If no tm_isdst | |
| 492 was requested and only one of the two values has a nonzero | |
| 493 tm_isdst, prefer that value.) In practice, this is more | |
| 494 useful than returning -1. */ | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
495 goto offset_found; |
|
1517
3f9b7ee1667a
(__mktime_internal): When the requested time falls
Jim Meyering <jim@meyering.net>
parents:
1516
diff
changeset
|
496 else if (--remaining_probes == 0) |
| 508 | 497 return -1; |
| 498 | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
499 /* We have a match. Check whether tm.tm_isdst has the requested |
|
1517
3f9b7ee1667a
(__mktime_internal): When the requested time falls
Jim Meyering <jim@meyering.net>
parents:
1516
diff
changeset
|
500 value, if any. */ |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
501 if (isdst_differ (isdst, tm.tm_isdst)) |
| 508 | 502 { |
|
1661
f3f8922f57bb
(__mktime_internal): Adopt the traditional (and
Jim Meyering <jim@meyering.net>
parents:
1557
diff
changeset
|
503 /* tm.tm_isdst has the wrong value. Look for a neighboring |
| 16877 | 504 time with the right value, and use its UTC offset. |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
505 |
| 16877 | 506 Heuristic: probe the adjacent timestamps in both directions, |
| 507 looking for the desired isdst. This should work for all real | |
| 508 time zone histories in the tz database. */ | |
|
1661
f3f8922f57bb
(__mktime_internal): Adopt the traditional (and
Jim Meyering <jim@meyering.net>
parents:
1557
diff
changeset
|
509 |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
510 /* Distance between probes when looking for a DST boundary. In |
| 16877 | 511 tzdata2003a, the shortest period of DST is 601200 seconds |
| 512 (e.g., America/Recife starting 2000-10-08 01:00), and the | |
| 513 shortest period of non-DST surrounded by DST is 694800 | |
| 514 seconds (Africa/Tunis starting 1943-04-17 01:00). Use the | |
| 515 minimum of these two values, so we don't miss these short | |
| 516 periods when probing. */ | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
517 int stride = 601200; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
518 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
519 /* The longest period of DST in tzdata2003a is 536454000 seconds |
| 16877 | 520 (e.g., America/Jujuy starting 1946-10-01 01:00). The longest |
| 521 period of non-DST is much longer, but it makes no real sense | |
| 522 to search for more than a year of non-DST, so use the DST | |
| 523 max. */ | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
524 int duration_max = 536454000; |
|
1661
f3f8922f57bb
(__mktime_internal): Adopt the traditional (and
Jim Meyering <jim@meyering.net>
parents:
1557
diff
changeset
|
525 |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
526 /* Search in both directions, so the maximum distance is half |
| 16877 | 527 the duration; add the stride to avoid off-by-1 problems. */ |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
528 int delta_bound = duration_max / 2 + stride; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
529 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
530 int delta, direction; |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
531 |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
532 for (delta = stride; delta < delta_bound; delta += stride) |
| 16877 | 533 for (direction = -1; direction <= 1; direction += 2) |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
534 if (time_t_int_add_ok (t, delta * direction)) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
535 { |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
536 time_t ot = t + delta * direction; |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
537 struct tm otm; |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
538 ranged_convert (convert, &ot, &otm); |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
539 if (! isdst_differ (isdst, otm.tm_isdst)) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
540 { |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
541 /* We found the desired tm_isdst. |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
542 Extrapolate back to the desired time. */ |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
543 t = guess_time_tm (year, yday, hour, min, sec, &ot, &otm); |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
544 ranged_convert (convert, &t, &tm); |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
545 goto offset_found; |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
546 } |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
547 } |
| 508 | 548 } |
| 549 | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
550 offset_found: |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
551 *offset = guessed_offset + t - t0; |
| 508 | 552 |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
553 if (LEAP_SECONDS_POSSIBLE && sec_requested != tm.tm_sec) |
| 508 | 554 { |
| 555 /* Adjust time to reflect the tm_sec requested, not the normalized value. | |
| 16877 | 556 Also, repair any damage from a false match due to a leap second. */ |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
557 int sec_adjustment = (sec == 0 && tm.tm_sec == 60) - sec; |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
558 if (! time_t_int_add_ok (t, sec_requested)) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
559 return -1; |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
560 t1 = t + sec_requested; |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
561 if (! time_t_int_add_ok (t1, sec_adjustment)) |
|
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
562 return -1; |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
563 t2 = t1 + sec_adjustment; |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
564 if (! convert (&t2, &tm)) |
| 16877 | 565 return -1; |
|
5506
d0aff9554ddb
(__mktime_internal): If SEC_REQUESTED != SEC,
Paul Eggert <eggert@cs.ucla.edu>
parents:
5409
diff
changeset
|
566 t = t2; |
| 508 | 567 } |
| 568 | |
| 569 *tp = tm; | |
| 570 return t; | |
| 187 | 571 } |
| 508 | 572 |
| 1713 | 573 |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
574 /* FIXME: This should use a signed type wide enough to hold any UTC |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
575 offset in seconds. 'int' should be good enough for GNU code. We |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
576 can't fix this unilaterally though, as other modules invoke |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
577 __mktime_internal. */ |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
578 static time_t localtime_offset; |
| 1713 | 579 |
| 580 /* Convert *TP to a time_t value. */ | |
| 581 time_t | |
|
4354
7b5fd4dc4f90
Assume freestanding C89 or better.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4352
diff
changeset
|
582 mktime (struct tm *tp) |
| 1713 | 583 { |
| 584 #ifdef _LIBC | |
| 585 /* POSIX.1 8.1.1 requires that whenever mktime() is called, the | |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
586 time zone names contained in the external variable 'tzname' shall |
| 1713 | 587 be set as if the tzset() function had been called. */ |
| 588 __tzset (); | |
| 589 #endif | |
| 590 | |
|
4621
3d28ad4e18e2
Add time_r module. Change timegm, mktime, and strftime to use localtime_r
Paul Eggert <eggert@cs.ucla.edu>
parents:
4417
diff
changeset
|
591 return __mktime_internal (tp, __localtime_r, &localtime_offset); |
| 1713 | 592 } |
| 593 | |
| 508 | 594 #ifdef weak_alias |
| 595 weak_alias (mktime, timelocal) | |
| 596 #endif | |
|
4018
ad164b161300
Merge in changes from libc.
Jim Meyering <jim@meyering.net>
parents:
4016
diff
changeset
|
597 |
|
ad164b161300
Merge in changes from libc.
Jim Meyering <jim@meyering.net>
parents:
4016
diff
changeset
|
598 #ifdef _LIBC |
|
ad164b161300
Merge in changes from libc.
Jim Meyering <jim@meyering.net>
parents:
4016
diff
changeset
|
599 libc_hidden_def (mktime) |
|
ad164b161300
Merge in changes from libc.
Jim Meyering <jim@meyering.net>
parents:
4016
diff
changeset
|
600 libc_hidden_weak (timelocal) |
|
ad164b161300
Merge in changes from libc.
Jim Meyering <jim@meyering.net>
parents:
4016
diff
changeset
|
601 #endif |
| 187 | 602 |
| 508 | 603 #if DEBUG |
| 604 | |
| 605 static int | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
606 not_equal_tm (const struct tm *a, const struct tm *b) |
| 508 | 607 { |
| 608 return ((a->tm_sec ^ b->tm_sec) | |
| 16877 | 609 | (a->tm_min ^ b->tm_min) |
| 610 | (a->tm_hour ^ b->tm_hour) | |
| 611 | (a->tm_mday ^ b->tm_mday) | |
| 612 | (a->tm_mon ^ b->tm_mon) | |
| 613 | (a->tm_year ^ b->tm_year) | |
| 614 | (a->tm_yday ^ b->tm_yday) | |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
615 | isdst_differ (a->tm_isdst, b->tm_isdst)); |
| 508 | 616 } |
| 617 | |
| 618 static void | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
619 print_tm (const struct tm *tp) |
| 508 | 620 { |
| 1109 | 621 if (tp) |
| 622 printf ("%04d-%02d-%02d %02d:%02d:%02d yday %03d wday %d isdst %d", | |
| 16877 | 623 tp->tm_year + TM_YEAR_BASE, tp->tm_mon + 1, tp->tm_mday, |
| 624 tp->tm_hour, tp->tm_min, tp->tm_sec, | |
| 625 tp->tm_yday, tp->tm_wday, tp->tm_isdst); | |
| 1109 | 626 else |
| 627 printf ("0"); | |
| 508 | 628 } |
| 629 | |
| 630 static int | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
631 check_result (time_t tk, struct tm tmk, time_t tl, const struct tm *lt) |
| 508 | 632 { |
| 1109 | 633 if (tk != tl || !lt || not_equal_tm (&tmk, lt)) |
| 508 | 634 { |
| 635 printf ("mktime ("); | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
636 print_tm (lt); |
| 508 | 637 printf (")\nyields ("); |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
638 print_tm (&tmk); |
|
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
639 printf (") == %ld, should be %ld\n", (long int) tk, (long int) tl); |
| 508 | 640 return 1; |
| 641 } | |
| 642 | |
| 643 return 0; | |
| 644 } | |
| 645 | |
| 646 int | |
|
4354
7b5fd4dc4f90
Assume freestanding C89 or better.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4352
diff
changeset
|
647 main (int argc, char **argv) |
| 187 | 648 { |
| 508 | 649 int status = 0; |
| 650 struct tm tm, tmk, tml; | |
| 1109 | 651 struct tm *lt; |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
652 time_t tk, tl, tl1; |
| 508 | 653 char trailer; |
| 187 | 654 |
| 508 | 655 if ((argc == 3 || argc == 4) |
| 656 && (sscanf (argv[1], "%d-%d-%d%c", | |
| 16877 | 657 &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &trailer) |
| 658 == 3) | |
| 508 | 659 && (sscanf (argv[2], "%d:%d:%d%c", |
| 16877 | 660 &tm.tm_hour, &tm.tm_min, &tm.tm_sec, &trailer) |
| 661 == 3)) | |
| 508 | 662 { |
| 663 tm.tm_year -= TM_YEAR_BASE; | |
| 664 tm.tm_mon--; | |
| 665 tm.tm_isdst = argc == 3 ? -1 : atoi (argv[3]); | |
| 666 tmk = tm; | |
| 667 tl = mktime (&tmk); | |
| 1109 | 668 lt = localtime (&tl); |
| 669 if (lt) | |
| 16877 | 670 { |
| 671 tml = *lt; | |
| 672 lt = &tml; | |
| 673 } | |
|
4417
5cf298f2f367
Fix some boundary cases and remove need for floating point.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4354
diff
changeset
|
674 printf ("mktime returns %ld == ", (long int) tl); |
| 508 | 675 print_tm (&tmk); |
| 676 printf ("\n"); | |
| 1109 | 677 status = check_result (tl, tmk, tl, lt); |
| 508 | 678 } |
| 679 else if (argc == 4 || (argc == 5 && strcmp (argv[4], "-") == 0)) | |
| 680 { | |
| 681 time_t from = atol (argv[1]); | |
| 682 time_t by = atol (argv[2]); | |
| 683 time_t to = atol (argv[3]); | |
| 187 | 684 |
| 508 | 685 if (argc == 4) |
| 16877 | 686 for (tl = from; by < 0 ? to <= tl : tl <= to; tl = tl1) |
| 687 { | |
| 688 lt = localtime (&tl); | |
| 689 if (lt) | |
| 690 { | |
| 691 tmk = tml = *lt; | |
| 692 tk = mktime (&tmk); | |
| 693 status |= check_result (tk, tmk, tl, &tml); | |
| 694 } | |
| 695 else | |
| 696 { | |
| 697 printf ("localtime (%ld) yields 0\n", (long int) tl); | |
| 698 status = 1; | |
| 699 } | |
| 700 tl1 = tl + by; | |
| 701 if ((tl1 < tl) != (by < 0)) | |
| 702 break; | |
| 703 } | |
| 508 | 704 else |
| 16877 | 705 for (tl = from; by < 0 ? to <= tl : tl <= to; tl = tl1) |
| 706 { | |
| 707 /* Null benchmark. */ | |
| 708 lt = localtime (&tl); | |
| 709 if (lt) | |
| 710 { | |
| 711 tmk = tml = *lt; | |
| 712 tk = tl; | |
| 713 status |= check_result (tk, tmk, tl, &tml); | |
| 714 } | |
| 715 else | |
| 716 { | |
| 717 printf ("localtime (%ld) yields 0\n", (long int) tl); | |
| 718 status = 1; | |
| 719 } | |
| 720 tl1 = tl + by; | |
| 721 if ((tl1 < tl) != (by < 0)) | |
| 722 break; | |
| 723 } | |
| 508 | 724 } |
| 725 else | |
| 726 printf ("Usage:\ | |
| 727 \t%s YYYY-MM-DD HH:MM:SS [ISDST] # Test given time.\n\ | |
| 728 \t%s FROM BY TO # Test values FROM, FROM+BY, ..., TO.\n\ | |
| 729 \t%s FROM BY TO - # Do not test those values (for benchmark).\n", | |
| 16877 | 730 argv[0], argv[0], argv[0]); |
| 187 | 731 |
| 508 | 732 return status; |
| 733 } | |
| 295 | 734 |
| 187 | 735 #endif /* DEBUG */ |
| 295 | 736 |
| 737 /* | |
| 738 Local Variables: | |
|
16881
122207a2ef3a
* lib/mktime.c: Revert autoupdate, which fetched the wrong version.
Paul Eggert <eggert@cs.ucla.edu>
parents:
16879
diff
changeset
|
739 compile-command: "gcc -DDEBUG -I. -Wall -W -O2 -g mktime.c -o mktime" |
| 295 | 740 End: |
| 741 */ |