mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-03 08:11:08 +00:00
9a0a462ceb
1997-09-11 04:36 Ulrich Drepper <drepper@cygnus.com> * db2/db_int.h: Define __set_errno if not yet available. * db2/btree/bt_rec.c: Use __set_errno to set errno value. * db2/clib/getlong.c: Likewise. * db2/db185/db185.c: Likewise. * db2/db185/db185_int.h: Likewise. * db2/dbm/dbm.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/log/log_archive.c: Likewise. * elf/dl-profile.c: Implement mcount function. * gmon/gmon.c: Use __profil not profil because of namespace pollution. * gmon/mcount.c: Remove BSD kernel code. Use compare&swap instruction if possible to change state variable. Optimize frompc folding. * gmon/sys/gmon.h (struct gmonparam): Change state field to long int. * sysdeps/i386/i486/atomicity.h: New file. * sysdeps/stub/atomicity.h: New file. * sysdeps/mach/hurd/profil.c: Define function as __profil and make profil weak alias. * sysdeps/posix/profil.c: Likewise. * string/bits/string2.h: New file. * include/bits/string2.h: New file. * string/Makefile (routines): Add mempcpy. (tests): Add inl-tester. Remove _D__NO_STRING_INLINES from CFLAGS-* variables. * sysdeps/generic/mempcpy.c: New file. * sysdeps/generic/memccpy.c: Undef function name to enable definition as macro. * sysdeps/generic/memchr.c: Likewise. * sysdeps/generic/memcmp.c: Likewise. * sysdeps/generic/memmem.c: Likewise. * sysdeps/generic/memmove.c: Likewise. * sysdeps/generic/strcat.c: Likewise. * sysdeps/generic/strchr.c: Likewise. * sysdeps/generic/strcmp.c: Likewise. * sysdeps/generic/strcpy.c: Likewise. * sysdeps/generic/strcspn.c: Likewise. * sysdeps/generic/strlen.c: Likewise. * sysdeps/generic/strncat.c: Likewise. * sysdeps/generic/strncmp.c: Likewise. * sysdeps/generic/strncpy.c: Likewise. * sysdeps/generic/strpbrk.c: Likewise. * sysdeps/generic/strrchr.c: Likewise. * sysdeps/generic/strsep.c: Likewise. * sysdeps/generic/strspn.c: Likewise. * sysdeps/generic/strstr.c: Likewise. * sysdeps/generic/strtok.c: Likewise. * sysdeps/generic/strtok_r.c: Likewise. * sysdeps/i386/memset.c: Likewise. * sysdeps/i386/bits/string.h: Correct a few types and constraints. * sysdeps/i386/i486/bits/string.h: Heavy rewrites and optimizations. * string/stratcliff.c: Undefine __USE_STRING_INLINES. * string/tst-strlen.c: Likewise. * string/string.h: Add prototype for mempcpy. Include bits/string2.h header always if optimizing. * intl/dcgettext.c: Don't unconditionally define stpcpy, only if not yet defined. * intl/l10nflist.c: Likewise. * string/tester.c: Add copyright and make little cleanups. * inet/test_ifindex.c: Change type of ni variable to unsigned int. * locale/programs/ld-ctype.c (struct locale_ctype_t): Change type of fields map_collection_max and map_collection_act to size_t. * nss/libnss_files.map: Group entries. * posix/unistd.h: Add prototype for __setpgid and __profil. * sysdeps/generic/crypt.h: Declare __crypt_r. * sysdeps/i386/bits/select.h: Fix fatal bugs, use correct casts now. * sysdeps/i386/fpu/bits/mathinline.h (isgreater, isgreaterequal, isless, islessequal, islessgreater, isunordered): Optimize a bit. * sysdeps/stub/ftruncate.c: Include missing header for prototype. * sysdeps/stub/getdents.c: Likewise. * sysdeps/stub/reboot.c: Likewise. * sysdeps/stub/swapon.c: Likewise. * sysdeps/stub/syscall.c: Likewise. * sysdeps/stub/ualarm.c: Likewise. * sysdeps/stub/usleep.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Don't compile or use opensock if SIOGIFINDEX and SIOGIFNAME are not defined. * sysdeps/unix/sysv/linux/net/if.h: Add IFF_PORTSEL and IFF_AUTOMEDIA according to recent kernel changes. 1997-09-10 21:32 Klaus Espenlaub <kespenla@student.informatik.uni-ulm.de> * Makeconfig: Use $(have-initfini) instead of $(elf) to figure out the installed name of the startup code. (common-generated): Add version.mk. * Makefile (distclean-1): Add glibcbug. * Makerules: Replace -lgcc by $(gnulib). * catgets/Makefile (generated): Add xmalloc.o. * csu/Makefile (generated): Replace align.h and end.h by defs.h to match the generated file. * manual/Makefile (mostlyclean): Add stub-manual and stamp.o. (realclean): Changed to remove chapters-incl[12]. * po/Makefile (realclean): New rule to remove the generated .mo files. * time/Makefile: Only include zonefile dependencies if $(no_deps) is not true to avoid make clean failure when directory time doesn't exist yet. (generated): Add tzselect. * stdio/fgets.c (fgets): Add casts to reduce gcc warning noise. * stdio/internals.c (flushbuf): Likewise. * stdio/linewrap.c (lwupdate): Likewise. * stdio/memstream.c (enlarge_buffer): Likewise. * stdio-common/vfscanf.c (_IO_vfscanf): Likewise. * time/tzset.c (compute_change): Likewise. * misc/init-misc.c (__init_misc): Only declare static if HAVE_GNU_LD is defined. * sysdeps/posix/pipestream.c (FUNC): Change to generate ANSI C style functions. * sysdeps/stub/init-posix.c: Likewise. * sysdeps/stub/profil.c: Likewise. * munch-tmpl.c (__libc_init): Convert to ANSI C style declaration to reduce gcc warning noise. * stdio/glue.c (_filbuf, _flsbuf): Likewise. * stdio/obstream.c (grow, seek, input, init_obstream): Likewise. * stdio/vasprintf.c (enlarge_buffer): Likewise. * sysdeps/generic/sysd-stdio.c (__stdio_read, __stdio_write, __stdio_seek, __stdio_close, __stdio_fileno, __stdio_open, __stdio_reopen): Likewise. * sysdeps/posix/defs.c (_cleanup): Likewise. * time/offtime.c (__offtime): Add cast. * posix/getopt.c: Don't use text_set_element if not defined. * configure.in: Provide a check for underscores before user labels that works even when the compiler used for building doesn't work (like when there is no C library). Use the old way if the compiler works. 1997-09-10 05:08 David S. Miller <davem@caip.rutgers.edu> * sysdeps/unix/sysv/linux/sparc/bits/ioctls.h: The TC* ioctls use 'T' not 't' on SparcLinux. * sysdeps/unix/sysv/linux/sparc/bits/termios.h: tcflag_t is 32 bits. * sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add aliases for _longjmp and siglongjmp. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/stdio.h: Add format attributes to the extra printf and scanf like functions. * stdio/stdio.h: Likewise. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r): Print tablename_val, not tablename_len. * nis/nss_nisplus/nisplus-ethers.c (_nss_nisplus_getntohost_r): Use sprintf instead of sprintf, the string always fits. * nis/nss_nisplus/nisplus-hosts.c (_nss_nisplus_gethostbyaddr_r): Likewise. * nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r): Likewise. * nis/nss_nisplus/nisplus-proto.c (_nss_nisplus_getprotobynumber_r): Likewise. * nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_getrpcbynumber_r): Likewise. * nis/nss_nisplus/nisplus-service.c (_nss_nisplus_getservbynumber_r): Likewise. * nis/nss_nisplus/nisplus-alias.c (_nss_create_tablename): Use __stpcpy, __stpncpy and __strdup instead of public names. * nis/nss_nisplus/nisplus-ethers.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-grp.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-hosts.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_parse_netgroup): Likewise. * nis/nss_nisplus/nisplus-network.c (_nss_nisplus_parse_netent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-proto.c (_nss_nisplus_parse_protoent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-pwd.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_parse_rpcent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-service.c (_nss_nisplus_parse_servent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-spwd.c (_nss_create_tablename): Likewise. * libc.map: Export __stpcpy and __strdup. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * math/Makefile (CFLAGS-test-float.c, CFLAGS-test-double.c, CFLAGS-test-ldouble.c): Pass -ffloat-store to avoid excessive precision. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * include/rpc/auth_des.h: New file. 1997-09-09 Paul Eggert <eggert@twinsun.com> * time/mktime.c (__mktime_internal): Declare sec_requested even if !LEAP_SECONDS_POSSIBLE, since it's needed at the end when checking for time_t overflow. 1997-09-09 22:11 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/getcwd.c: Correct test for too small buffer. Reported by Erik Troan <ewt@redhat.com>. * elf/dl-close.c: Include <bits/libc-lock.h>, not <libc-lock.h>. * elf/dl-open.c: Likewise. 1997-09-07 17:09 Richard Henderson <rth@cygnus.com> * sysdeps/alpha/Makefile: Kill setjmp_aux. * sysdeps/alpha/bits/setjmp.h: Rewrite in terms of an array. * sysdeps/alpha/__longjmp.c: Remove. * sysdeps/alpha/setjmp_aux.c: Remove. * sysdeps/alpha/__longjmp.S: New file. * sysdeps/alpha/bsd-_setjmp.S: Stub out. * sysdeps/alpha/bsd-setjmp.S: Likewise. * sysdeps/alpha/setjmp.S: Do the work; don't call __setjmp_aux. Move _setjmp and setjmp from bsd-*.S. 1997-09-06 20:20 Ulrich Drepper <drepper@cygnus.com> * include/rpc/auth.h: New file. * include/rpc/auth_unix.h: New file. 1997-09-06 Paul Eggert <eggert@twinsun.com> Fix gmtime so that it reports leap seconds when TZ indicates that leap seconds are desired. * time/gmtime.c (<stddef.h>): Remove unnecessary include. (gmtime): Put after gmtime_r, to help the compiler inline. (__tz_convert): New decl. (gmtime_r): Use __tz_convert instead of __offtime, so that leap seconds are handled correctly. * time/localtime.c (<errno.h>, <libc-lock.h>): Remove includes that are now unnecessary. (__tzset_internal, __tz_compute, __tzfile_compute, __use_tzfile, __tzset_lock): Remove extern decls that are now unnecessary. (localtime_internal): Moved to __tz_convert in tzset.c. so that localtime and gmtime can both use it easily. (localtime): Put after localtime_r, to help the compiler inline. (localtime_r): Use __tz_convert instead of localtime_internal. * time/strftime.c (__tz_compute): Remove unused (and now incorrect) decl. * time/tzfile.c (__tzfile_compute): New arg USE_LOCALTIME. * time/tzset.c (<errno.h>): Include. (_tmbuf): New decl. (__tzfile_compute): New function. (tz_compute): Renamed from __tz_compute. No longer extern. Remove redundant call to tzset_internal. (tzset_internal): Renamed from __tzset_internal. No longer extern. (tzset_lock): Renamed from __tzset_lock. No longer extern. (__tz_convert): New function, containing functionality of old localtime_internal function, plus locking and optional UTC. 1997-09-06 Paul Eggert <eggert@twinsun.com> * time/tzfile.c (__tzfile_read): Don't read a file if TZ is the empty string, just use UTC without leap seconds. This is for compatibility with the Olson code. 1997-09-06 Paul Eggert <eggert@twinsun.com> * time/tzset.c (__tzname_max): Lock tz data structures before invoking tzset_internal. * time/tzfile.c: Define compute_tzname_max statically. 1997-09-07 10:57 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nis_call.c: Remove not longer necessary HAVE_SECURE_RPC ifdefs. * nis/nis_intern.h: Likewise. * nis/nss_nis/nis-publickey.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/ypclnt.c: Likewise. * sunrpc/auth_des.c: Don't dereference NULL pointer, initialize ad->ad_timediff. * sunrpc/auth_none.c: Don't define our own prototypes, use the one from the header files. * sunrpc/auth_unix.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/rpc_cmsg.c: Likewise. * sunrpc/key_call.c: Fix signal handling. * sunrpc/openchild.c: Don't use /bin/sh to start /usr/etc/keyenvoy, or we will get a deadlock with NIS+. * sunrpc/rpc/auth.h: Add prototype for xdr_opaque_auth, don't define HAVE_SECURE_RPC. 1997-09-07 15:51 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/bits/select.h [__GNUC__] (__FD_ZERO, __FD_SET, __FD_CLR, __FD_ISSET): Use correct casts to address array correctly. Reported by urbanw@cs.umu.se. 1997-09-07 05:07 Ulrich Drepper <drepper@cygnus.com> * elf/dl-close.c: Include <bits/libc-lock.h>, not <libc-lock.h>. * elf/dl-open.c: Likewise. * sysdeps/i386/memset.c: Undefine memset in case the header with the optimized functions is included. Patches by NIIBE Yutaka <gniibe@mri.co.jp>. * sysdeps/i386/bits/string.h [__PIC__] (strcspn, strspn, strpbrk, strsep): Use register for second parameter. * sysdeps/i386/i486/bits/string.h: Likewise. Reported by NIIBE Yutaka <gniibe@mri.co.jp>. 1997-09-03 09:48 Geoff Keating <geoffk@ozemail.com.au> * math/libm-test.c: Change various tolerances to match what the tested routines can actually provide. * math/Makefile: Add new tests. * math/atest-sincos.c: New file. * math/atest-exp.c: New file. * csu/Makefile: Give initfini.s and initfiniS.s their own CFLAGS-* macros so they can be overridden. * sysdeps/powerpc/Makefile [subdir=csu]: Override flags for initfiniS.s to use -fpic instead of -fPIC, because the sed script breaks otherwise. * sysdeps/powerpc/Makefile [build-shared]: Use -fpic not -fPIC for efficiency. * sysdeps/powerpc/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Don't use register 0, to let _mcount be in a shared object. * sysdeps/powerpc/dl-machine.h: Use full sentences in comments. Generally clean up. Suppress some code we don't need when relocating ld.so. * sysdeps/powerpc/test-arith.c: Change loop indices to size_t when appropriate to suppress gcc warning. * resolv/res_send.c: Suppress warning. * sunrpc/xdr_sizeof.c: Suppress warning. * FAQ: Add ppc-linux. * manual/maint.texi: Add ppc-linux. Explain that gcc can't build it yet. * sysdeps/unix/sysv/linux/powerpc/profil-counter.h: Correct for current kernels. 1997-08-15 07:45 Geoff Keating <geoffk@ozemail.com.au> * stdlib/fmtmsg.c: Use two parameters for __libc_once_define. * sysdeps/i386/machine-gmon.h: Correct typo. * sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Change to match kernel. * sysdeps/generic/dl-sysdep.c: Add hook for bizzare PPC argument hack. * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Rewrite to use sysdeps/linux/dl-sysdep.c. * sysdeps/powerpc/Makefile [subdir=gmon]: Compile ppc-mcount. * sysdeps/powerpc/machine-gmon.h: Use ppc-mcount. * sysdeps/powerpc/ppc-mcount: New file. The following are mostly changes to allow profiling: * sysdeps/powerpc/add_n.S: Added. * sysdeps/powerpc/add_n.s: Removed. * sysdeps/powerpc/addmul_1.S: Added. * sysdeps/powerpc/addmul_1.s: Removed. * sysdeps/powerpc/bsd-_setjmp.S: Use JUMPTARGET macro. * sysdeps/powerpc/bsd-setjmp.S: Use JUMPTARGET macro. * sysdeps/powerpc/lshift.S: Added. * sysdeps/powerpc/lshift.s: Removed. * sysdeps/powerpc/memset.S: Added. * sysdeps/powerpc/memset.s: Removed. * sysdeps/powerpc/mul_1.S: Added. * sysdeps/powerpc/mul_1.s: Removed. * sysdeps/powerpc/rshift.S: Added. * sysdeps/powerpc/rshift.s: Removed. * sysdeps/powerpc/s_copysign.S: Use ENTRY, END, weak_alias macros. * sysdeps/powerpc/s_fabs.S: Use ENTRY, END, weak_alias macros. * sysdeps/powerpc/setjmp.S: Use JUMPTARGET macro. * sysdeps/powerpc/strchr.S: Added. * sysdeps/powerpc/strchr.s: Removed. * sysdeps/powerpc/strcmp.S: Added. * sysdeps/powerpc/strcmp.s: Removed. * sysdeps/powerpc/strlen.S: Added. * sysdeps/powerpc/strlen.s: Removed. * sysdeps/powerpc/sub_n.S: Added. * sysdeps/powerpc/sub_n.s: Removed. * sysdeps/powerpc/submul_1.S: Added. * sysdeps/powerpc/submul_1.s: Removed. * sysdeps/unix/sysv/linux/powerpc/_exit.S: Removed. * sysdeps/unix/sysv/linux/powerpc/brk.S: Added. * sysdeps/unix/sysv/linux/powerpc/brk.c: Removed. * sysdeps/unix/sysv/linux/powerpc/clone.S: Use new macros. Fix various bugs. Document that it isn't tested. * sysdeps/unix/sysv/linux/powerpc/sigreturn.S: Make look like sysdeps/unix/_exit.S. * sysdeps/unix/sysv/linux/powerpc/socket.S: Use new macros. * sysdeps/unix/sysv/linux/powerpc/syscall.S: Use new macros. * sysdeps/unix/sysv/linux/powerpc/sysdep.h: Define some new macros to make assembler (possibly) more portable, allow profiling, etc.
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:
|
||
*/
|