mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-07 05:40:05 +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.
645 lines
16 KiB
C
645 lines
16 KiB
C
/* Copyright (C) 1991, 92, 93, 94, 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 <ctype.h>
|
||
#include <errno.h>
|
||
#include <bits/libc-lock.h>
|
||
#include <stddef.h>
|
||
#include <stdio.h>
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#include <time.h>
|
||
|
||
/* Defined in mktime.c. */
|
||
extern const unsigned short int __mon_yday[2][13];
|
||
|
||
/* Defined in localtime.c. */
|
||
extern struct tm _tmbuf;
|
||
|
||
#define NOID
|
||
#include "tzfile.h"
|
||
|
||
extern int __use_tzfile;
|
||
extern void __tzfile_read __P ((const char *file));
|
||
extern int __tzfile_compute __P ((time_t timer, int use_localtime,
|
||
long int *leap_correct, int *leap_hit));
|
||
extern void __tzfile_default __P ((const char *std, const char *dst,
|
||
long int stdoff, long int dstoff));
|
||
extern char * __tzstring __P ((const char *string));
|
||
|
||
char *__tzname[2] = { (char *) "GMT", (char *) "GMT" };
|
||
int __daylight = 0;
|
||
long int __timezone = 0L;
|
||
|
||
weak_alias (__tzname, tzname)
|
||
weak_alias (__daylight, daylight)
|
||
weak_alias (__timezone, timezone)
|
||
|
||
/* This locks all the state variables in tzfile.c and this file. */
|
||
__libc_lock_define (static, tzset_lock)
|
||
|
||
|
||
#define min(a, b) ((a) < (b) ? (a) : (b))
|
||
#define max(a, b) ((a) > (b) ? (a) : (b))
|
||
#define sign(x) ((x) < 0 ? -1 : 1)
|
||
|
||
|
||
/* This structure contains all the information about a
|
||
timezone given in the POSIX standard TZ envariable. */
|
||
typedef struct
|
||
{
|
||
const char *name;
|
||
|
||
/* When to change. */
|
||
enum { J0, J1, M } type; /* Interpretation of: */
|
||
unsigned short int m, n, d; /* Month, week, day. */
|
||
unsigned int secs; /* Time of day. */
|
||
|
||
long int offset; /* Seconds east of GMT (west if < 0). */
|
||
|
||
/* We cache the computed time of change for a
|
||
given year so we don't have to recompute it. */
|
||
time_t change; /* When to change to this zone. */
|
||
int computed_for; /* Year above is computed for. */
|
||
} tz_rule;
|
||
|
||
/* tz_rules[0] is standard, tz_rules[1] is daylight. */
|
||
static tz_rule tz_rules[2];
|
||
|
||
|
||
static int compute_change __P ((tz_rule *rule, int year));
|
||
static int tz_compute __P ((time_t timer, const struct tm *tm));
|
||
static void tzset_internal __P ((int always));
|
||
|
||
/* Header for a list of buffers containing time zone strings. */
|
||
struct tzstring_head
|
||
{
|
||
struct tzstring_head *next;
|
||
/* The buffer itself immediately follows the header.
|
||
The buffer contains zero or more (possibly overlapping) strings.
|
||
The last string is followed by 2 '\0's instead of the usual 1. */
|
||
};
|
||
|
||
/* First in a list of buffers containing time zone strings.
|
||
All the buffers but the last are read-only. */
|
||
static struct
|
||
{
|
||
struct tzstring_head head;
|
||
char data[48];
|
||
} tzstring_list;
|
||
|
||
/* Size of the last buffer in the list, not counting its header. */
|
||
static size_t tzstring_last_buffer_size = sizeof tzstring_list.data;
|
||
|
||
/* Allocate a time zone string with given contents.
|
||
The string will never be moved or deallocated.
|
||
However, its contents may be shared with other such strings. */
|
||
char *
|
||
__tzstring (string)
|
||
const char *string;
|
||
{
|
||
struct tzstring_head *h = &tzstring_list.head;
|
||
size_t needed;
|
||
char *p;
|
||
|
||
/* Look through time zone string list for a duplicate of this one. */
|
||
for (h = &tzstring_list.head; ; h = h->next)
|
||
{
|
||
for (p = (char *) (h + 1); p[0] | p[1]; ++p)
|
||
if (strcmp (p, string) == 0)
|
||
return p;
|
||
if (! h->next)
|
||
break;
|
||
}
|
||
|
||
/* No duplicate was found. Copy to the end of this buffer if there's room;
|
||
otherwise, append a large-enough new buffer to the list and use it. */
|
||
++p;
|
||
needed = strlen (string) + 2; /* Need 2 trailing '\0's after last string. */
|
||
|
||
if ((size_t) ((char *) (h + 1) + tzstring_last_buffer_size - p) < needed)
|
||
{
|
||
size_t buffer_size = tzstring_last_buffer_size;
|
||
while ((buffer_size *= 2) < needed)
|
||
continue;
|
||
if (! (h = h->next = malloc (sizeof *h + buffer_size)))
|
||
return NULL;
|
||
h->next = NULL;
|
||
tzstring_last_buffer_size = buffer_size;
|
||
p = (char *) (h + 1);
|
||
}
|
||
|
||
return strncpy (p, string, needed);
|
||
}
|
||
|
||
static char *old_tz = NULL;
|
||
|
||
/* Interpret the TZ envariable. */
|
||
static void
|
||
tzset_internal (always)
|
||
int always;
|
||
{
|
||
static int is_initialized = 0;
|
||
register const char *tz;
|
||
register size_t l;
|
||
char *tzbuf;
|
||
unsigned short int hh, mm, ss;
|
||
unsigned short int whichrule;
|
||
|
||
if (is_initialized && !always)
|
||
return;
|
||
is_initialized = 1;
|
||
|
||
/* Examine the TZ environment variable. */
|
||
tz = getenv ("TZ");
|
||
if (tz == NULL)
|
||
/* No user specification; use the site-wide default. */
|
||
tz = TZDEFAULT;
|
||
else if (*tz == '\0')
|
||
/* User specified the empty string; use UTC explicitly. */
|
||
tz = "Universal";
|
||
|
||
/* A leading colon means "implementation defined syntax".
|
||
We ignore the colon and always use the same algorithm:
|
||
try a data file, and if none exists parse the 1003.1 syntax. */
|
||
if (tz && *tz == ':')
|
||
++tz;
|
||
|
||
/* Check whether the value changes since the last run. */
|
||
if (old_tz != NULL && tz != NULL && strcmp (tz, old_tz) == 0)
|
||
/* No change, simply return. */
|
||
return;
|
||
|
||
tz_rules[0].name = NULL;
|
||
tz_rules[1].name = NULL;
|
||
|
||
/* Save the value of `tz'. */
|
||
if (old_tz != NULL)
|
||
free (old_tz);
|
||
old_tz = tz ? __strdup (tz) : NULL;
|
||
|
||
/* Try to read a data file. */
|
||
__tzfile_read (tz);
|
||
if (__use_tzfile)
|
||
return;
|
||
|
||
/* No data file found. Default to UTC if nothing specified. */
|
||
|
||
if (tz == NULL || *tz == '\0')
|
||
{
|
||
tz_rules[0].name = tz_rules[1].name = "UTC";
|
||
tz_rules[0].type = tz_rules[1].type = J0;
|
||
tz_rules[0].m = tz_rules[0].n = tz_rules[0].d = 0;
|
||
tz_rules[1].m = tz_rules[1].n = tz_rules[1].d = 0;
|
||
tz_rules[0].secs = tz_rules[1].secs = 0;
|
||
tz_rules[0].offset = tz_rules[1].offset = 0L;
|
||
tz_rules[0].change = tz_rules[1].change = (time_t) -1;
|
||
tz_rules[0].computed_for = tz_rules[1].computed_for = 0;
|
||
return;
|
||
}
|
||
|
||
/* Clear out old state and reset to unnamed UTC. */
|
||
memset (tz_rules, 0, sizeof tz_rules);
|
||
tz_rules[0].name = tz_rules[1].name = "";
|
||
|
||
/* Get the standard timezone name. */
|
||
tzbuf = malloc (strlen (tz) + 1);
|
||
if (! tzbuf)
|
||
{
|
||
/* Clear the old tz name so we will try again. */
|
||
free (old_tz);
|
||
old_tz = NULL;
|
||
return;
|
||
}
|
||
|
||
if (sscanf (tz, "%[^0-9,+-]", tzbuf) != 1 ||
|
||
(l = strlen (tzbuf)) < 3)
|
||
{
|
||
free (tzbuf);
|
||
return;
|
||
}
|
||
|
||
tz_rules[0].name = __tzstring (tzbuf);
|
||
|
||
tz += l;
|
||
|
||
/* Figure out the standard offset from UTC. */
|
||
if (*tz == '\0' || (*tz != '+' && *tz != '-' && !isdigit (*tz)))
|
||
{
|
||
free (tzbuf);
|
||
return;
|
||
}
|
||
|
||
if (*tz == '-' || *tz == '+')
|
||
tz_rules[0].offset = *tz++ == '-' ? 1L : -1L;
|
||
else
|
||
tz_rules[0].offset = -1L;
|
||
switch (sscanf (tz, "%hu:%hu:%hu", &hh, &mm, &ss))
|
||
{
|
||
default:
|
||
free (tzbuf);
|
||
return;
|
||
case 1:
|
||
mm = 0;
|
||
case 2:
|
||
ss = 0;
|
||
case 3:
|
||
break;
|
||
}
|
||
tz_rules[0].offset *= (min (ss, 59) + (min (mm, 59) * 60) +
|
||
(min (hh, 23) * 60 * 60));
|
||
|
||
for (l = 0; l < 3; ++l)
|
||
{
|
||
while (isdigit(*tz))
|
||
++tz;
|
||
if (l < 2 && *tz == ':')
|
||
++tz;
|
||
}
|
||
|
||
/* Get the DST timezone name (if any). */
|
||
if (*tz != '\0')
|
||
{
|
||
char *n = tzbuf + strlen (tzbuf) + 1;
|
||
if (sscanf (tz, "%[^0-9,+-]", n) != 1 ||
|
||
(l = strlen (n)) < 3)
|
||
goto done_names; /* Punt on name, set up the offsets. */
|
||
|
||
tz_rules[1].name = __tzstring (n);
|
||
|
||
tz += l;
|
||
|
||
/* Figure out the DST offset from GMT. */
|
||
if (*tz == '-' || *tz == '+')
|
||
tz_rules[1].offset = *tz++ == '-' ? 1L : -1L;
|
||
else
|
||
tz_rules[1].offset = -1L;
|
||
|
||
switch (sscanf (tz, "%hu:%hu:%hu", &hh, &mm, &ss))
|
||
{
|
||
default:
|
||
/* Default to one hour later than standard time. */
|
||
tz_rules[1].offset = tz_rules[0].offset + (60 * 60);
|
||
break;
|
||
|
||
case 1:
|
||
mm = 0;
|
||
case 2:
|
||
ss = 0;
|
||
case 3:
|
||
tz_rules[1].offset *= (min (ss, 59) + (min (mm, 59) * 60) +
|
||
(min (hh, 23) * (60 * 60)));
|
||
break;
|
||
}
|
||
for (l = 0; l < 3; ++l)
|
||
{
|
||
while (isdigit (*tz))
|
||
++tz;
|
||
if (l < 2 && *tz == ':')
|
||
++tz;
|
||
}
|
||
if (*tz == '\0' || (tz[0] == ',' && tz[1] == '\0'))
|
||
{
|
||
/* There is no rule. See if there is a default rule file. */
|
||
__tzfile_default (tz_rules[0].name, tz_rules[1].name,
|
||
tz_rules[0].offset, tz_rules[1].offset);
|
||
if (__use_tzfile)
|
||
{
|
||
free (old_tz);
|
||
old_tz = NULL;
|
||
free (tzbuf);
|
||
return;
|
||
}
|
||
}
|
||
}
|
||
else
|
||
{
|
||
/* There is no DST. */
|
||
tz_rules[1].name = tz_rules[0].name;
|
||
free (tzbuf);
|
||
return;
|
||
}
|
||
|
||
done_names:
|
||
free (tzbuf);
|
||
|
||
/* Figure out the standard <-> DST rules. */
|
||
for (whichrule = 0; whichrule < 2; ++whichrule)
|
||
{
|
||
register tz_rule *tzr = &tz_rules[whichrule];
|
||
|
||
/* Ignore comma to support string following the incorrect
|
||
specification in early POSIX.1 printings. */
|
||
tz += *tz == ',';
|
||
|
||
/* Get the date of the change. */
|
||
if (*tz == 'J' || isdigit (*tz))
|
||
{
|
||
char *end;
|
||
tzr->type = *tz == 'J' ? J1 : J0;
|
||
if (tzr->type == J1 && !isdigit (*++tz))
|
||
return;
|
||
tzr->d = (unsigned short int) strtoul (tz, &end, 10);
|
||
if (end == tz || tzr->d > 365)
|
||
return;
|
||
else if (tzr->type == J1 && tzr->d == 0)
|
||
return;
|
||
tz = end;
|
||
}
|
||
else if (*tz == 'M')
|
||
{
|
||
int n;
|
||
tzr->type = M;
|
||
if (sscanf (tz, "M%hu.%hu.%hu%n",
|
||
&tzr->m, &tzr->n, &tzr->d, &n) != 3 ||
|
||
tzr->m < 1 || tzr->m > 12 ||
|
||
tzr->n < 1 || tzr->n > 5 || tzr->d > 6)
|
||
return;
|
||
tz += n;
|
||
}
|
||
else if (*tz == '\0')
|
||
{
|
||
/* United States Federal Law, the equivalent of "M4.1.0,M10.5.0". */
|
||
tzr->type = M;
|
||
if (tzr == &tz_rules[0])
|
||
{
|
||
tzr->m = 4;
|
||
tzr->n = 1;
|
||
tzr->d = 0;
|
||
}
|
||
else
|
||
{
|
||
tzr->m = 10;
|
||
tzr->n = 5;
|
||
tzr->d = 0;
|
||
}
|
||
}
|
||
else
|
||
return;
|
||
|
||
if (*tz != '\0' && *tz != '/' && *tz != ',')
|
||
return;
|
||
else if (*tz == '/')
|
||
{
|
||
/* Get the time of day of the change. */
|
||
++tz;
|
||
if (*tz == '\0')
|
||
return;
|
||
switch (sscanf (tz, "%hu:%hu:%hu", &hh, &mm, &ss))
|
||
{
|
||
default:
|
||
hh = 2; /* Default to 2:00 AM. */
|
||
case 1:
|
||
mm = 0;
|
||
case 2:
|
||
ss = 0;
|
||
case 3:
|
||
break;
|
||
}
|
||
for (l = 0; l < 3; ++l)
|
||
{
|
||
while (isdigit (*tz))
|
||
++tz;
|
||
if (l < 2 && *tz == ':')
|
||
++tz;
|
||
}
|
||
tzr->secs = (hh * 60 * 60) + (mm * 60) + ss;
|
||
}
|
||
else
|
||
/* Default to 2:00 AM. */
|
||
tzr->secs = 2 * 60 * 60;
|
||
|
||
tzr->computed_for = -1;
|
||
}
|
||
}
|
||
|
||
/* Maximum length of a timezone name. __tz_compute keeps this up to date
|
||
(never decreasing it) when ! __use_tzfile.
|
||
tzfile.c keeps it up to date when __use_tzfile. */
|
||
size_t __tzname_cur_max;
|
||
|
||
long int
|
||
__tzname_max ()
|
||
{
|
||
__libc_lock_lock (tzset_lock);
|
||
|
||
tzset_internal (0);
|
||
|
||
__libc_lock_unlock (tzset_lock);
|
||
|
||
return __tzname_cur_max;
|
||
}
|
||
|
||
/* Figure out the exact time (as a time_t) in YEAR
|
||
when the change described by RULE will occur and
|
||
put it in RULE->change, saving YEAR in RULE->computed_for.
|
||
Return nonzero if successful, zero on failure. */
|
||
static int
|
||
compute_change (rule, year)
|
||
tz_rule *rule;
|
||
int year;
|
||
{
|
||
register time_t t;
|
||
int y;
|
||
|
||
if (year != -1 && rule->computed_for == year)
|
||
/* Operations on times in 1969 will be slower. Oh well. */
|
||
return 1;
|
||
|
||
/* First set T to January 1st, 0:00:00 GMT in YEAR. */
|
||
t = 0;
|
||
for (y = 1970; y < year; ++y)
|
||
t += SECSPERDAY * (__isleap (y) ? 366 : 365);
|
||
|
||
switch (rule->type)
|
||
{
|
||
case J1:
|
||
/* Jn - Julian day, 1 == January 1, 60 == March 1 even in leap years.
|
||
In non-leap years, or if the day number is 59 or less, just
|
||
add SECSPERDAY times the day number-1 to the time of
|
||
January 1, midnight, to get the day. */
|
||
t += (rule->d - 1) * SECSPERDAY;
|
||
if (rule->d >= 60 && __isleap (year))
|
||
t += SECSPERDAY;
|
||
break;
|
||
|
||
case J0:
|
||
/* n - Day of year.
|
||
Just add SECSPERDAY times the day number to the time of Jan 1st. */
|
||
t += rule->d * SECSPERDAY;
|
||
break;
|
||
|
||
case M:
|
||
/* Mm.n.d - Nth "Dth day" of month M. */
|
||
{
|
||
unsigned int i;
|
||
int d, m1, yy0, yy1, yy2, dow;
|
||
const unsigned short int *myday =
|
||
&__mon_yday[__isleap (year)][rule->m];
|
||
|
||
/* First add SECSPERDAY for each day in months before M. */
|
||
t += myday[-1] * SECSPERDAY;
|
||
|
||
/* Use Zeller's Congruence to get day-of-week of first day of month. */
|
||
m1 = (rule->m + 9) % 12 + 1;
|
||
yy0 = (rule->m <= 2) ? (year - 1) : year;
|
||
yy1 = yy0 / 100;
|
||
yy2 = yy0 % 100;
|
||
dow = ((26 * m1 - 2) / 10 + 1 + yy2 + yy2 / 4 + yy1 / 4 - 2 * yy1) % 7;
|
||
if (dow < 0)
|
||
dow += 7;
|
||
|
||
/* DOW is the day-of-week of the first day of the month. Get the
|
||
day-of-month (zero-origin) of the first DOW day of the month. */
|
||
d = rule->d - dow;
|
||
if (d < 0)
|
||
d += 7;
|
||
for (i = 1; i < rule->n; ++i)
|
||
{
|
||
if (d + 7 >= (int) myday[0] - myday[-1])
|
||
break;
|
||
d += 7;
|
||
}
|
||
|
||
/* D is the day-of-month (zero-origin) of the day we want. */
|
||
t += d * SECSPERDAY;
|
||
}
|
||
break;
|
||
}
|
||
|
||
/* T is now the Epoch-relative time of 0:00:00 GMT on the day we want.
|
||
Just add the time of day and local offset from GMT, and we're done. */
|
||
|
||
rule->change = t - rule->offset + rule->secs;
|
||
rule->computed_for = year;
|
||
return 1;
|
||
}
|
||
|
||
|
||
/* Figure out the correct timezone for *TIMER and TM (which must be the same)
|
||
and set `__tzname', `__timezone', and `__daylight' accordingly.
|
||
Return nonzero on success, zero on failure. */
|
||
static int
|
||
tz_compute (timer, tm)
|
||
time_t timer;
|
||
const struct tm *tm;
|
||
{
|
||
if (! compute_change (&tz_rules[0], 1900 + tm->tm_year) ||
|
||
! compute_change (&tz_rules[1], 1900 + tm->tm_year))
|
||
return 0;
|
||
|
||
__daylight = timer >= tz_rules[0].change && timer < tz_rules[1].change;
|
||
__timezone = tz_rules[__daylight ? 1 : 0].offset;
|
||
__tzname[0] = (char *) tz_rules[0].name;
|
||
__tzname[1] = (char *) tz_rules[1].name;
|
||
|
||
{
|
||
/* Keep __tzname_cur_max up to date. */
|
||
size_t len0 = strlen (__tzname[0]);
|
||
size_t len1 = strlen (__tzname[1]);
|
||
if (len0 > __tzname_cur_max)
|
||
__tzname_cur_max = len0;
|
||
if (len1 > __tzname_cur_max)
|
||
__tzname_cur_max = len1;
|
||
}
|
||
|
||
return 1;
|
||
}
|
||
|
||
/* Reinterpret the TZ environment variable and set `tzname'. */
|
||
#undef tzset
|
||
|
||
void
|
||
__tzset (void)
|
||
{
|
||
__libc_lock_lock (tzset_lock);
|
||
|
||
tzset_internal (1);
|
||
|
||
if (!__use_tzfile)
|
||
{
|
||
/* Set `tzname'. */
|
||
__tzname[0] = (char *) tz_rules[0].name;
|
||
__tzname[1] = (char *) tz_rules[1].name;
|
||
}
|
||
|
||
__libc_lock_unlock (tzset_lock);
|
||
}
|
||
weak_alias (__tzset, tzset)
|
||
|
||
/* Return the `struct tm' representation of *TIMER in the local timezone.
|
||
Use local time if USE_LOCALTIME is nonzero, UTC otherwise. */
|
||
struct tm *
|
||
__tz_convert (const time_t *timer, int use_localtime, struct tm *tp)
|
||
{
|
||
long int leap_correction;
|
||
int leap_extra_secs;
|
||
|
||
if (timer == NULL)
|
||
{
|
||
__set_errno (EINVAL);
|
||
return NULL;
|
||
}
|
||
|
||
__libc_lock_lock (tzset_lock);
|
||
|
||
/* Update internal database according to current TZ setting.
|
||
POSIX.1 8.3.7.2 says that localtime_r is not required to set tzname.
|
||
This is a good idea since this allows at least a bit more parallelism.
|
||
By analogy we apply the same rule to gmtime_r. */
|
||
tzset_internal (tp == &_tmbuf);
|
||
|
||
if (__use_tzfile)
|
||
{
|
||
if (! __tzfile_compute (*timer, use_localtime,
|
||
&leap_correction, &leap_extra_secs))
|
||
tp = NULL;
|
||
}
|
||
else
|
||
{
|
||
__offtime (timer, 0, tp);
|
||
if (! tz_compute (*timer, tp))
|
||
tp = NULL;
|
||
leap_correction = 0L;
|
||
leap_extra_secs = 0;
|
||
}
|
||
|
||
if (tp)
|
||
{
|
||
if (use_localtime)
|
||
{
|
||
tp->tm_isdst = __daylight;
|
||
tp->tm_zone = __tzname[__daylight];
|
||
tp->tm_gmtoff = __timezone;
|
||
}
|
||
else
|
||
{
|
||
tp->tm_isdst = 0;
|
||
tp->tm_zone = "GMT";
|
||
tp->tm_gmtoff = 0L;
|
||
}
|
||
|
||
__offtime (timer, tp->tm_gmtoff - leap_correction, tp);
|
||
tp->tm_sec += leap_extra_secs;
|
||
}
|
||
|
||
__libc_lock_unlock (tzset_lock);
|
||
|
||
return tp;
|
||
}
|