gnulib: lib/mktime.c annotate

annotate lib/mktime.c @ 16366:bb182ee4a09d

maint: replace FSF snail-mail addresses with URLs * config/argz.mk, lib/accept4.c, lib/alignof.h, lib/alloca.in.h: * lib/alphasort.c, lib/arcfour.c, lib/arcfour.h, lib/arctwo.c: * lib/arctwo.h, lib/argz.c, lib/arpa_inet.in.h, lib/asnprintf.c: * lib/asprintf.c, lib/assert.in.h, lib/base32.c, lib/base32.h: * lib/base64.c, lib/base64.h, lib/c-ctype.c, lib/c-ctype.h: * lib/c-strcase.h, lib/c-strcasecmp.c, lib/c-strncasecmp.c: * lib/check-version.c, lib/check-version.h, lib/config.charset: * lib/ctype.in.h, lib/des.c, lib/des.h, lib/dup3.c, lib/errno.in.h: * lib/float+.h, lib/fnmatch.c, lib/fnmatch.in.h, lib/fnmatch_loop.c: * lib/fseeko.c, lib/gai_strerror.c, lib/gc-gnulib.c: * lib/gc-libgcrypt.c, lib/gc-pbkdf2-sha1.c, lib/gc.h: * lib/getaddrinfo.c, lib/getdelim.c, lib/getfilecon.c, lib/getline.c: * lib/getlogin_r.c, lib/getpass.c, lib/getpass.h, lib/gettext.h: * lib/gettimeofday.c, lib/glob.in.h, lib/glthread/cond.c: * lib/glthread/cond.h, lib/glthread/lock.c, lib/glthread/lock.h: * lib/glthread/thread.c, lib/glthread/thread.h: * lib/glthread/threadlib.c, lib/glthread/yield.h, lib/hmac-md5.c: * lib/hmac-sha1.c, lib/hmac.h, lib/iconv.c, lib/iconv.in.h: * lib/iconv_close.c, lib/iconv_open.c, lib/inet_ntop.c, lib/isfinite.c: * lib/isinf.c, lib/iswblank.c, lib/langinfo.in.h, lib/link.c: * lib/localcharset.c, lib/localcharset.h, lib/lseek.c, lib/malloc.c: * lib/malloca.c, lib/malloca.h, lib/md2.c, lib/md2.h, lib/md4.c: * lib/md4.h, lib/md5.c, lib/md5.h, lib/memmem.c, lib/mempcpy.c: * lib/memset.c, lib/memxor.c, lib/memxor.h, lib/minmax.h, lib/mktime.c: * lib/msvc-inval.c, lib/msvc-inval.h, lib/msvc-nothrow.c: * lib/msvc-nothrow.h, lib/netdb.in.h, lib/netinet_in.in.h, lib/nproc.c: * lib/nproc.h, lib/obstack_printf.c, lib/pathmax.h, lib/pipe.c: * lib/pipe2.c, lib/poll.c, lib/poll.in.h, lib/printf-args.c: * lib/printf-args.h, lib/printf-parse.c, lib/printf-parse.h: * lib/pselect.c, lib/pthread.in.h, lib/pty-private.h, lib/pty.in.h: * lib/read-file.c, lib/read-file.h, lib/ref-add.sin, lib/ref-del.sin: * lib/regcomp.c, lib/regex.c, lib/regex.h, lib/regex_internal.c: * lib/regex_internal.h, lib/regexec.c, lib/rijndael-alg-fst.c: * lib/rijndael-alg-fst.h, lib/rijndael-api-fst.c: * lib/rijndael-api-fst.h, lib/rint.c, lib/rintf.c, lib/rintl.c: * lib/round.c, lib/roundf.c, lib/roundl.c, lib/scandir.c, lib/select.c: * lib/sha1.c, lib/sha1.h, lib/size_max.h, lib/snprintf.c: * lib/stdalign.in.h, lib/stdarg.in.h, lib/stdbool.in.h: * lib/stddef.in.h, lib/stdint.in.h, lib/stdio.in.h, lib/str-kmp.h: * lib/str-two-way.h, lib/strcasecmp.c, lib/strcasestr.c, lib/strdup.c: * lib/striconv.c, lib/striconv.h, lib/string.in.h, lib/strings.in.h: * lib/strncasecmp.c, lib/strndup.c, lib/strnlen.c, lib/strpbrk.c: * lib/strptime.c, lib/strsep.c, lib/strstr.c, lib/strverscmp.c: * lib/sys_file.in.h, lib/sys_ioctl.in.h, lib/sys_select.in.h: * lib/sys_socket.in.h, lib/sys_stat.in.h, lib/sys_time.in.h: * lib/sys_times.in.h, lib/sys_types.in.h, lib/sys_uio.in.h: * lib/sys_utsname.in.h, lib/sys_wait.in.h, lib/tcgetsid.c: * lib/termios.in.h, lib/time.in.h, lib/time_r.c, lib/timegm.c: * lib/times.c, lib/unictype/3level.h, lib/unictype/3levelbit.h: * lib/unistd.in.h, lib/vasnprintf.c, lib/vasnprintf.h, lib/vasprintf.c: * lib/vsnprintf.c, lib/waitpid.c, lib/wchar.in.h, lib/wctype.in.h: * lib/xsize.h, tests/test-closein.c, tests/test-des.c: * tests/test-fclose.c, tests/test-fgetc.c, tests/test-filevercmp.c: * tests/test-fputc.c, tests/test-fread.c, tests/test-fwrite.c: * tests/test-gc-arcfour.c, tests/test-gc-arctwo.c, tests/test-gc-des.c: * tests/test-gc-hmac-md5.c, tests/test-gc-hmac-sha1.c: * tests/test-gc-md2.c, tests/test-gc-md4.c, tests/test-gc-md5.c: * tests/test-gc-pbkdf2-sha1.c, tests/test-gc-rijndael.c: * tests/test-gc-sha1.c, tests/test-gc.c, tests/test-getdelim.c: * tests/test-getline.c, tests/test-getndelim2.c, tests/test-md2.c: * tests/test-md4.c, tests/test-parse-datetime.c, tests/test-perror.c: * tests/test-perror2.c, tests/test-pipe.c, tests/test-pipe2.c: * tests/test-poll.c, tests/test-quotearg-simple.c: * tests/test-quotearg.c, tests/test-quotearg.h: * tests/test-round-ieee.c, tests/test-round1.c: * tests/test-roundf-ieee.c, tests/test-roundf1.c: * tests/test-roundl-ieee.c, tests/test-roundl.c: * tests/test-safe-alloc.c, tests/test-sigpipe.c: * tests/test-spawn-pipe-child.c, tests/test-spawn-pipe-main.c: * tests/test-strerror.c, tests/test-strerror_r.c: * tests/test-strsignal.c, tests/test-strverscmp.c: * tests/test-xmemdup0.c: Replace FSF snail mail addresses with URLs, as per GNU coding standards. See glibc bug <http://sourceware.org/bugzilla/show_bug.cgi?id=13673>.

author	Paul Eggert <eggert@cs.ucla.edu>
date	Thu, 09 Feb 2012 21:39:05 -0800
parents	b32a684edf4d
children	c01778431ed2

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

Mercurial > gnulib

annotate lib/mktime.c @ 16366:bb182ee4a09d