mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-30 06:21:07 +00:00
ba9234d947
1998-07-04 10:14 Ulrich Drepper <drepper@cygnus.com> * libio/Makefile (routines): Add iofread_u and iofwrite_u. * libio/Versions: Add fread_unlocked and fwrite_unlocked. * Makerules (lib%.so): Adjust ignore pattern for last makefile change. * time/tzfile.c (decode): Optimize by using bswap_32. (__tzfile_read): Use _unlocked stream functions. Correct setting of __tzname array values. (__tzfile_compute): Correct setting of __tzname array values. * time/tzset.c (__tzstring): Clean up a bit. 1998-06-29 19:01 Jim Wilson <wilson@cygnus.com> * posix/regex.c (re_comp): Add cast to char * before gettext calls. 1998-06-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/bsd/poll.c (__poll): Allocate fd_set dynamically so that fd can be bigger than FD_SETSIZE. 1998-07-01 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nscd/grpcache.c: Include <unistd.h>. * nscd/pwdcache.c: Likewise. * nis/nis_modify.c: Include <string.h>. * nis/nis_add.c: Likewise. * nis/nis_checkpoint.c: Likewise. * posix/runptests.c: Likewise. * sysdeps/generic/statvfs64.c: Likewise. * sysdeps/generic/fstatvfs64.c: Likewise. 1998-07-03 13:16 Ulrich Drepper <drepper@cygnus.com> * localedata/charmaps/ISO-8859-9: Change mapping for 0xea, 0xec, 0xef to match data from Unicode. Reported by Michael Deutschmann <michael@talamasca.wkpowerlink.com>. 1998-07-03 11:45 Ulrich Drepper <drepper@cygnus.com> * stdio-common/printf.h: Define printf_function and printf_arginfo_function types using __PMT not __P. Reported by Marc Lehmann. 1998-07-02 14:07 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu> * assert/test-assert.c: New test. * assert/test-assert-perr.c: New test. * assert/Makefile (tests): Add test-assert and test-assert-perr. 1998-07-02 13:45 Zack Weinberg <zack@rabi.phys.columbia.edu> BSD-style SCM_CREDS support. * sysdeps/unix/sysv/linux/socket.h: Define struct cmsgcred and SCM_CREDS. * sysdeps/unix/sysv/linux/sendmsg.c: New file. Convert user visible SCM_CREDS packet to what the kernel wants. * sysdeps/unix/sysv/linux/recvmsg.c: New file. Convert SCM_CREDS packet output by kernel to what users want. * sysdeps/unix/sysv/linux/sendmsg.S: Moved to... * sysdeps/unix/sysv/linux/__sendmsg.S: here. * sysdeps/unix/sysv/linux/recvmsg.S: Moved to... * sysdeps/unix/sysv/linux/__recvmsg.S: here. * sysdeps/unix/sysv/linux/Makefile [subdir=socket]: Add __sendmsg and __recvmsg to sysdep_routines. * sysdeps/unix/sysv/linux/Dist: Add __sendmsg.S and __recvmsg.S. 1998-07-02 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nscd/grpcache.c: Fix gid pointer handling and debug messages. * nscd/pwdcache.c: Fix uid pointer handling and debug messages. * nscd/nscd.c: Check, if pthread_create fails. 1998-07-02 Andreas Jaeger <aj@arthur.rhein-neckar.de> * stdio-common/test_rdwr.c (main): Use %Zu for size_t in printf format strings. * stdio-common/bug1.c (main): Likewise. * stdio-common/bug5.c (main): Likewise. * stdio-common/tstgetln.c (main): Likewise. * elf/sprof.c (generate_call_graph): Likewise. (load_shobj): Likewise. * posix/runptests.c (main): Likewise. * string/tst-strlen.c (main): Likewise. * sysdeps/libm-ieee754/e_acos.c (__ieee754_acos): Remove unused variable q3. * sysdeps/libm-ieee754/e_asin.c (__ieee754_asin): Likewise 1998-07-03 Andreas Jaeger <aj@arthur.rhein-neckar.de> * wctype/Versions: Add __towctrans. Noticed by Alex Buell <alex.buell@tahallah.demon.co.uk>. 1998-07-02 Mark Kettenis <kettenis@phys.uva.nl> * grp/initgroups.c (compat_call): Only call dynamically loaded functions if they are really present. 1998-07-02 Mark Kettenis <kettenis@phys.uva.nl> * sysdeps/unix/sysv/linux/bits/sched.h: Move __END_DECLS within #ifdef that contains __BEGIN_DECLS. 1998-07-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/iofwrite.c: Fix return value when size == 0. 1998-07-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * posix/Makefile (distribute): Add annexc.c. (generated): Add $(objpfx)annexc and $(objpfx)annexc.out. 1998-07-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add bits/pthreadtypes.h here, and do not clobber headers. * sysdeps/unix/sysv/linux/Dist: Add bits/pthreadtypes.h. 1998-07-03 Andreas Jaeger <aj@arthur.rhein-neckar.de> * timezone/tst-timezone.c: Add tests for tzname variable. 1998-07-03 12:17 Zack Weinberg <zack@rabi.phys.columbia.edu> * Makefile [versioning=yes]: Build the mapfiles with a pattern rule that lists all of them as targets. (sysd-versions): Depend only on Versions.def. Write a Makefile fragment that defines $(vers-libs) based on contents of that file; then include it. (lib-noranlib): Depend on lib-mapfiles not sysd-versions. (lib-mapfiles): New target, depends on sysd-versions and $(vers-libs). Predicate all this on avoid-generated unset as well as versioning. 1998-07-03 14:35 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
489 lines
13 KiB
C
489 lines
13 KiB
C
/* Copyright (C) 1991, 92, 93, 95, 96, 97, 98 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 <timezone/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. */
|
||
};
|
||
|
||
extern char * __tzstring (const char *); /* Defined in tzset.c. */
|
||
|
||
static struct ttinfo *find_transition (time_t timer) internal_function;
|
||
static void compute_tzname_max (size_t) internal_function;
|
||
|
||
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 long int rule_stdoff;
|
||
static long int rule_dstoff;
|
||
static size_t num_leaps;
|
||
static struct leap *leaps = NULL;
|
||
|
||
#include <endian.h>
|
||
#include <byteswap.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 if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4)
|
||
return bswap_32 (*(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;
|
||
|
||
__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 with no leap seconds. */
|
||
return;
|
||
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, *tmp;
|
||
|
||
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);
|
||
tmp = __mempcpy (new, tzdir, tzdir_len);
|
||
*tmp++ = '/';
|
||
__mempcpy (tmp, file, len);
|
||
file = new;
|
||
}
|
||
|
||
f = fopen (file, "r");
|
||
if (f == NULL)
|
||
return;
|
||
|
||
if (fread_unlocked ((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_unlocked (transitions, 4, num_transitions, f) != num_transitions
|
||
|| fread_unlocked (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_unlocked (x, 1, 4, f) != 4
|
||
|| fread_unlocked (&types[i].isdst, 1, 1, f) != 1
|
||
|| fread_unlocked (&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_unlocked (zone_names, 1, chars, f) != chars)
|
||
goto lose;
|
||
|
||
for (i = 0; i < num_leaps; ++i)
|
||
{
|
||
unsigned char x[4];
|
||
if (fread_unlocked (x, 1, sizeof (x), f) != sizeof (x))
|
||
goto lose;
|
||
leaps[i].transition = (time_t) decode (x);
|
||
if (fread_unlocked (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_unlocked (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_unlocked (f);
|
||
if (c == EOF)
|
||
goto lose;
|
||
types[i].isgmt = c != 0;
|
||
}
|
||
while (i < num_types)
|
||
types[i++].isgmt = 0;
|
||
|
||
fclose (f);
|
||
|
||
/* 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. */
|
||
__tzname[1] = NULL;
|
||
for (i = 0; i < num_types; ++i)
|
||
__tzname[types[i].isdst] = __tzstring (&zone_names[types[i].idx]);
|
||
if (__tzname[1] == NULL)
|
||
__tzname[1] = __tzname[0];
|
||
|
||
compute_tzname_max (chars);
|
||
|
||
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;
|
||
}
|
||
|
||
__daylight = rule_stdoff != rule_dstoff;
|
||
__timezone = -rule_stdoff;
|
||
|
||
__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 (const char *std, const char *dst,
|
||
long int stdoff, long int dstoff)
|
||
{
|
||
size_t stdlen, dstlen, i;
|
||
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;
|
||
}
|
||
__mempcpy (__mempcpy (zone_names, std, stdlen), dst, dstlen);
|
||
|
||
/* Now correct the transition times for the user-specified standard and
|
||
daylight offsets from GMT. */
|
||
isdst = 0;
|
||
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] = (char *) std;
|
||
__tzname[1] = (char *) dst;
|
||
|
||
compute_tzname_max (stdlen + dstlen);
|
||
}
|
||
|
||
static struct ttinfo *
|
||
internal_function
|
||
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, int use_localtime,
|
||
long int *leap_correct, int *leap_hit,
|
||
struct tm *tp)
|
||
{
|
||
register size_t i;
|
||
|
||
if (use_localtime)
|
||
{
|
||
struct ttinfo *info = find_transition (timer);
|
||
__daylight = rule_stdoff != rule_dstoff;
|
||
__timezone = -rule_stdoff;
|
||
__tzname[1] = NULL;
|
||
for (i = 0; i < num_types; ++i)
|
||
__tzname[types[i].isdst] = __tzstring (&zone_names[types[i].idx]);
|
||
if (__tzname[1] == NULL)
|
||
/* There is no daylight saving time. */
|
||
__tzname[1] = __tzname[0];
|
||
tp->tm_isdst = info->isdst;
|
||
tp->tm_zone = &zone_names[info->idx];
|
||
tp->tm_gmtoff = info->offset;
|
||
}
|
||
|
||
*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;
|
||
}
|
||
|
||
static void
|
||
internal_function
|
||
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]);
|
||
}
|