mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-28 04:03:35 +08:00
cc3fa75512
1997-11-11 21:30 Ulrich Drepper <drepper@cygnus.com> * include/sys/stat.h: Define stat, fstat, lstat and *64 variants as macros so the the library compiles correctly even without optimization. * io/fstat.c: Undef fstat. * io/fstat64.c: Undef fstat64 * io/lstat.c: Undef lstat. * io/lstat64.c: Undef lstat64 * io/stat.c: Undef stat. * io/stat64.c: Undef stat64 * io/fts.c: Include <include/sys/stat.h> to get macro definitions. * io/ftw.c: Likewise. * io/getdirname.c: Likewise. * Makefile (install): Run test-installation.pl if possible. * db2/Makefile: Update from db-2.3.12. * db2/db.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_open.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/bt_search.c: Likewise. * db2/btree/bt_split.c: Likewise. * db2/btree/bt_stat.c: Likewise. * db2/btree/btree.src: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_open.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/bt_search.c: Likewise. * db2/btree/bt_split.c: Likewise. * db2/btree/bt_stat.c: Likewise. * db2/btree/btree.src: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/common/db_appinit.c: Likewise. * db2/common/db_apprec.c: Likewise. * db2/common/db_byteorder.c: Likewise. * db2/common/db_region.c: Likewise. * db2/db/db.c: Likewise * db2/db/db.src: Likewise * db2/db/db_auto.c: Likewise * db2/db/db_dispatch.c: Likewise * db2/db/db_dup.c: Likewise * db2/db/db_overflow.c: Likewise * db2/db/db_pr.c: Likewise * db2/db/db_rec.c: Likewise * db2/db/db_ret.c: Likewise * db2/db/db_thread.c: Likewise * db2/db185/db185.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash.src: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/include/btree_auto.h: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/clib_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_am.h: Likewise. * db2/include/db_auto.h: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/hash.h: Likewise. * db2/include/hash_auto.h: Likewise. * db2/include/hash_ext.h: Likewise. * db2/include/lock.h: Likewise. * db2/include/lock_ext.h: Likewise. * db2/include/log.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/mutex_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/os_func.h: Likewise. * db2/include/txn.h: Likewise. * db2/include/txn_ext.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log_archive.c: Likewise. * db2/log/log_auto.c: Likewise. * db2/log/log_findckp.c: Likewise. * db2/log/log_get.c: Likewise. * db2/log/log_put.c: Likewise. * db2/log/log_rec.c: Likewise. * db2/log/log_register.c: Likewise. * db2/mp/mp_bh.c: Likewise. * db2/mp/mp_fget.c: Likewise. * db2/mp/mp_fopen.c: Likewise. * db2/mp/mp_fput.c: Likewise. * db2/mp/mp_fset.c: Likewise. * db2/mp/mp_open.c: Likewise. * db2/mp/mp_pr.c: Likewise. * db2/mp/mp_region.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/os_abs.c: Likewise. * db2/os/os_dir.c: Likewise. * db2/os/os_fid.c: Likewise. * db2/os/os_fsync.c: Likewise. * db2/os/os_func.c: Likewise. * db2/os/os_map.c: Likewise. * db2/os/os_oflags.c: Likewise. * db2/os/os_open.c: Likewise. * db2/os/os_rpath.c: Likewise. * db2/os/os_rw.c: Likewise. * db2/os/os_seek.c: Likewise. * db2/os/os_sleep.c: Likewise. * db2/os/os_stat.c: Likewise. * db2/os/os_unlink.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_dump/db_dump.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/progs/db_stat/db_stat.c: Likewise. * db2/txn/txn.c: Likewise. * db2/txn/txn_auto.c: Likewise. * db2/txn/txn_rec.c: Likewise. * db2/os/db_os_abs.c: Removed. * db2/os/db_os_dir.c: Removed. * db2/os/db_os_fid.c: Removed. * db2/os/db_os_lseek.c: Removed. * db2/os/db_os_mmap.c: Removed. * db2/os/db_os_open.c: Removed. * db2/os/db_os_rw.c: Removed. * db2/os/db_os_sleep.c: Removed. * db2/os/db_os_stat.c: Removed. * db2/os/db_os_unlink.c: Removed. * libio/stdio.h (fopen): Add __restrict to parameters. * manual/process.texi (system): Describe behaviour for NULL argument. * stdio-common/printf-parse.h: Parse hh modifier. * stdio-common/vfprintf.c: Handle hh modifier. * stdio-common/vfscanf.c: Likewise. * manual/stdio.texi: Describe hh modifier for scanf/printf. * math/complex.h: Don't define _Imaginary_I, but instead _Complex_I. gcc does no yet know the `imaginary' keyword. * math/test-math.c: Add little test for know gcc bug. * math/tgmath.h: Make complex versions of log10() only available if __USE_GNU. * stdlib/test-canon.c: Fix typo. * sysdeps/generic/setenv.c: Avoid compilation warnings. Reported by Jim Meyering. * sysdeps/generic/bits/errno.h: EILSEQ is an ISO C error number. * sysdeps/mach/hurd/bits/errno.h: Likewise. * sysdeps/standalone/bits/errno.h: Likewise. * sysdeps/unix/sysv/linux/bits/errno.h: Likewise. * sysdeps/i386/i586/memcpy.S: New file. * sysdeps/i386/i586/mempcpy.S: New file. * sysdeps/i386/i586/memset.S: Fix typo. * sysdeps/posix/getcwd.c: Define HAVE_MEMPCPY for _LIBC. Add casts. * sysdeps/posix/system.c: Add comment to explain code. * sysdeps/wordsize-32/inttypes.h: Include <stddef.h> for wchar_t. Define PTRDIFF_{MIN,MAX}, SIG_ATOMIC_{MIN,MAX}, SIZE_MAX, WCHAR_{MIN,MAX}, WINT_{MIN,MAX}. Define wcstoimax, wcstoumax. * sysdeps/wordsize-64/inttypes.h: Likewise. * wcsmbs/wchar.h: Define WCHAR_{MIN,MAX} if not already defined. Declare __wcsto{l,ul,ll,ull}_internal only if not already done. * time/Makefile (routines): Add strfxtime. * time/strftime.c: Implement %F and %f format. * time/strfxtime.c: New file. * time/time.h: Define new types and symbols from ISO C 9X. * time/mktime.c: Little comment correction. 1997-11-10 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/libm-ieee754/s_sincosl.c: Fix typo. * sysdeps/libm-ieee754/s_tanl.c: Fix typo. * sysdeps/libm-ieee754/s_floorl.c: Correct typos. * sysdeps/libm-ieee754/e_remainderl.c: Replace EXTRACT_LDOUBLE_WORDS by GET_LDOUBLE_WORDS. * sysdeps/libm-ieee754/e_atan2l.c: Replace EXTRACT_LDOUBLE_WORDS by GET_LDOUBLE_WORDS. * sysdeps/libm-ieee754/s_scalbnl.c: Replace ";" by "," for correct variable declaration. * sysdeps/libm-ieee754/s_scalblnl.c: Likewise. * sysdeps/libm-ieee754/s_lrint.c (__lrint): Correct function. * math/libm-test.c (sqrt_test): Add test for sqrt (0.25). (asin_test): Add more test. 1997-11-10 23:34 Ulrich Drepper <drepper@cygnus.com> * sysdeps/libm-ieee754/e_asin.c: Add braces to make code clearer and to not confuse the poor compiler. * sysdeps/libm-ieee754/e_asinf.c: Likewise. Reported by vertex@cagent.com. 1997-11-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-lookup.c (do_lookup): Don't accept the base version if we require a specific one. * libio/oldfreopen.c: Bind old symbols to version GLIBC_2.0. * libio/oldiofopen.c: Likewise. * libio/oldstdfiles.c: Likewise. * libc.map: Export them. 1997-11-10 07:40 H.J. Lu <hjl@gnu.ai.mit.edu> * stdlib/exit.c (exit): Handle recursive calls to exit (). 1997-11-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/s_llrint.c: Fixed to take double argument instead of long double. * sysdeps/m68k/fpu/s_llrintf.c: New file. * sysdeps/m68k/fpu/s_llrintl.c: New file. * sysdeps/libm-ieee754/s_llrint.c: Make compilable and fix overflow condition. * sysdeps/libm-ieee754/s_llrintf.c: Fix overflow condition. * sysdeps/libm-ieee754/s_llrintl.c: Likewise. * sysdeps/libm-ieee754/s_llround.c: Likewise. * sysdeps/libm-ieee754/s_llroundf.c: Likewise. * sysdeps/libm-ieee754/s_llroundl.c: Likewise. * sysdeps/libm-ieee754/s_lrint.c: Likewise. * sysdeps/libm-ieee754/s_lrintf.c: Likewise. * sysdeps/libm-ieee754/s_lrintl.c: Likewise. * sysdeps/libm-ieee754/s_lround.c: Likewise. * sysdeps/libm-ieee754/s_lroundf.c: Likewise. * sysdeps/libm-ieee754/s_lroundl.c: Likewise. * math/libm-test.c: Test all three variants of lrint and llrint. Fix typos in lround and llround tests. Add tests for boundary cases for lrint and llround. 1997-11-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/arith.texi: Misc doc fixes. * manual/ctype.texi: Likewise. * manual/pattern.texi: Likewise. * manual/terminal.texi: Likewise. 1997-11-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/xstatconv.c: Use struct assignment instead of memcpy to let the compiler use whatever it regards as optimal. * sysdeps/unix/sysv/linux/alpha/xstatconv.c: Likewise. 1997-11-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [$(subdir)=misc]: Add sys/prctl.h. * sysdeps/unix/sysv/linux/Dist: Distribute it. 1997-11-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * io/ftwtest-sh: Don't use the unknown which command, instead try pwd as /bin/pwd and /usr/bin/pwd. 1997-11-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/maint.texi (Tools for Installation): Don't recommend broken version 3.76.1 of make. (Porting): Fix wording. 1997-11-06 06:13 H.J. Lu <hjl@gnu.ai.mit.edu> * config.make.in (build-pic-default): New, defined with pic_default. * configure.in (pic_default): New, set to yes if PIC is default. * Makeconfig (CPPFLAGS-.o, CPPFLAGS-.op, CPPFLAGS-.og, CPPFLAGS-.ob): Add -DPIC if $(build-pic-default) is yes. 1997-11-09 18:15 Ulrich Drepper <drepper@cygnus.com> * Makerules (libc.so): Fix typo. * csu/Makefile (CFLAGS-initfini.s): Correctly fix moving function definition. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>. * stdlib/strtod.c: Handle numbers like 0.0e10000 correctly which produce ±0.0. Reported by Joe Keane <jgk@jgk.org>. * sysdeps/libm-ieee754/s_ceill.c: Fix typos. * sysdeps/libm-ieee754/s_llrint.c: Correct code, it never worked. 1997-11-06 07:00 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/unix/sysv/i386/i686/time.S: Removed. 1997-11-08 14:07 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/libnsl.map: Add __do_niscall2 for nis_cachemgr. * nis/nis_call.c: Set UDP resend timeout correct. * nis/nss_compat/compat-grp.c: Rewritten to make it faster. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/ypclnt.c: Fix UDP resend timeout, fix yp_bind/do_ypcall interaction. * inet/protocols/routed.h: Include sys/socket.h. * inet/protocols/talkd.h: Likewise. * inet/protocols/timed.h: Include rpc/types.h. * sunrpc/rpc/pmap_clnt.h: Include rpc/clnt.h. 1997-11-06 01:39 Ulrich Drepper <drepper@cygnus.com> * Makerules (libc.so): Add missing closing brace. 1997-11-05 Brendan Kehoe <brendan@lisa.cygnus.com> * libio.h (__P): Name its arg `p' instead of `params'. This was added solely to work around problems with the definition of __P in the Solaris math.h header.
432 lines
12 KiB
C
432 lines
12 KiB
C
/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
Contributed by Paul Eggert (eggert@twinsun.com).
|
||
|
||
The GNU C Library is free software; you can redistribute it and/or
|
||
modify it under the terms of the GNU Library General Public License as
|
||
published by the Free Software Foundation; either version 2 of the
|
||
License, or (at your option) any later version.
|
||
|
||
The GNU C Library is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
Library General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Library General Public
|
||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||
Boston, MA 02111-1307, USA. */
|
||
|
||
/* Define this to have a standalone program to test this implementation of
|
||
mktime. */
|
||
/* #define DEBUG 1 */
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
# include <config.h>
|
||
#endif
|
||
|
||
#ifdef _LIBC
|
||
# define HAVE_LIMITS_H 1
|
||
# define HAVE_LOCALTIME_R 1
|
||
# define STDC_HEADERS 1
|
||
#endif
|
||
|
||
/* Assume that leap seconds are possible, unless told otherwise.
|
||
If the host has a `zic' command with a `-L leapsecondfilename' option,
|
||
then it supports leap seconds; otherwise it probably doesn't. */
|
||
#ifndef LEAP_SECONDS_POSSIBLE
|
||
# define LEAP_SECONDS_POSSIBLE 1
|
||
#endif
|
||
|
||
#include <sys/types.h> /* Some systems define `time_t' here. */
|
||
#include <time.h>
|
||
|
||
#if HAVE_LIMITS_H
|
||
# include <limits.h>
|
||
#endif
|
||
|
||
#if DEBUG
|
||
# include <stdio.h>
|
||
# if STDC_HEADERS
|
||
# include <stdlib.h>
|
||
# endif
|
||
/* Make it work even if the system's libc has its own mktime routine. */
|
||
# define mktime my_mktime
|
||
#endif /* DEBUG */
|
||
|
||
#ifndef __P
|
||
# if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
|
||
# define __P(args) args
|
||
# else
|
||
# define __P(args) ()
|
||
# endif /* GCC. */
|
||
#endif /* Not __P. */
|
||
|
||
#ifndef CHAR_BIT
|
||
# define CHAR_BIT 8
|
||
#endif
|
||
|
||
#ifndef INT_MIN
|
||
# define INT_MIN (~0 << (sizeof (int) * CHAR_BIT - 1))
|
||
#endif
|
||
#ifndef INT_MAX
|
||
# define INT_MAX (~0 - INT_MIN)
|
||
#endif
|
||
|
||
#ifndef TIME_T_MIN
|
||
/* The outer cast to time_t works around a bug in Cray C 5.0.3.0. */
|
||
# define TIME_T_MIN ((time_t) \
|
||
(0 < (time_t) -1 ? (time_t) 0 \
|
||
: ~ (time_t) 0 << (sizeof (time_t) * CHAR_BIT - 1)))
|
||
#endif
|
||
#ifndef TIME_T_MAX
|
||
# define TIME_T_MAX (~ (time_t) 0 - TIME_T_MIN)
|
||
#endif
|
||
|
||
#define TM_YEAR_BASE 1900
|
||
#define EPOCH_YEAR 1970
|
||
|
||
#ifndef __isleap
|
||
/* Nonzero if YEAR is a leap year (every 4 years,
|
||
except every 100th isn't, and every 400th is). */
|
||
# define __isleap(year) \
|
||
((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
|
||
#endif
|
||
|
||
/* How many days come before each month (0-12). */
|
||
const unsigned short int __mon_yday[2][13] =
|
||
{
|
||
/* Normal years. */
|
||
{ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
|
||
/* Leap years. */
|
||
{ 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
|
||
};
|
||
|
||
static time_t ydhms_tm_diff __P ((int, int, int, int, int, const struct tm *));
|
||
time_t __mktime_internal __P ((struct tm *,
|
||
struct tm *(*) (const time_t *, struct tm *),
|
||
time_t *));
|
||
|
||
|
||
#ifdef _LIBC
|
||
# define localtime_r __localtime_r
|
||
#else
|
||
# if ! HAVE_LOCALTIME_R && ! defined localtime_r
|
||
/* Approximate localtime_r as best we can in its absence. */
|
||
# define localtime_r my_mktime_localtime_r
|
||
static struct tm *localtime_r __P ((const time_t *, struct tm *));
|
||
static struct tm *
|
||
localtime_r (t, tp)
|
||
const time_t *t;
|
||
struct tm *tp;
|
||
{
|
||
struct tm *l = localtime (t);
|
||
if (! l)
|
||
return 0;
|
||
*tp = *l;
|
||
return tp;
|
||
}
|
||
# endif /* ! HAVE_LOCALTIME_R && ! defined (localtime_r) */
|
||
#endif /* ! _LIBC */
|
||
|
||
|
||
/* Yield the difference between (YEAR-YDAY HOUR:MIN:SEC) and (*TP),
|
||
measured in seconds, ignoring leap seconds.
|
||
YEAR uses the same numbering as TM->tm_year.
|
||
All values are in range, except possibly YEAR.
|
||
If overflow occurs, yield the low order bits of the correct answer. */
|
||
static time_t
|
||
ydhms_tm_diff (year, yday, hour, min, sec, tp)
|
||
int year, yday, hour, min, sec;
|
||
const struct tm *tp;
|
||
{
|
||
/* Compute intervening leap days correctly even if year is negative.
|
||
Take care to avoid int overflow. time_t overflow is OK, since
|
||
only the low order bits of the correct time_t answer are needed.
|
||
Don't convert to time_t until after all divisions are done, since
|
||
time_t might be unsigned. */
|
||
int a4 = (year >> 2) + (TM_YEAR_BASE >> 2) - ! (year & 3);
|
||
int b4 = (tp->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (tp->tm_year & 3);
|
||
int a100 = a4 / 25 - (a4 % 25 < 0);
|
||
int b100 = b4 / 25 - (b4 % 25 < 0);
|
||
int a400 = a100 >> 2;
|
||
int b400 = b100 >> 2;
|
||
int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400);
|
||
time_t years = year - (time_t) tp->tm_year;
|
||
time_t days = (365 * years + intervening_leap_days
|
||
+ (yday - tp->tm_yday));
|
||
return (60 * (60 * (24 * days + (hour - tp->tm_hour))
|
||
+ (min - tp->tm_min))
|
||
+ (sec - tp->tm_sec));
|
||
}
|
||
|
||
|
||
static time_t localtime_offset;
|
||
|
||
/* Convert *TP to a time_t value. */
|
||
time_t
|
||
mktime (tp)
|
||
struct tm *tp;
|
||
{
|
||
#ifdef _LIBC
|
||
/* POSIX.1 8.1.1 requires that whenever mktime() is called, the
|
||
time zone names contained in the external variable `tzname' shall
|
||
be set as if the tzset() function had been called. */
|
||
__tzset ();
|
||
#endif
|
||
|
||
return __mktime_internal (tp, localtime_r, &localtime_offset);
|
||
}
|
||
|
||
/* Convert *TP to a time_t value, inverting
|
||
the monotonic and mostly-unit-linear conversion function CONVERT.
|
||
Use *OFFSET to keep track of a guess at the offset of the result,
|
||
compared to what the result would be for UTC without leap seconds.
|
||
If *OFFSET's guess is correct, only one CONVERT call is needed. */
|
||
time_t
|
||
__mktime_internal (tp, convert, offset)
|
||
struct tm *tp;
|
||
struct tm *(*convert) __P ((const time_t *, struct tm *));
|
||
time_t *offset;
|
||
{
|
||
time_t t, dt, t0;
|
||
struct tm tm;
|
||
|
||
/* The maximum number of probes (calls to CONVERT) should be enough
|
||
to handle any combinations of time zone rule changes, solar time,
|
||
and leap seconds. POSIX.1 prohibits leap seconds, but some hosts
|
||
have them anyway. */
|
||
int remaining_probes = 4;
|
||
|
||
/* Time requested. Copy it in case CONVERT modifies *TP; this can
|
||
occur if TP is localtime's returned value and CONVERT is localtime. */
|
||
int sec = tp->tm_sec;
|
||
int min = tp->tm_min;
|
||
int hour = tp->tm_hour;
|
||
int mday = tp->tm_mday;
|
||
int mon = tp->tm_mon;
|
||
int year_requested = tp->tm_year;
|
||
int isdst = tp->tm_isdst;
|
||
|
||
/* Ensure that mon is in range, and set year accordingly. */
|
||
int mon_remainder = mon % 12;
|
||
int negative_mon_remainder = mon_remainder < 0;
|
||
int mon_years = mon / 12 - negative_mon_remainder;
|
||
int year = year_requested + mon_years;
|
||
|
||
/* The other values need not be in range:
|
||
the remaining code handles minor overflows correctly,
|
||
assuming int and time_t arithmetic wraps around.
|
||
Major overflows are caught at the end. */
|
||
|
||
/* Calculate day of year from year, month, and day of month.
|
||
The result need not be in range. */
|
||
int yday = ((__mon_yday[__isleap (year + TM_YEAR_BASE)]
|
||
[mon_remainder + 12 * negative_mon_remainder])
|
||
+ mday - 1);
|
||
|
||
int sec_requested = sec;
|
||
#if LEAP_SECONDS_POSSIBLE
|
||
/* Handle out-of-range seconds specially,
|
||
since ydhms_tm_diff assumes every minute has 60 seconds. */
|
||
if (sec < 0)
|
||
sec = 0;
|
||
if (59 < sec)
|
||
sec = 59;
|
||
#endif
|
||
|
||
/* Invert CONVERT by probing. First assume the same offset as last time.
|
||
Then repeatedly use the error to improve the guess. */
|
||
|
||
tm.tm_year = EPOCH_YEAR - TM_YEAR_BASE;
|
||
tm.tm_yday = tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
|
||
t0 = ydhms_tm_diff (year, yday, hour, min, sec, &tm);
|
||
|
||
for (t = t0 + *offset;
|
||
(dt = ydhms_tm_diff (year, yday, hour, min, sec, (*convert) (&t, &tm)));
|
||
t += dt)
|
||
if (--remaining_probes == 0)
|
||
return -1;
|
||
|
||
/* Check whether tm.tm_isdst has the requested value, if any. */
|
||
if (0 <= isdst && 0 <= tm.tm_isdst)
|
||
{
|
||
int dst_diff = (isdst != 0) - (tm.tm_isdst != 0);
|
||
if (dst_diff)
|
||
{
|
||
/* Move two hours in the direction indicated by the disagreement,
|
||
probe some more, and switch to a new time if found.
|
||
The largest known fallback due to daylight savings is two hours:
|
||
once, in Newfoundland, 1988-10-30 02:00 -> 00:00. */
|
||
time_t ot = t - 2 * 60 * 60 * dst_diff;
|
||
while (--remaining_probes != 0)
|
||
{
|
||
struct tm otm;
|
||
if (! (dt = ydhms_tm_diff (year, yday, hour, min, sec,
|
||
(*convert) (&ot, &otm))))
|
||
{
|
||
t = ot;
|
||
tm = otm;
|
||
break;
|
||
}
|
||
if ((ot += dt) == t)
|
||
break; /* Avoid a redundant probe. */
|
||
}
|
||
}
|
||
}
|
||
|
||
*offset = t - t0;
|
||
|
||
#if LEAP_SECONDS_POSSIBLE
|
||
if (sec_requested != tm.tm_sec)
|
||
{
|
||
/* Adjust time to reflect the tm_sec requested, not the normalized value.
|
||
Also, repair any damage from a false match due to a leap second. */
|
||
t += sec_requested - sec + (sec == 0 && tm.tm_sec == 60);
|
||
(*convert) (&t, &tm);
|
||
}
|
||
#endif
|
||
|
||
if (TIME_T_MAX / INT_MAX / 366 / 24 / 60 / 60 < 3)
|
||
{
|
||
/* time_t isn't large enough to rule out overflows in ydhms_tm_diff,
|
||
so check for major overflows. A gross check suffices,
|
||
since if t has overflowed, it is off by a multiple of
|
||
TIME_T_MAX - TIME_T_MIN + 1. So ignore any component of
|
||
the difference that is bounded by a small value. */
|
||
|
||
double dyear = (double) year_requested + mon_years - tm.tm_year;
|
||
double dday = 366 * dyear + mday;
|
||
double dsec = 60 * (60 * (24 * dday + hour) + min) + sec_requested;
|
||
|
||
if (TIME_T_MAX / 3 - TIME_T_MIN / 3 < (dsec < 0 ? - dsec : dsec))
|
||
return -1;
|
||
}
|
||
|
||
*tp = tm;
|
||
return t;
|
||
}
|
||
|
||
#ifdef weak_alias
|
||
weak_alias (mktime, timelocal)
|
||
#endif
|
||
|
||
#if DEBUG
|
||
|
||
static int
|
||
not_equal_tm (a, b)
|
||
struct tm *a;
|
||
struct tm *b;
|
||
{
|
||
return ((a->tm_sec ^ b->tm_sec)
|
||
| (a->tm_min ^ b->tm_min)
|
||
| (a->tm_hour ^ b->tm_hour)
|
||
| (a->tm_mday ^ b->tm_mday)
|
||
| (a->tm_mon ^ b->tm_mon)
|
||
| (a->tm_year ^ b->tm_year)
|
||
| (a->tm_mday ^ b->tm_mday)
|
||
| (a->tm_yday ^ b->tm_yday)
|
||
| (a->tm_isdst ^ b->tm_isdst));
|
||
}
|
||
|
||
static void
|
||
print_tm (tp)
|
||
struct tm *tp;
|
||
{
|
||
printf ("%04d-%02d-%02d %02d:%02d:%02d yday %03d wday %d isdst %d",
|
||
tp->tm_year + TM_YEAR_BASE, tp->tm_mon + 1, tp->tm_mday,
|
||
tp->tm_hour, tp->tm_min, tp->tm_sec,
|
||
tp->tm_yday, tp->tm_wday, tp->tm_isdst);
|
||
}
|
||
|
||
static int
|
||
check_result (tk, tmk, tl, tml)
|
||
time_t tk;
|
||
struct tm tmk;
|
||
time_t tl;
|
||
struct tm tml;
|
||
{
|
||
if (tk != tl || not_equal_tm (&tmk, &tml))
|
||
{
|
||
printf ("mktime (");
|
||
print_tm (&tmk);
|
||
printf (")\nyields (");
|
||
print_tm (&tml);
|
||
printf (") == %ld, should be %ld\n", (long) tl, (long) tk);
|
||
return 1;
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
int
|
||
main (argc, argv)
|
||
int argc;
|
||
char **argv;
|
||
{
|
||
int status = 0;
|
||
struct tm tm, tmk, tml;
|
||
time_t tk, tl;
|
||
char trailer;
|
||
|
||
if ((argc == 3 || argc == 4)
|
||
&& (sscanf (argv[1], "%d-%d-%d%c",
|
||
&tm.tm_year, &tm.tm_mon, &tm.tm_mday, &trailer)
|
||
== 3)
|
||
&& (sscanf (argv[2], "%d:%d:%d%c",
|
||
&tm.tm_hour, &tm.tm_min, &tm.tm_sec, &trailer)
|
||
== 3))
|
||
{
|
||
tm.tm_year -= TM_YEAR_BASE;
|
||
tm.tm_mon--;
|
||
tm.tm_isdst = argc == 3 ? -1 : atoi (argv[3]);
|
||
tmk = tm;
|
||
tl = mktime (&tmk);
|
||
tml = *localtime (&tl);
|
||
printf ("mktime returns %ld == ", (long) tl);
|
||
print_tm (&tmk);
|
||
printf ("\n");
|
||
status = check_result (tl, tmk, tl, tml);
|
||
}
|
||
else if (argc == 4 || (argc == 5 && strcmp (argv[4], "-") == 0))
|
||
{
|
||
time_t from = atol (argv[1]);
|
||
time_t by = atol (argv[2]);
|
||
time_t to = atol (argv[3]);
|
||
|
||
if (argc == 4)
|
||
for (tl = from; tl <= to; tl += by)
|
||
{
|
||
tml = *localtime (&tl);
|
||
tmk = tml;
|
||
tk = mktime (&tmk);
|
||
status |= check_result (tk, tmk, tl, tml);
|
||
}
|
||
else
|
||
for (tl = from; tl <= to; tl += by)
|
||
{
|
||
/* Null benchmark. */
|
||
tml = *localtime (&tl);
|
||
tmk = tml;
|
||
tk = tl;
|
||
status |= check_result (tk, tmk, tl, tml);
|
||
}
|
||
}
|
||
else
|
||
printf ("Usage:\
|
||
\t%s YYYY-MM-DD HH:MM:SS [ISDST] # Test given time.\n\
|
||
\t%s FROM BY TO # Test values FROM, FROM+BY, ..., TO.\n\
|
||
\t%s FROM BY TO - # Do not test those values (for benchmark).\n",
|
||
argv[0], argv[0], argv[0]);
|
||
|
||
return status;
|
||
}
|
||
|
||
#endif /* DEBUG */
|
||
|
||
/*
|
||
Local Variables:
|
||
compile-command: "gcc -DDEBUG=1 -Wall -O -g mktime.c -o mktime"
|
||
End:
|
||
*/
|