mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 19:00:07 +00:00
d705269e75
1997-06-19 19:38 Ulrich Drepper <drepper@cygnus.com> * features.h: Define __STDC_IEC_559__ and _STDC_IEC_559_COMPLEX__. * elf/dl-minimal.c (__dcgettext): Remove assertion. * inet/rcmd.c: Correct a few typos. Reported by Eric Troan. * manual/Makefile (distribute): Add dir. * manual/dir: New file. * math/Makefile (libm-support): Rename s_rinttol, s_rinttoll, s_roundtol, and s_roundtoll to s_lrint, s_llrint, s_lround, and s_llround respectively. (libm-calls): Add e_gamma_r. * math/libm-test.c (check_int_exc): New function. (signbit_test): Remove test for sign of NaN. (gamma_test): Clear exception after test of existence. Correct tests and and epsilons. (lgamma_test): Likewise. (ilogb_test): Correct all tests. (scalb_test): Rewrite. (rinttol_test): Rename to lrint_test and correct tests. (rinttoll_test): Likewise. (roundtol_test): Likewise. (roundtoll_test): Likewise. (main): Call lrint/lround functions instead of rinttol/roundtol. * math/math.h: Change prototypes for rinttol/roundtol. * math/mathcalls.h: Rearrange prototypes according to ISO C9X draft. * sysdeps/generic/mathbits.h: Define FP_ILOGB0 and FP_ILOGBNAN. * sysdeps/i386/mathbits.h: Likewise. * sysdeps/libm-i387/e_scalb.S: Handle special cases correctly. * sysdeps/libm-i387/e_scalbf.S: Likewise. * sysdeps/libm-i387/e_scalbl.S: Likewise. * sysdeps/libm-i387/s_asinh.S: Handle -inf correctly. * sysdeps/libm-i387/s_asinhf.S: Likewise. * sysdeps/libm-i387/s_asinhl.S: Likewise. * sysdeps/libm-i387/s_ilogb.S: Optimize. * sysdeps/libm-i387/s_ilogbf.S: Likewise. * sysdeps/libm-i387/s_ilogbl.S: Likewise. * sysdeps/libm-i387/s_rinttol.S: Rename to... * sysdeps/libm-i387/s_lrint.S: ...this. * sysdeps/libm-i387/s_rinttoll.S: Rename to... * sysdeps/libm-i387/s_llrint.S: ...this. * sysdeps/libm-i387/s_remquo.S: Correctly set sign of remainder. * sysdeps/libm-i387/s_remquof.S: Likewise. * sysdeps/libm-i387/s_remquol.S: Likewise. * sysdeps/libm-i387/e_gamma_r.c: New file. Implementation of gamma function according to ISO C. * sysdeps/libm-i387/e_gammaf_r.c: New file. * sysdeps/libm-i387/e_gammal_r.c: New file. * sysdeps/libm-i387/e_lgamma_r.c: Don't let optimize compile the generation of exceptions away. * sysdeps/libm-i387/e_lgammaf_r.c: Likewise. * sysdeps/libm-i387/k_standard.c: Correct return value for infinity points of gamma function when not SVID mode. * sysdeps/libm-i387/s_rinttoll.c: Renamed to... * sysdeps/libm-i387/s_llrint.c: ...this. * sysdeps/libm-i387/s_rinttol.c: Renamed to... * sysdeps/libm-i387/s_lrint.c: ...this. * sysdeps/libm-i387/s_roundtoll.c: Renamed to... * sysdeps/libm-i387/s_llround.c: ...this. * sysdeps/libm-i387/s_roundtol.c: Renamed to... * sysdeps/libm-i387/s_lround.c: ..this. * sysdeps/libm-i387/s_scalbn.c: Change second parameter according to ISO C. * sysdeps/libm-i387/s_scalbnf.c: Likewise. * sysdeps/libm-i387/s_scalbnl.c: Likewise. * sysdeps/libm-i387/w_gamma.c: Call __ieee754_gamma_r if library mode is not _SVID_. * sysdeps/libm-i387/w_gammaf.c: Likewise. * sysdeps/libm-i387/w_gammal.c: Likewise. * sysdeps/m68k/fpu/__math.h: Rename __rinttol to __lrint and rinttol to lrint. * sysdeps/m68k/fpu/s_rinttol.c: Renamed to... * sysdeps/m68k/fpu/s_lrint.c: ...this. * sysdeps/m68k/fpu/s_rinttoll.c: Renamed to... * sysdeps/m68k/fpu/s_llrint.c: ...this. * md5-crypt/Makefile: Link md5test program with md5.o. * stdio-common/temptest.c: Don't use __stdio_gen_tempname which is not exported by the libc.so. * stdio-common/vfscanf.c: Correct scanning of strings after last change. * sysdeps/unix/sysv/linux/i386/sysdep.S: Use .comm to define errno. 1997-06-19 07:37 H.J. Lu <hjl@gnu.ai.mit.edu> * time/tzfile.c (__tzfile_read): Store getc () return in int. 1997-06-13 Miles Bader <miles@gnu.ai.mit.edu> * argp/argp-parse.c (argp_version_parser): Include `(PROGRAM ERROR)' in the no-version error text to indicate that something's fucked. [!_] (N_): New macro. (argp_default_options, argp_version_options): Wrap doc strings in N_(). 1997-06-12 Miles Bader <miles@gnu.ai.mit.edu> * argp/argp-parse.c (parser_parse_opt): Detect and report unhandled options here. (parser_parse_arg): Handle ARGP_KEY_ARGS here. Adjust NEXT pointer back if we fail to parse anything. (parser_parse_next): Simplify arg code. Leave state NEXT frobbing to parser_parse_arg. 1997-06-11 Miles Bader <miles@gnu.ai.mit.edu> * argp/argp.h (ARGP_KEY_ARGS, ARGP_KEY_FINI): New macros. * argp/argp-parse.c (parser_finalize): Do another pass over the parsers with ARGP_KEY_FINI. 1997-06-18 Miles Bader <miles@gnu.ai.mit.edu> * string/Makefile (routines): Add argz-replace. 1997-06-16 00:16 Miles Bader <miles@gnu.ai.mit.edu> * manual/string.texi (Argz Functions): Document argz_replace. 1997-06-12 Miles Bader <miles@gnu.ai.mit.edu> * string/argz.h (__argz_replace, argz_replace): New declarations. * string/argz-replace.c: New file. 1997-06-11 Miles Bader <miles@gnu.ai.mit.edu> * manual/argp.texi (Argp Special Keys): Document ARGP_KEY_ARGS. 1997-06-16 23:08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig (libc-map): Remove definition. * Makerules (libc-map): Define it here, using the full name. (load-map-file): Remove case for empty $(..). ($(common-objpfx)libc.so): Revert last change. 1997-06-17 22:18 Mark Kettenis <kettenis@phys.uva.nl> * login/programs/utmpd.c (main): Improve signal handling. * login/programs/request.c (do_setutent, do_updwtmp): Allow arbitrary length filenames. * login/programs/utmpd.h (setutent_request, updwtmp_request): Get rid of fixed length file field. * login/utmp_daemon.c (do_setutent, do_updwtmp): Allow arbitrary length filenames. * login/programs/request.c (do_pututline): Don't fail if connection->position is -1 on entry. 1997-06-15 16:32 Mark Kettenis <kettenis@phys.uva.nl> * login/utmp_file.c (updwtmp_file): Use the same method for appending an entry as in pututline_file. 1997-06-11 18:59 Mark Kettenis <kettenis@phys.uva.nl> * login/utmp_file.c (getutent_r_file): Use read lock instead of write lock. (getutline_r_file, internal_getut_r): Lock utmp file. (updwtmp_file): Use fcntl to lock file instead of flock. 1997-06-18 00:11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdio-common/vfscanf.c (inchar, ungetc): Don't count EOF as character read in/put back. * stdio-common/tstscanf.c: Add test case for this. 1997-06-17 22:17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libc.map: Add more symbols. 1997-06-18 12:01 Ulrich Drepper <drepper@cygnus.com> * manual/Makefile (install): Make sure `dir' file exists if we use install-info. 1997-06-17 19:32 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/Makefile (info): Depend on dir-add.info. 1997-06-17 17:19 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/ldd.bash.in: Fix spacing in message. 1997-06-17 14:28 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/do-rel.h (elf_dynamic_do_rel): Always use version information if available. 1997-06-17 11:34 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sunrpc/Makefile ($(rpcsvc:%.x=$(objpfx)rpcsvc/%.h)): Make command non-empty to force make to recheck modification time. ($(rpcsvc:%.x=$(objpfx)x%.c)): Likewise. 1997-06-17 00:26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/stub/e_acoshl.c: Set errno to ENOSYS. * sysdeps/stub/e_acosl.c: Likewise. * sysdeps/stub/e_asinl.c: Likewise. * sysdeps/stub/e_atan2l.c: Likewise. * sysdeps/stub/e_expl.c: Likewise. * sysdeps/stub/e_fmodl.c: Likewise. * sysdeps/stub/e_j0l.c: Likewise. * sysdeps/stub/e_j1l.c: Likewise. * sysdeps/stub/e_jnl.c: Likewise. * sysdeps/stub/e_lgammal_r.c: Likewise. * sysdeps/stub/e_log10l.c: Likewise. * sysdeps/stub/e_logl.c: Likewise. * sysdeps/stub/e_powl.c: Likewise. * sysdeps/stub/e_rem_pio2l.c: Likewise. * sysdeps/stub/e_sqrtl.c: Likewise. * sysdeps/stub/k_cosl.c: Likewise. * sysdeps/stub/k_rem_pio2l.c: Likewise. * sysdeps/stub/k_sinl.c: Likewise. * sysdeps/stub/k_tanl.c: Likewise. * sysdeps/stub/s_atanl.c: Likewise. * sysdeps/stub/s_erfl.c: Likewise. * sysdeps/stub/s_exp2.c: Likewise. * sysdeps/stub/s_exp2f.c: Likewise. * sysdeps/stub/s_exp2l.c: Likewise. * sysdeps/stub/s_expm1l.c: Likewise. * sysdeps/stub/s_log1pl.c: Likewise. * sysdeps/stub/s_log2l.c: Likewise. 1997-06-18 11:46 Ulrich Drepper <drepper@cygnus.com> * sysdeps/libm-ieee754/w_gamma.c: If _LIB_VERSION is _SVID_ compute result as before last change. * sysdeps/libm-ieee754/w_gammaf.c: Likewise. * sysdeps/libm-ieee754/w_gammal.c: Likewise. 1997-06-16 23:37 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/s_remquo.c: Fix off-by-one when computing quotient. * sysdeps/libm-ieee754/s_remquof.c: Likewise. * sysdeps/libm-ieee754/s_remquol.c: Likewise. * sysdeps/m68k/fpu/s_remquo.c: Remove FIXME and special case for quotient. * sysdeps/libm-ieee754/w_gamma.c: Add missing call to exp function. Don't use global signgam. * sysdeps/libm-ieee754/w_gammaf.c: Likewise. * sysdeps/libm-ieee754/w_gammal.c: Likewise. * math/Makefile (libm-calls): Remove w_gamma_r. * sysdeps/libm-ieee754/w_gamma_r.c: Remove file. * sysdeps/libm-ieee754/w_gammaf_r.c: Remove file. * sysdeps/libm-ieee754/w_gammal_r.c: Remove file. * math/libm-test.c (atanh_test): Declare x only if needed. (signbit_test): Fix typo. (gamma_test): Check whether function is implemented. Add epsilons. (lgamma_test): Likewise. (fmod_test): Add epsilons. (exp2_test): Use right function for existence test. 1997-06-07 09:20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/powerpc/Dist: Add fenv_const.c. * sysdeps/unix/sysv/linux/Dist: Add net/if_slip.h. * sysdeps/unix/sysv/linux/powerpc/Dist: Add init-first.h and syscall.h. * sysdeps/unix/sysv/linux/sparc/Dist: Add init-first.h. * string/Makefile (distribute): Add tst-svc.expect. * nis/Makefile (distribute): Add nis_intern.h and Banner. * elf/Makefile (distribute): Add dl-hash.h. * Rules (subdir_echo-distinfo): Add headers from $(distribute). * login/Makefile (others): Add utmpdump. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add net/if_slip.h. * manual/Makefile (dir-add.texi): Also look in indirectly included files. 1997-06-16 23:15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/configure.in: Remove commands to generate stdio_lim.h. * sysdeps/unix/sysv/linux/mk-stdiolim.c: Remove. * sysdeps/unix/sysv/linux/Makefile: Add rules to generate stdio_lim.h here. (common-generated): Add generated files. (inhibit-stdio_lim): Define. * sysdeps/posix/Makefile [$(inhibit-stdio_lim)=yes]: Disable rules to generate stdio_lim.h. * sysdeps/unix/sysv/linux/Makefile: Suppress inclusion of dependecy files if no_deps is set. ($(objpfx)syscall-%.d): Add header file as target to dependency generation. 1997-06-14 19:19 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/arm/Dist: New file. 1997-06-14 17:59 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * extra-lib.mk (others): Depend on versioned shared library, not the unversioned one. * Makerules (build-shlib): Don't make the version link here. ($(common-objpfx)libc.so$(libc.so-version)): New rule for libc version link. 1997-06-16 03:07 Ulrich Drepper <drepper@cygnus.com> * sysdeps/libm-ieee754/k_standard.c: Undo change of Tue Aug 6 01:13:56 1996. * argp/argp-help.c (argp_args_usage): Supply correct argp to filter_doc. * argp/argp-help.c (hol_add_cluster): Initialize CL->depth. * argp/argp-help.c (_help): Supply STATE to argp_args_usage. * argp/argp.h (ARGP_KEY_HELP_ARGS_DOC): New macro. * argp/argp-fmtstream.c: Add casts to prevent warnings. * argp/argp.h (OPTION_NO_USAGE): New macro. * argp/argp-help.c (usage_long_opt, usage_argful_short_opt, * argp/argp-fmtstream.c (__argp_fmtstream_update): Account for case * argp/argp-help.c <stddef.h>: New include. * argp/argp.h (argp_state_help, __argp_state_help, argp_usage, * argp/argp.h (argp_program_bug_address): Make const. * argp/argp-parse.c (argp_default_parser): Set STATE->name for OPT_PROGNAME. * argp/argp-help.c (__argp_error, __argp_failure, __argp_state_help): * argp/argp-parse.c (parser_init): Set PARSER->state.flags.
472 lines
12 KiB
C
472 lines
12 KiB
C
/* Copyright (C) 1991, 92, 93, 95, 96, 97 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
|
||
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. */
|
||
|
||
#include <stdlib.h>
|
||
#include <stdio.h>
|
||
#include <time.h>
|
||
#include <string.h>
|
||
#include <limits.h>
|
||
#include <unistd.h>
|
||
|
||
#define NOID
|
||
#include <tzfile.h>
|
||
|
||
int __use_tzfile = 0;
|
||
|
||
struct ttinfo
|
||
{
|
||
long int offset; /* Seconds east of GMT. */
|
||
unsigned char isdst; /* Used to set tm_isdst. */
|
||
unsigned char idx; /* Index into `zone_names'. */
|
||
unsigned char isstd; /* Transition times are in standard time. */
|
||
unsigned char isgmt; /* Transition times are in GMT. */
|
||
};
|
||
|
||
struct leap
|
||
{
|
||
time_t transition; /* Time the transition takes effect. */
|
||
long int change; /* Seconds of correction to apply. */
|
||
};
|
||
|
||
static struct ttinfo *find_transition (time_t timer);
|
||
static void compute_tzname_max (size_t);
|
||
|
||
static size_t num_transitions;
|
||
static time_t *transitions = NULL;
|
||
static unsigned char *type_idxs = NULL;
|
||
static size_t num_types;
|
||
static struct ttinfo *types = NULL;
|
||
static char *zone_names = NULL;
|
||
static size_t num_leaps;
|
||
static struct leap *leaps = NULL;
|
||
|
||
#include <endian.h>
|
||
|
||
/* Decode the four bytes at PTR as a signed integer in network byte order. */
|
||
static inline int
|
||
decode (const void *ptr)
|
||
{
|
||
if ((BYTE_ORDER == BIG_ENDIAN) && sizeof (int) == 4)
|
||
return *(const int *) ptr;
|
||
else
|
||
{
|
||
const unsigned char *p = ptr;
|
||
int result = *p & (1 << (CHAR_BIT - 1)) ? ~0 : 0;
|
||
|
||
result = (result << 8) | *p++;
|
||
result = (result << 8) | *p++;
|
||
result = (result << 8) | *p++;
|
||
result = (result << 8) | *p++;
|
||
|
||
return result;
|
||
}
|
||
}
|
||
|
||
void
|
||
__tzfile_read (const char *file)
|
||
{
|
||
static const char default_tzdir[] = TZDIR;
|
||
size_t num_isstd, num_isgmt;
|
||
register FILE *f;
|
||
struct tzhead tzhead;
|
||
size_t chars;
|
||
register size_t i;
|
||
struct ttinfo *info;
|
||
|
||
__use_tzfile = 0;
|
||
|
||
if (transitions != NULL)
|
||
free ((void *) transitions);
|
||
transitions = NULL;
|
||
if (type_idxs != NULL)
|
||
free ((void *) type_idxs);
|
||
type_idxs = NULL;
|
||
if (types != NULL)
|
||
free ((void *) types);
|
||
types = NULL;
|
||
if (zone_names != NULL)
|
||
free ((void *) zone_names);
|
||
zone_names = NULL;
|
||
if (leaps != NULL)
|
||
free ((void *) leaps);
|
||
leaps = NULL;
|
||
|
||
if (file == NULL)
|
||
/* No user specification; use the site-wide default. */
|
||
file = TZDEFAULT;
|
||
else if (*file == '\0')
|
||
/* User specified the empty string; use UTC explicitly. */
|
||
file = "Universal";
|
||
else
|
||
{
|
||
/* We must not allow to read an arbitrary file in a setuid
|
||
program. So we fail for any file which is not in the
|
||
directory hierachy starting at TZDIR
|
||
and which is not the system wide default TZDEFAULT. */
|
||
if (__libc_enable_secure
|
||
&& ((*file == '/'
|
||
&& memcmp (file, TZDEFAULT, sizeof TZDEFAULT)
|
||
&& memcmp (file, default_tzdir, sizeof (default_tzdir) - 1))
|
||
|| strstr (file, "../") != NULL))
|
||
/* This test is certainly a bit too restrictive but it should
|
||
catch all critical cases. */
|
||
return;
|
||
}
|
||
|
||
if (*file != '/')
|
||
{
|
||
const char *tzdir;
|
||
unsigned int len, tzdir_len;
|
||
char *new;
|
||
|
||
tzdir = __secure_getenv ("TZDIR");
|
||
if (tzdir == NULL || *tzdir == '\0')
|
||
{
|
||
tzdir = default_tzdir;
|
||
tzdir_len = sizeof (default_tzdir) - 1;
|
||
}
|
||
else
|
||
tzdir_len = strlen (tzdir);
|
||
len = strlen (file) + 1;
|
||
new = (char *) __alloca (tzdir_len + 1 + len);
|
||
memcpy (new, tzdir, tzdir_len);
|
||
new[tzdir_len] = '/';
|
||
memcpy (&new[tzdir_len + 1], file, len);
|
||
file = new;
|
||
}
|
||
|
||
f = fopen (file, "r");
|
||
if (f == NULL)
|
||
return;
|
||
|
||
if (fread ((void *) &tzhead, sizeof (tzhead), 1, f) != 1)
|
||
goto lose;
|
||
|
||
num_transitions = (size_t) decode (tzhead.tzh_timecnt);
|
||
num_types = (size_t) decode (tzhead.tzh_typecnt);
|
||
chars = (size_t) decode (tzhead.tzh_charcnt);
|
||
num_leaps = (size_t) decode (tzhead.tzh_leapcnt);
|
||
num_isstd = (size_t) decode (tzhead.tzh_ttisstdcnt);
|
||
num_isgmt = (size_t) decode (tzhead.tzh_ttisgmtcnt);
|
||
|
||
if (num_transitions > 0)
|
||
{
|
||
transitions = (time_t *) malloc (num_transitions * sizeof(time_t));
|
||
if (transitions == NULL)
|
||
goto lose;
|
||
type_idxs = (unsigned char *) malloc (num_transitions);
|
||
if (type_idxs == NULL)
|
||
goto lose;
|
||
}
|
||
if (num_types > 0)
|
||
{
|
||
types = (struct ttinfo *) malloc (num_types * sizeof (struct ttinfo));
|
||
if (types == NULL)
|
||
goto lose;
|
||
}
|
||
if (chars > 0)
|
||
{
|
||
zone_names = (char *) malloc (chars);
|
||
if (zone_names == NULL)
|
||
goto lose;
|
||
}
|
||
if (num_leaps > 0)
|
||
{
|
||
leaps = (struct leap *) malloc (num_leaps * sizeof (struct leap));
|
||
if (leaps == NULL)
|
||
goto lose;
|
||
}
|
||
|
||
if (sizeof (time_t) < 4)
|
||
abort ();
|
||
|
||
if (fread(transitions, 4, num_transitions, f) != num_transitions ||
|
||
fread(type_idxs, 1, num_transitions, f) != num_transitions)
|
||
goto lose;
|
||
|
||
/* Check for bogus indices in the data file, so we can hereafter
|
||
safely use type_idxs[T] as indices into `types' and never crash. */
|
||
for (i = 0; i < num_transitions; ++i)
|
||
if (type_idxs[i] >= num_types)
|
||
goto lose;
|
||
|
||
if (BYTE_ORDER != BIG_ENDIAN || sizeof (time_t) != 4)
|
||
{
|
||
/* Decode the transition times, stored as 4-byte integers in
|
||
network (big-endian) byte order. We work from the end of
|
||
the array so as not to clobber the next element to be
|
||
processed when sizeof (time_t) > 4. */
|
||
i = num_transitions;
|
||
while (i-- > 0)
|
||
transitions[i] = decode ((char *) transitions + i*4);
|
||
}
|
||
|
||
for (i = 0; i < num_types; ++i)
|
||
{
|
||
unsigned char x[4];
|
||
if (fread (x, 1, 4, f) != 4 ||
|
||
fread (&types[i].isdst, 1, 1, f) != 1 ||
|
||
fread (&types[i].idx, 1, 1, f) != 1)
|
||
goto lose;
|
||
if (types[i].idx >= chars) /* Bogus index in data file. */
|
||
goto lose;
|
||
types[i].offset = (long int) decode (x);
|
||
}
|
||
|
||
if (fread (zone_names, 1, chars, f) != chars)
|
||
goto lose;
|
||
|
||
for (i = 0; i < num_leaps; ++i)
|
||
{
|
||
unsigned char x[4];
|
||
if (fread (x, 1, sizeof (x), f) != sizeof (x))
|
||
goto lose;
|
||
leaps[i].transition = (time_t) decode (x);
|
||
if (fread (x, 1, sizeof (x), f) != sizeof (x))
|
||
goto lose;
|
||
leaps[i].change = (long int) decode (x);
|
||
}
|
||
|
||
for (i = 0; i < num_isstd; ++i)
|
||
{
|
||
int c = getc (f);
|
||
if (c == EOF)
|
||
goto lose;
|
||
types[i].isstd = c != 0;
|
||
}
|
||
while (i < num_types)
|
||
types[i++].isstd = 0;
|
||
|
||
for (i = 0; i < num_isgmt; ++i)
|
||
{
|
||
int c = getc (f);
|
||
if (c == EOF)
|
||
goto lose;
|
||
types[i].isgmt = c != 0;
|
||
}
|
||
while (i < num_types)
|
||
types[i++].isgmt = 0;
|
||
|
||
fclose (f);
|
||
|
||
info = find_transition (0);
|
||
for (i = 0; i < num_types && i < sizeof (__tzname) / sizeof (__tzname[0]);
|
||
++i)
|
||
__tzname[types[i].isdst] = &zone_names[types[i].idx];
|
||
if (info->isdst < sizeof (__tzname) / sizeof (__tzname[0]))
|
||
__tzname[info->isdst] = &zone_names[info->idx];
|
||
|
||
compute_tzname_max (chars);
|
||
|
||
__use_tzfile = 1;
|
||
return;
|
||
|
||
lose:;
|
||
fclose(f);
|
||
}
|
||
|
||
/* The user specified a hand-made timezone, but not its DST rules.
|
||
We will use the names and offsets from the user, and the rules
|
||
from the TZDEFRULES file. */
|
||
|
||
void
|
||
__tzfile_default (char *std, char *dst, long int stdoff, long int dstoff)
|
||
{
|
||
size_t stdlen, dstlen, i;
|
||
long int rule_offset, rule_stdoff, rule_dstoff;
|
||
int isdst;
|
||
|
||
__tzfile_read (TZDEFRULES);
|
||
if (!__use_tzfile)
|
||
return;
|
||
|
||
if (num_types < 2)
|
||
{
|
||
__use_tzfile = 0;
|
||
return;
|
||
}
|
||
|
||
/* Ignore the zone names read from the file. */
|
||
free (zone_names);
|
||
|
||
/* Use the names the user specified. */
|
||
stdlen = strlen (std) + 1;
|
||
dstlen = strlen (dst) + 1;
|
||
zone_names = malloc (stdlen + dstlen);
|
||
if (zone_names == NULL)
|
||
{
|
||
__use_tzfile = 0;
|
||
return;
|
||
}
|
||
memcpy (zone_names, std, stdlen);
|
||
memcpy (&zone_names[stdlen], dst, dstlen);
|
||
|
||
/* Find the standard and daylight time offsets used by the rule file.
|
||
We choose the offsets in the types of each flavor that are
|
||
transitioned to earliest in time. */
|
||
rule_stdoff = rule_dstoff = 0;
|
||
for (i = 0; i < num_transitions; ++i)
|
||
{
|
||
if (!rule_stdoff && !types[type_idxs[i]].isdst)
|
||
rule_stdoff = types[type_idxs[i]].offset;
|
||
if (!rule_dstoff && types[type_idxs[i]].isdst)
|
||
rule_dstoff = types[type_idxs[i]].offset;
|
||
if (rule_stdoff && rule_dstoff)
|
||
break;
|
||
}
|
||
|
||
/* Now correct the transition times for the user-specified standard and
|
||
daylight offsets from GMT. */
|
||
isdst = 0;
|
||
rule_offset = rule_offset;
|
||
for (i = 0; i < num_transitions; ++i)
|
||
{
|
||
struct ttinfo *trans_type = &types[type_idxs[i]];
|
||
|
||
/* We will use only types 0 (standard) and 1 (daylight).
|
||
Fix up this transition to point to whichever matches
|
||
the flavor of its original type. */
|
||
type_idxs[i] = trans_type->isdst;
|
||
|
||
if (trans_type->isgmt)
|
||
/* The transition time is in GMT. No correction to apply. */ ;
|
||
else if (isdst && !trans_type->isstd)
|
||
/* The type says this transition is in "local wall clock time", and
|
||
wall clock time as of the previous transition was DST. Correct
|
||
for the difference between the rule's DST offset and the user's
|
||
DST offset. */
|
||
transitions[i] += dstoff - rule_dstoff;
|
||
else
|
||
/* This transition is in "local wall clock time", and wall clock
|
||
time as of this iteration is non-DST. Correct for the
|
||
difference between the rule's standard offset and the user's
|
||
standard offset. */
|
||
transitions[i] += stdoff - rule_stdoff;
|
||
|
||
/* The DST state of "local wall clock time" for the next iteration is
|
||
as specified by this transition. */
|
||
isdst = trans_type->isdst;
|
||
}
|
||
|
||
/* Reset types 0 and 1 to describe the user's settings. */
|
||
types[0].idx = 0;
|
||
types[0].offset = stdoff;
|
||
types[0].isdst = 0;
|
||
types[1].idx = stdlen;
|
||
types[1].offset = dstoff;
|
||
types[1].isdst = 1;
|
||
|
||
/* Reset the zone names to point to the user's names. */
|
||
__tzname[0] = &zone_names[0];
|
||
__tzname[1] = &zone_names[stdlen];
|
||
|
||
compute_tzname_max (stdlen + dstlen);
|
||
}
|
||
|
||
static struct ttinfo *
|
||
find_transition (time_t timer)
|
||
{
|
||
size_t i;
|
||
|
||
if (num_transitions == 0 || timer < transitions[0])
|
||
{
|
||
/* TIMER is before any transition (or there are no transitions).
|
||
Choose the first non-DST type
|
||
(or the first if they're all DST types). */
|
||
i = 0;
|
||
while (i < num_types && types[i].isdst)
|
||
++i;
|
||
if (i == num_types)
|
||
i = 0;
|
||
}
|
||
else
|
||
{
|
||
/* Find the first transition after TIMER, and
|
||
then pick the type of the transition before it. */
|
||
for (i = 1; i < num_transitions; ++i)
|
||
if (timer < transitions[i])
|
||
break;
|
||
i = type_idxs[i - 1];
|
||
}
|
||
|
||
return &types[i];
|
||
}
|
||
|
||
int
|
||
__tzfile_compute (time_t timer, long int *leap_correct, int *leap_hit)
|
||
{
|
||
struct ttinfo *info;
|
||
register size_t i;
|
||
|
||
info = find_transition (timer);
|
||
__daylight = info->isdst;
|
||
__timezone = info->offset;
|
||
for (i = 0; i < num_types && i < sizeof (__tzname) / sizeof (__tzname[0]);
|
||
++i)
|
||
__tzname[types[i].isdst] = &zone_names[types[i].idx];
|
||
if (info->isdst < sizeof (__tzname) / sizeof (__tzname[0]))
|
||
__tzname[info->isdst] = &zone_names[info->idx];
|
||
|
||
*leap_correct = 0L;
|
||
*leap_hit = 0;
|
||
|
||
/* Find the last leap second correction transition time before TIMER. */
|
||
i = num_leaps;
|
||
do
|
||
if (i-- == 0)
|
||
return 1;
|
||
while (timer < leaps[i].transition);
|
||
|
||
/* Apply its correction. */
|
||
*leap_correct = leaps[i].change;
|
||
|
||
if (timer == leaps[i].transition && /* Exactly at the transition time. */
|
||
((i == 0 && leaps[i].change > 0) ||
|
||
leaps[i].change > leaps[i - 1].change))
|
||
{
|
||
*leap_hit = 1;
|
||
while (i > 0 &&
|
||
leaps[i].transition == leaps[i - 1].transition + 1 &&
|
||
leaps[i].change == leaps[i - 1].change + 1)
|
||
{
|
||
++*leap_hit;
|
||
--i;
|
||
}
|
||
}
|
||
|
||
return 1;
|
||
}
|
||
|
||
void
|
||
compute_tzname_max (size_t chars)
|
||
{
|
||
extern size_t __tzname_cur_max; /* Defined in __tzset.c. */
|
||
|
||
const char *p;
|
||
|
||
p = zone_names;
|
||
do
|
||
{
|
||
const char *start = p;
|
||
while (*p != '\0')
|
||
++p;
|
||
if ((size_t) (p - start) > __tzname_cur_max)
|
||
__tzname_cur_max = p - start;
|
||
} while (++p < &zone_names[chars]);
|
||
}
|