11bf311edc
2007-01-11 Jakub Jelinek <jakub@redhat.com> * sysdeps/i386/soft-fp/sfp-machine.h: Remove. * sysdeps/x86_64/soft-fp/sfp-machine.h: Likewise. 2007-01-10 Ulrich Drepper <drepper@redhat.com> * io/fts.c: Make sure fts_cur is always valid after return from fts_read. Patch by Miloslav Trmac <mitr@redhat.com>. 2006-10-27 Richard Sandiford <richard@codesourcery.com> * elf/elf.h (R_MIPS_GLOB_DAT): Define. (R_MIPS_NUM): Bump by 1. 2007-01-03 Jakub Jelinek <jakub@redhat.com> * posix/execvp.c: Include alloca.h. (allocate_scripts_argv): Renamed to... (scripts_argv): ... this. Don't allocate buffer here nor count arguments. (execvp): Use alloca if possible. * posix/Makefile: Add rules to build and run tst-vfork3 test. * posix/tst-vfork3.c: New test. * stdlib/Makefile (tst-strtod3-ENV): Define. 2007-01-02 Ulrich Drepper <drepper@redhat.com> * posix/getconf.c: Update copyright year. * nss/getent.c: Likewise. * iconv/iconvconfig.c: Likewise. * iconv/iconv_prog.c: Likewise. * elf/ldconfig.c: Likewise. * catgets/gencat.c: Likewise. * csu/version.c: Likewise. * elf/ldd.bash.in: Likewise. * elf/sprof.c (print_version): Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * nscd/nscd.c (print_version): Likewise. * debug/xtrace.sh: Likewise. * malloc/memusage.sh: Likewise. * malloc/mtrace.pl: Likewise. * debug/catchsegv.sh: Likewise. 2006-12-24 Ulrich Drepper <drepper@redhat.com> * malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment attempts. 2006-12-23 Ulrich Drepper <drepper@redhat.com> * posix/wordexp.c: Remove some unnecessary tests. 2006-12-20 SUGIOKA Toshinobu <sugioka@itonet.co.jp> * sysdeps/unix/sysv/linux/sh/bits/shm.h: New file. * nss/getXXbyYY_r.c: Include atomic.h. (INTERNAL (REENTRANT_NAME)): Write startp after start_fct, add atomic_write_barrier () in between. 2006-11-28 Jakub Jelinek <jakub@redhat.com> * elf/dl-support.c: Include dl-procinfo.h. * sysdeps/powerpc/dl-procinfo.h (PPC_PLATFORM_POWER4, PPC_PLATFORM_PPC970, PPC_PLATFORM_POWER5, PPC_PLATFORM_POWER5_PLUS, PPC_PLATFORM_POWER6, PPC_PLATFORM_CELL_BE, PPC_PLATFORM_POWER6X): Define. (_dl_string_platform): Use PPC_PLATFORM_* macros instead of hardcoded constants. * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platform): Use PPC_PLATFORM_* macros for array designators. 2006-11-11 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Add 3 new cap names to the beginning. (_dl_powerpc_platforms): Add "power6x". * sysdeps/powerpc/dl-procinfo.h (_DL_HWCAP_FIRST): Decrease. (HWCAP_IMPORTANT): Add PPC_FEATURE_HAS_DFP. (_DL_PLATFORMS_COUNT): Increase. (_dl_string_platform): Handle power6x case. * sysdeps/powerpc/sysdep.h (PPC_FEATURE_PA6T, PPC_FEATURE_HAS_DFP, PPC_FEATURE_POWER6_EXT): Define. (PPC_FEATURE_POWER5, PPC_FEATURE_POWER5_PLUS): Correct Comment. [-2^31 .. 2^31) range. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_RELATIME. * sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags): Handle relatime mount option. 2006-12-13 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Include kernel-features.h. 2006-12-11 Ulrich Drepper <drepper@redhat.com> * stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. [BZ #3664] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix test to recognize empty parsed strings. * stdlib/Makefile (tests): Add tst-strtod2. * stdlib/tst-strtod2.c: New file. [BZ #3673] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix exp_limit computation. * stdlib/Makefile (tests): Add tst-atof2. * stdlib/tst-atof2.c: New file. [BZ #3674] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Adjust exponent value correctly if removing trailing zero of hex-float. * stdlib/Makefile (tests): Add tst-atof1. * stdlib/tst-atof1.c: New file. * misc/mntent_r.c (__hasmntopt): Check p[optlen] even when p == rest. Start searching for next comma at p rather than rest. * misc/Makefile (tests): Add tst-mntent2. * misc/tst-mntent2.c: New test. 2006-12-08 Ulrich Drepper <drepper@redhat.com> * malloc/memusage.c: Handle realloc with new size of zero and non-NULL pointer correctly. (me): Really write first record twice. (struct entry): Make format bi-arch safe. (dest): Write out more realloc statistics. * malloc/memusagestat.c (struct entry): Make format bi-arch safe. 2006-12-05 Jakub Jelinek <jakub@redhat.com> * nis/nis_subr.c (nis_getnames): Revert last change. 2006-12-03 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sysv/linux/sh/sys/io.h: Removed. 2006-11-30 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/i386/i686/memcmp.S: Use jump table as the base of jump table entries. 2006-11-30 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/i386/clone.S: Provide CFI for the outermost `clone' function to ensure proper unwinding stop of gdb. * sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise. 2006-12-01 Ulrich Drepper <drepper@redhat.com> * nscd/nscd.init: Remove obsolete and commented-out -S option handling. 2006-11-23 Jakub Jelinek <jakub@redhat.com> [BZ #3514] * manual/string.texi (strncmp): Fix pastos from wcscmp description. [BZ #3515] * manual/string.texi (strtok): Remove duplicate paragraph. 2006-12-01 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with libgcc not supporting `rflags' unwinding (register # >= 17). 2006-11-30 Jakub Jelinek <jakub@redhat.com> * sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc succeeded. 2006-11-29 Daniel Jacobowitz <dan@codesourcery.com> Jakub Jelinek <jakub@redhat.com> Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c (restore_rt): Add correct unwind information. * sysdeps/unix/sysv/linux/x86_64/Makefile: Provide symbols for 'restore_rt' even in the 'signal' directory. * sysdeps/unix/sysv/linux/x86_64/ucontext_i.sym: Extend the regs list. malloc crashed. Don't allocate memory unnecessarily in each loop. 2006-10-21 Jakub Jelinek <jakub@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Fix last change. 2006-11-20 Ulrich Drepper <drepper@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Optimize a bit. 2006-11-18 Bruno Haible <bruno@clisp.org> * sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Invoke __sysconf only after having tried to call getgroups32. 2006-11-19 Ulrich Drepper <drepper@redhat.com> * nss/nss_files/files-hosts.c (LINE_PARSER): Support IPv6-style addresses for IPv4 queries if they can be mapped. 2006-11-16 Jakub Jelinek <jakub@redhat.com> * sysdeps/x86_64/fpu/s_copysignf.S (__copysignf): Switch to .text. * sysdeps/x86_64/fpu/s_copysign.S (__copysign): Likewise. (signmask): Add .size directive. (othermask): Add .type directive. 2006-11-14 Ulrich Drepper <drepper@redhat.com> * po/nl.po: Update from translation team. * timezone/zdump.c: Redo fix for BZ #3137. 2006-11-14 Jakub Jelinek <jakub@redhat.com> * nss/nss_files/files-alias.c (get_next_alias): Set line back to first_unused after parsing :include: file. * timezone/africa: Update from tzdata2006o. * timezone/antarctica: Likewise. * timezone/asia: Likewise. * timezone/australasia: Likewise. * timezone/backward: Likewise. * timezone/europe: Likewise. * timezone/iso3166.tab: Likewise. * timezone/northamerica: Likewise. * timezone/southamerica: Likewise. * timezone/zone.tab: Likewise. * time/tzfile.c (__tzfile_read): Extend to handle new file format on machines with 64-bit time_t. * timezone/checktab.awk: Update from tzcode2006o. * timezone/ialloc.c: Likewise. * timezone/private.h: Likewise. * timezone/scheck.c: Likewise. * timezone/tzfile.h: Likewise. * timezone/tzselect.ksh: Likewise. * timezone/zdump.c: Likewise. * timezone/zic.c: Likewise. [BZ #3483] * elf/ldconfig.c (main): Call setlocale and textdomain. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. [BZ #3480] * manual/argp.texi: Fix typos. * manual/charset.texi: Likewise. * manual/errno.texi: Likewise. * manual/filesys.texi: Likewise. * manual/lang.texi: Likewise. * manual/maint.texi: Likewise. * manual/memory.texi: Likewise. * manual/message.texi: Likewise. * manual/resource.texi: Likewise. * manual/search.texi: Likewise. * manual/signal.texi: Likewise. * manual/startup.texi: Likewise. * manual/stdio.texi: Likewise. * manual/sysinfo.texi: Likewise. * manual/syslog.texi: Likewise. * manual/time.texi: Likewise. Patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>. [BZ #3465] * sunrpc/clnt_raw.c: Minimal message improvements. * sunrpc/pm_getmaps.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nis_print_group_entry.c: Likewise. * locale/programs/repertoire.c: Likewise. * locale/programs/charmap.c: Likewise. * malloc/memusage.sh: Likewise. * elf/dl-deps.c: Likewise. * locale/programs/ld-collate.c: Likewise. * libio/vswprintf.c: Likewise. * malloc/memusagestat.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/rpc_main.c: Likewise. * nscd/cache.c: Likewise. * locale/programs/repertoire.c: Unify output messages. * locale/programs/charmap.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-numeric.c: Likewise. * locale/programs/ld-time.c: Likewise. * elf/ldconfig.c: Likewise. * nscd/selinux.c: Likewise. * elf/cache.c: Likewise. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. 2006-11-10 Jakub Jelinek <jakub@redhat.com> * string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization if N is one bigger than return value. * string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1 and l1 last arguments, if buf is defined, verify the return value equals to strlen (buf) and verify no byte beyond passed length is modified. 2006-11-10 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. * sysdeps/gnu/siglist.c (__old_sys_siglist, __old_sys_sigabbrev): Use __new_sys_siglist instead of _sys_siglist_internal as second macro argument. (_old_sys_siglist): Use declare_symbol_alias macro instead of strong_alias. 2006-11-09 Ulrich Drepper <drepper@redhat.com> [BZ #3493] * posix/unistd.h (sysconf): Remove const attribute. * sysdeps/posix/getaddrinfo.c (getaddrinfo): Fix test for temporary or deprecated addresses. Patch by Sridhar Samudrala <sri@us.ibm.com>. * string/Makefile (tests): Add tst-strxfrm2. * string/tst-strxfrm2.c: New file. 2006-10-09 Jakub Jelinek <jakub@redhat.com> * elf/dl-debug.c (_dl_debug_initialize): Check r->r_map for 0 rather than r->r_brk. * string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal optimization even if needed > n. 2006-11-07 Jakub Jelinek <jakub@redhat.com> * include/libc-symbols.h (declare_symbol): Rename to... (declare_symbol_alias): ... this. Add ORIGINAL argument, imply strong_alias (ORIGINAL, SYMBOL) in asm to make sure it preceedes .size directive. * sysdeps/gnu/errlist-compat.awk: Adjust for declare_symbol_alias changes. * sysdeps/gnu/siglist.c: Likewise. 2006-11-03 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/fpu/bits/mathinline.h [__LIBC_INTERNAL_MATH_INLINES]: Moved to ... * sysdeps/powerpc/fpu/math_private.h: ...here. New file. 2006-11-05 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Update handling of cache descriptor 0x49 for new models. * sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_check_word): Likewise. 2006-11-02 Ulrich Drepper <drepper@redhat.com> * configure.in: Work around ld --help change and avoid -z relro test completely if the architecture doesn't care about security. 2006-11-01 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. 2006-10-31 Ulrich Drepper <drepper@redhat.com> * stdlib/atexit.c (atexit): Don't mark as hidden when used to generate compatibility version. 2006-10-29 Ulrich Drepper <drepper@redhat.com> * configure.in: Relax -z relro requirement a bit. * po/sv.po: Update from translation team. 2006-10-29 Jakub Jelinek <jakub@redhat.com> * elf/dl-sym.c (do_sym): Use RTLD_SINGLE_THREAD_P. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Likewise. * elf/dl-close.c (_dl_close_worker): Likewise. * elf/dl-open.c (_dl_open_worker): Likewise. * sysdeps/generic/sysdep-cancel.h (RTLD_SINGLE_THREAD_P): Define. * configure.in: Require assembler support for visibility, compiler support for visibility and aliases, linker support for various -z options. * Makeconfig: Remove conditional code which now is unnecessary. * config.h.in: Likewise. * config.make.in: Likewise. * dlfcn/Makefile: Likewise. * elf/Makefile: Likewise. * elf/dl-load.c: Likewise. * elf/rtld.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * io/Makefile: Likewise. * io/fstat.c: Likewise. * io/fstat64.c: Likewise. * io/fstatat.c: Likewise. * io/fstatat64.c: Likewise. * io/lstat.c: Likewise. * io/lstat64.c: Likewise. * io/mknod.c: Likewise. * io/mknodat.c: Likewise. * io/stat.c: Likewise. * io/stat64.c: Likewise. * libio/stdio.c: Likewise. * nscd/Makefile: Likewise. * stdlib/Makefile: Likewise. * stdlib/atexit.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/i386/sysdep.h: Likewise. * sysdeps/i386/i686/memcmp.S: Likewise. * sysdeps/powerpc/powerpc32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise. * Makerules: USE_TLS support is now default. * tls.make.c: Likewise. * csu/Versions: Likewise. * csu/libc-start.c: Likewise. * csu/libc-tls.c: Likewise. * csu/version.c: Likewise. * dlfcn/dlinfo.c: Likewise. * elf/dl-addr.c: Likewise. * elf/dl-cache.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-object.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-sysdep.c: Likewise. * elf/dl-tls.c: Likewise. * elf/ldconfig.c: Likewise. * elf/rtld.c: Likewise. * elf/tst-tls-dlinfo.c: Likewise. * elf/tst-tls1.c: Likewise. * elf/tst-tls10.h: Likewise. * elf/tst-tls14.c: Likewise. * elf/tst-tls2.c: Likewise. * elf/tst-tls3.c: Likewise. * elf/tst-tls4.c: Likewise. * elf/tst-tls5.c: Likewise. * elf/tst-tls6.c: Likewise. * elf/tst-tls7.c: Likewise. * elf/tst-tls8.c: Likewise. * elf/tst-tls9.c: Likewise. * elf/tst-tlsmod1.c: Likewise. * elf/tst-tlsmod13.c: Likewise. * elf/tst-tlsmod13a.c: Likewise. * elf/tst-tlsmod14a.c: Likewise. * elf/tst-tlsmod2.c: Likewise. * elf/tst-tlsmod3.c: Likewise. * elf/tst-tlsmod4.c: Likewise. * elf/tst-tlsmod5.c: Likewise. * elf/tst-tlsmod6.c: Likewise. * include/errno.h: Likewise. * include/link.h: Likewise. * include/tls.h: Likewise. * locale/global-locale.c: Likewise. * locale/localeinfo.h: Likewise. * malloc/arena.c: Likewise. * malloc/hooks.c: Likewise. * malloc/malloc.c: Likewise. * resolv/Versions: Likewise. * sysdeps/alpha/dl-machine.h: Likewise. * sysdeps/alpha/libc-tls.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/tls.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/ia64/dl-machine.h: Likewise. * sysdeps/ia64/libc-tls.c: Likewise. * sysdeps/mach/hurd/fork.c: Likewise. * sysdeps/mach/hurd/i386/tls.h: Likewise. * sysdeps/powerpc/powerpc32/dl-machine.c: Likwise. * sysdeps/powerpc/powerpc32/dl-machine.h: Likewise. * sysdeps/powerpc/powerpc64/dl-machine.h: Likewise. * sysdeps/s390/libc-tls.c: Likewise. * sysdeps/s390/s390-32/dl-machine.h: Likewise. * sysdeps/s390/s390-64/dl-machine.h: Likewise. * sysdeps/sh/dl-machine.h: Likewise. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. * sysdeps/x86_64/dl-machine.h: Likewise. [BZ #3426] * stdlib/stdlib.h: Adjust comment for canonicalize_file_name to reality. 2006-10-27 Jakub Jelinek <jakub@redhat.com> * elf/dl-lookup.c (_dl_debug_bindings): Remove unused symbol_scope argument. (_dl_lookup_symbol_x): Adjust caller. * sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove _ns_global_scope. * elf/rtld.c (dl_main): Don't initialize _ns_global_scope. * elf/dl-libc.c: Revert l_scope name changes. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * elf/dl-close.c (_dl_close): Likewise. * elf/dl-open.c (dl_open_worker): Likewise. If not SINGLE_THREAD_P, always use __rtld_mrlock_{change,done}. Always free old scope list here if not l_scope_mem. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name change. Never free scope list here. Just __rtld_mrlock_lock before the lookup and __rtld_mrlock_unlock it after the lookup. * elf/dl-sym.c: Likewise. * include/link.h (struct r_scoperec): Remove. (struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem with l_scope_mem and l_scoperec_lock with l_scope_lock. 2006-10-25 Ulrich Drepper <drepper@redhat.com> * sysdeps/gnu/netinet/tcp.h: Define TCP_CONGESTION. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * configure.in: Disable building profile libraries by default. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * elf/dl-lookup.c (_dl_lookup_symbol_x): Add warning to _dl_lookup_symbol_x code. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * elf/dl-runtime.c: Include sysdep-cancel.h. (_dl_fixup, _dl_profile_fixup): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-sym.c: Include sysdep-cancel.h. (do_sym): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-close.c: Include sysdep-cancel.h. (_dl_close): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-open.c: Include sysdep-cancel.h. (dl_open_worker): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. 2006-10-17 Jakub Jelinek <jakub@redhat.com> [BZ #3313] * malloc/malloc.c (malloc_consolidate): Set maxfb to address of last fastbin rather than end of fastbin array. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/i486/bits/atomic.h (catomic_decrement): Use correct body macro. * sysdeps/x86_64/bits/atomic.h (__arch_c_compare_and_exchange_val_64_acq): Add missing casts. (catomic_decrement): Use correct body macro. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * include/atomic.h: Add a unique prefix to all local variables in macros. * csu/tst-atomic.c (do_test): Test also catomic_* macros. 2006-10-14 Ulrich Drepper <drepper@redhat.com> * resolv/arpa/nameser.h: Document that ns_t_a6 is deprecated. [BZ #3313] * malloc/malloc.c (malloc_consolidate): Don't use get_fast_max to determine highest fast bin to consolidate, always look into all of them. (do_check_malloc_state): Only require for empty bins for large sizes in main arena. * libio/stdio.h: Add more __wur attributes. 2006-11-12 Andreas Jaeger <aj@suse.de> [BZ #2510] * manual/search.texi (Hash Search Function): Clarify. (Array Search Function): Clarify. 2006-11-12 Joseph Myers <joseph@codesourcery.com> [BZ #2830] * math/atest-exp.c (main): Cast hex value to mp_limb_t before shifting. * math/atest-exp2.c (read_mpn_hex): Likewise. * math/atest-sincos.c (main): Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add epoll_pwait. * sysdeps/unix/sysv/linux/sys/epoll.h: Declare epoll_pwait. * sysdeps/unix/sysv/linux/Versions (libc): Add epoll_pwait for version GLIBC_2.6. * Versions.def: Add GLIBC_2.6 for libc. * sysdeps/i386/i486/bits/atomic.h: Add catomic_* support. 2006-10-11 Jakub Jelinek <jakub@redhat.com> * malloc/malloc.c (_int_malloc): Remove unused any_larger variable. * nis/nis_defaults.c (__nis_default_access): Don't call getenv twice. * nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv. * sysdeps/generic/unsecvars.h: Add NIS_PATH. 2006-10-11 Ulrich Drepper <drepper@redhat.com> * include/atomic.c: Define catomic_* operations. * sysdeps/x86_64/bits/atomic.h: Likewise. Fix a few minor problems. * stdlib/cxa_finalize.c: Use catomic_* operations instead of atomic_*. * malloc/memusage.c: Likewise. * gmon/mcount.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-profile.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-runtime.c: Likewise. * elf/dl-fptr.c: Likewise. * resolv/res_libc.c: Likewise. 2006-10-10 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast. * sysdeps/mach/hurd/futimes.c: Likewise. * sysdeps/mach/hurd/lutimes.c: Likewise. 2006-10-09 Ulrich Drepper <drepper@redhat.com> Jakub Jelinek <jakub@redhat.com> Implement reference counting of scope records. * elf/dl-close.c (_dl_close): Remove all scopes from removed objects from the list in objects which remain. Always allocate new scope record. * elf/dl-open.c (dl_open_worker): When growing array for scopes, don't resize, allocate a new one. * elf/dl-runtime.c: Update reference counters before using a scope array. * elf/dl-sym.c: Likewise. * elf/dl-libc.c: Adjust for l_scope name change. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * include/link.h: Include <rtld-lowlevel.h>. Define struct r_scoperec. Replace r_scope with pointer to r_scoperec structure. Add l_scoperec_lock. * sysdeps/generic/ldsodefs.h: Include <rtld-lowlevel.h>. * sysdeps/generic/rtld-lowlevel.h: New file. * include/atomic.h: Rename atomic_and to atomic_and_val and atomic_or to atomic_or_val. Define new macros atomic_and and atomic_or which do not return values. * sysdeps/x86_64/bits/atomic.h: Define atomic_and and atomic_or. Various cleanups. * sysdeps/i386/i486/bits/atomic.h: Likewise. * po/sv.po: Update from translation team. 2006-10-07 Ulrich Drepper <drepper@redhat.com> * Versions.def: Add GLIBC_2.6 to libpthread. * include/shlib-compat.h (SHLIB_COMPAT): Expand parameters before use. (versioned_symbol): Likewise. (compat_symbol): Likewise. * po/tr.po: Update from translation team. * nis/Banner: Removed. It's been integral part forever and the author info is incomplete anyway. * libio/Banner: Likewise. 2006-10-06 Ulrich Drepper <drepper@redhat.com> * version.h (VERSION): Bump to 2.5.90 for new development tree.
669 lines
15 KiB
C
669 lines
15 KiB
C
static char elsieid[] = "@(#)zdump.c 8.2";
|
|
|
|
/*
|
|
** This code has been made independent of the rest of the time
|
|
** conversion package to increase confidence in the verification it provides.
|
|
** You can use this code to help in verifying other implementations.
|
|
*/
|
|
|
|
#include "stdio.h" /* for stdout, stderr, perror */
|
|
#include "string.h" /* for strcpy */
|
|
#include "sys/types.h" /* for time_t */
|
|
#include "time.h" /* for struct tm */
|
|
#include "stdlib.h" /* for exit, malloc, atoi */
|
|
#include "float.h" /* for FLT_MAX and DBL_MAX */
|
|
#include "ctype.h" /* for isalpha et al. */
|
|
#ifndef isascii
|
|
#define isascii(x) 1
|
|
#endif /* !defined isascii */
|
|
|
|
#ifndef ZDUMP_LO_YEAR
|
|
#define ZDUMP_LO_YEAR (-500)
|
|
#endif /* !defined ZDUMP_LO_YEAR */
|
|
|
|
#ifndef ZDUMP_HI_YEAR
|
|
#define ZDUMP_HI_YEAR 2500
|
|
#endif /* !defined ZDUMP_HI_YEAR */
|
|
|
|
#ifndef MAX_STRING_LENGTH
|
|
#define MAX_STRING_LENGTH 1024
|
|
#endif /* !defined MAX_STRING_LENGTH */
|
|
|
|
#ifndef TRUE
|
|
#define TRUE 1
|
|
#endif /* !defined TRUE */
|
|
|
|
#ifndef FALSE
|
|
#define FALSE 0
|
|
#endif /* !defined FALSE */
|
|
|
|
#ifndef EXIT_SUCCESS
|
|
#define EXIT_SUCCESS 0
|
|
#endif /* !defined EXIT_SUCCESS */
|
|
|
|
#ifndef EXIT_FAILURE
|
|
#define EXIT_FAILURE 1
|
|
#endif /* !defined EXIT_FAILURE */
|
|
|
|
#ifndef SECSPERMIN
|
|
#define SECSPERMIN 60
|
|
#endif /* !defined SECSPERMIN */
|
|
|
|
#ifndef MINSPERHOUR
|
|
#define MINSPERHOUR 60
|
|
#endif /* !defined MINSPERHOUR */
|
|
|
|
#ifndef SECSPERHOUR
|
|
#define SECSPERHOUR (SECSPERMIN * MINSPERHOUR)
|
|
#endif /* !defined SECSPERHOUR */
|
|
|
|
#ifndef HOURSPERDAY
|
|
#define HOURSPERDAY 24
|
|
#endif /* !defined HOURSPERDAY */
|
|
|
|
#ifndef EPOCH_YEAR
|
|
#define EPOCH_YEAR 1970
|
|
#endif /* !defined EPOCH_YEAR */
|
|
|
|
#ifndef TM_YEAR_BASE
|
|
#define TM_YEAR_BASE 1900
|
|
#endif /* !defined TM_YEAR_BASE */
|
|
|
|
#ifndef DAYSPERNYEAR
|
|
#define DAYSPERNYEAR 365
|
|
#endif /* !defined DAYSPERNYEAR */
|
|
|
|
#ifndef isleap
|
|
#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
|
|
#endif /* !defined isleap */
|
|
|
|
#ifndef isleap_sum
|
|
/*
|
|
** See tzfile.h for details on isleap_sum.
|
|
*/
|
|
#define isleap_sum(a, b) isleap((a) % 400 + (b) % 400)
|
|
#endif /* !defined isleap_sum */
|
|
|
|
#define SECSPERDAY ((long) SECSPERHOUR * HOURSPERDAY)
|
|
#define SECSPERNYEAR (SECSPERDAY * DAYSPERNYEAR)
|
|
#define SECSPERLYEAR (SECSPERNYEAR + SECSPERDAY)
|
|
|
|
#if HAVE_GETTEXT
|
|
#include "locale.h" /* for setlocale */
|
|
#include "libintl.h"
|
|
#endif /* HAVE_GETTEXT */
|
|
|
|
#ifndef GNUC_or_lint
|
|
#ifdef lint
|
|
#define GNUC_or_lint
|
|
#else /* !defined lint */
|
|
#ifdef __GNUC__
|
|
#define GNUC_or_lint
|
|
#endif /* defined __GNUC__ */
|
|
#endif /* !defined lint */
|
|
#endif /* !defined GNUC_or_lint */
|
|
|
|
#ifndef INITIALIZE
|
|
#ifdef GNUC_or_lint
|
|
#define INITIALIZE(x) ((x) = 0)
|
|
#else /* !defined GNUC_or_lint */
|
|
#define INITIALIZE(x)
|
|
#endif /* !defined GNUC_or_lint */
|
|
#endif /* !defined INITIALIZE */
|
|
|
|
/*
|
|
** For the benefit of GNU folk...
|
|
** `_(MSGID)' uses the current locale's message library string for MSGID.
|
|
** The default is to use gettext if available, and use MSGID otherwise.
|
|
*/
|
|
|
|
#ifndef _
|
|
#if HAVE_GETTEXT
|
|
#define _(msgid) gettext(msgid)
|
|
#else /* !HAVE_GETTEXT */
|
|
#define _(msgid) msgid
|
|
#endif /* !HAVE_GETTEXT */
|
|
#endif /* !defined _ */
|
|
|
|
#ifndef TZ_DOMAIN
|
|
#define TZ_DOMAIN "tz"
|
|
#endif /* !defined TZ_DOMAIN */
|
|
|
|
#ifndef P
|
|
#define P(x) x
|
|
#endif /* !defined P */
|
|
|
|
extern char ** environ;
|
|
extern int getopt P((int argc, char * const argv[],
|
|
const char * options));
|
|
extern char * optarg;
|
|
extern int optind;
|
|
extern char * tzname[2];
|
|
|
|
static time_t absolute_min_time;
|
|
static time_t absolute_max_time;
|
|
static size_t longest;
|
|
static char * progname;
|
|
static int warned;
|
|
|
|
static char * abbr P((struct tm * tmp));
|
|
static void abbrok P((const char * abbrp, const char * zone));
|
|
static long delta P((struct tm * newp, struct tm * oldp));
|
|
static void dumptime P((const struct tm * tmp));
|
|
static time_t hunt P((char * name, time_t lot, time_t hit));
|
|
static void setabsolutes P((void));
|
|
static void show P((char * zone, time_t t, int v));
|
|
static const char * tformat P((void));
|
|
static time_t yeartot P((long y));
|
|
|
|
#ifndef TYPECHECK
|
|
#define my_localtime localtime
|
|
#else /* !defined TYPECHECK */
|
|
static struct tm *
|
|
my_localtime(tp)
|
|
time_t * tp;
|
|
{
|
|
register struct tm * tmp;
|
|
|
|
tmp = localtime(tp);
|
|
if (tp != NULL && tmp != NULL) {
|
|
struct tm tm;
|
|
register time_t t;
|
|
|
|
tm = *tmp;
|
|
t = mktime(&tm);
|
|
if (t - *tp >= 1 || *tp - t >= 1) {
|
|
(void) fflush(stdout);
|
|
(void) fprintf(stderr, "\n%s: ", progname);
|
|
(void) fprintf(stderr, tformat(), *tp);
|
|
(void) fprintf(stderr, " ->");
|
|
(void) fprintf(stderr, " year=%d", tmp->tm_year);
|
|
(void) fprintf(stderr, " mon=%d", tmp->tm_mon);
|
|
(void) fprintf(stderr, " mday=%d", tmp->tm_mday);
|
|
(void) fprintf(stderr, " hour=%d", tmp->tm_hour);
|
|
(void) fprintf(stderr, " min=%d", tmp->tm_min);
|
|
(void) fprintf(stderr, " sec=%d", tmp->tm_sec);
|
|
(void) fprintf(stderr, " isdst=%d", tmp->tm_isdst);
|
|
(void) fprintf(stderr, " -> ");
|
|
(void) fprintf(stderr, tformat(), t);
|
|
(void) fprintf(stderr, "\n");
|
|
}
|
|
}
|
|
return tmp;
|
|
}
|
|
#endif /* !defined TYPECHECK */
|
|
|
|
static void
|
|
abbrok(abbrp, zone)
|
|
const char * const abbrp;
|
|
const char * const zone;
|
|
{
|
|
register const char * cp;
|
|
register char * wp;
|
|
|
|
if (warned)
|
|
return;
|
|
cp = abbrp;
|
|
wp = NULL;
|
|
while (isascii((unsigned char) *cp) && isalpha((unsigned char) *cp))
|
|
++cp;
|
|
if (cp - abbrp == 0)
|
|
wp = _("lacks alphabetic at start");
|
|
else if (cp - abbrp < 3)
|
|
wp = _("has fewer than 3 alphabetics");
|
|
else if (cp - abbrp > 6)
|
|
wp = _("has more than 6 alphabetics");
|
|
if (wp == NULL && (*cp == '+' || *cp == '-')) {
|
|
++cp;
|
|
if (isascii((unsigned char) *cp) &&
|
|
isdigit((unsigned char) *cp))
|
|
if (*cp++ == '1' && *cp >= '0' && *cp <= '4')
|
|
++cp;
|
|
if (*cp != '\0')
|
|
wp = _("differs from POSIX standard");
|
|
}
|
|
if (wp == NULL)
|
|
return;
|
|
(void) fflush(stdout);
|
|
(void) fprintf(stderr,
|
|
_("%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"),
|
|
progname, zone, abbrp, wp);
|
|
warned = TRUE;
|
|
}
|
|
|
|
int
|
|
main(argc, argv)
|
|
int argc;
|
|
char * argv[];
|
|
{
|
|
register int i;
|
|
register int c;
|
|
register int vflag;
|
|
register char * cutarg;
|
|
register long cutloyear = ZDUMP_LO_YEAR;
|
|
register long cuthiyear = ZDUMP_HI_YEAR;
|
|
register time_t cutlotime;
|
|
register time_t cuthitime;
|
|
register char ** fakeenv;
|
|
time_t now;
|
|
time_t t;
|
|
time_t newt;
|
|
struct tm tm;
|
|
struct tm newtm;
|
|
register struct tm * tmp;
|
|
register struct tm * newtmp;
|
|
|
|
INITIALIZE(cutlotime);
|
|
INITIALIZE(cuthitime);
|
|
#if HAVE_GETTEXT
|
|
(void) setlocale(LC_ALL, "");
|
|
#ifdef TZ_DOMAINDIR
|
|
(void) bindtextdomain(TZ_DOMAIN, TZ_DOMAINDIR);
|
|
#endif /* defined TEXTDOMAINDIR */
|
|
(void) textdomain(TZ_DOMAIN);
|
|
#endif /* HAVE_GETTEXT */
|
|
progname = argv[0];
|
|
for (i = 1; i < argc; ++i)
|
|
if (strcmp(argv[i], "--version") == 0) {
|
|
(void) printf("%s\n", elsieid);
|
|
exit(EXIT_SUCCESS);
|
|
}
|
|
vflag = 0;
|
|
cutarg = NULL;
|
|
while ((c = getopt(argc, argv, "c:v")) == 'c' || c == 'v')
|
|
if (c == 'v')
|
|
vflag = 1;
|
|
else cutarg = optarg;
|
|
if ((c != EOF && c != -1) ||
|
|
(optind == argc - 1 && strcmp(argv[optind], "=") == 0)) {
|
|
(void) fprintf(stderr,
|
|
_("%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"),
|
|
progname, progname);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
if (vflag) {
|
|
if (cutarg != NULL) {
|
|
long lo;
|
|
long hi;
|
|
char dummy;
|
|
|
|
if (sscanf(cutarg, "%ld%c", &hi, &dummy) == 1) {
|
|
cuthiyear = hi;
|
|
} else if (sscanf(cutarg, "%ld,%ld%c",
|
|
&lo, &hi, &dummy) == 2) {
|
|
cutloyear = lo;
|
|
cuthiyear = hi;
|
|
} else {
|
|
(void) fprintf(stderr, _("%s: wild -c argument %s\n"),
|
|
progname, cutarg);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
}
|
|
setabsolutes();
|
|
cutlotime = yeartot(cutloyear);
|
|
cuthitime = yeartot(cuthiyear);
|
|
}
|
|
(void) time(&now);
|
|
longest = 0;
|
|
for (i = optind; i < argc; ++i)
|
|
if (strlen(argv[i]) > longest)
|
|
longest = strlen(argv[i]);
|
|
{
|
|
register int from;
|
|
register int to;
|
|
|
|
for (i = 0; environ[i] != NULL; ++i)
|
|
continue;
|
|
fakeenv = (char **) malloc((size_t) ((i + 2) *
|
|
sizeof *fakeenv));
|
|
if (fakeenv == NULL ||
|
|
(fakeenv[0] = (char *) malloc(longest + 4)) == NULL) {
|
|
(void) perror(progname);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
to = 0;
|
|
(void) strcpy(fakeenv[to++], "TZ=");
|
|
for (from = 0; environ[from] != NULL; ++from)
|
|
if (strncmp(environ[from], "TZ=", 3) != 0)
|
|
fakeenv[to++] = environ[from];
|
|
fakeenv[to] = NULL;
|
|
environ = fakeenv;
|
|
}
|
|
for (i = optind; i < argc; ++i) {
|
|
static char buf[MAX_STRING_LENGTH];
|
|
|
|
(void) strcpy(&fakeenv[0][3], argv[i]);
|
|
if (!vflag) {
|
|
show(argv[i], now, FALSE);
|
|
continue;
|
|
}
|
|
warned = FALSE;
|
|
t = absolute_min_time;
|
|
show(argv[i], t, TRUE);
|
|
t += SECSPERHOUR * HOURSPERDAY;
|
|
show(argv[i], t, TRUE);
|
|
if (t < cutlotime)
|
|
t = cutlotime;
|
|
tmp = my_localtime(&t);
|
|
if (tmp != NULL) {
|
|
tm = *tmp;
|
|
(void) strncpy(buf, abbr(&tm), (sizeof buf) - 1);
|
|
}
|
|
for ( ; ; ) {
|
|
if (t >= cuthitime)
|
|
break;
|
|
newt = t + SECSPERHOUR * 12;
|
|
if (newt >= cuthitime)
|
|
break;
|
|
if (newt <= t)
|
|
break;
|
|
newtmp = localtime(&newt);
|
|
if (newtmp != NULL)
|
|
newtm = *newtmp;
|
|
if ((tmp == NULL || newtmp == NULL) ? (tmp != newtmp) :
|
|
(delta(&newtm, &tm) != (newt - t) ||
|
|
newtm.tm_isdst != tm.tm_isdst ||
|
|
strcmp(abbr(&newtm), buf) != 0)) {
|
|
newt = hunt(argv[i], t, newt);
|
|
newtmp = localtime(&newt);
|
|
if (newtmp != NULL) {
|
|
newtm = *newtmp;
|
|
(void) strncpy(buf,
|
|
abbr(&newtm),
|
|
(sizeof buf) - 1);
|
|
}
|
|
}
|
|
t = newt;
|
|
tm = newtm;
|
|
tmp = newtmp;
|
|
}
|
|
t = absolute_max_time;
|
|
t -= SECSPERHOUR * HOURSPERDAY;
|
|
show(argv[i], t, TRUE);
|
|
t += SECSPERHOUR * HOURSPERDAY;
|
|
show(argv[i], t, TRUE);
|
|
}
|
|
if (fflush(stdout) || ferror(stdout)) {
|
|
(void) fprintf(stderr, "%s: ", progname);
|
|
(void) perror(_("Error writing to standard output"));
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
exit(EXIT_SUCCESS);
|
|
/* If exit fails to exit... */
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
static void
|
|
setabsolutes()
|
|
{
|
|
if (0.5 == (time_t) 0.5) {
|
|
/*
|
|
** time_t is floating.
|
|
*/
|
|
if (sizeof (time_t) == sizeof (float)) {
|
|
absolute_min_time = (time_t) -FLT_MAX;
|
|
absolute_max_time = (time_t) FLT_MAX;
|
|
} else if (sizeof (time_t) == sizeof (double)) {
|
|
absolute_min_time = (time_t) -DBL_MAX;
|
|
absolute_max_time = (time_t) DBL_MAX;
|
|
} else {
|
|
(void) fprintf(stderr,
|
|
_("%s: use of -v on system with floating time_t other than float or double\n"),
|
|
progname);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
} else if (0 > (time_t) -1) {
|
|
/*
|
|
** time_t is signed. Assume overflow wraps around.
|
|
*/
|
|
time_t t = 0;
|
|
time_t t1 = 1;
|
|
|
|
while (t < t1) {
|
|
t = t1;
|
|
t1 = 2 * t1 + 1;
|
|
}
|
|
|
|
absolute_max_time = t;
|
|
t = -t;
|
|
absolute_min_time = t - 1;
|
|
if (t < absolute_min_time)
|
|
absolute_min_time = t;
|
|
} else {
|
|
/*
|
|
** time_t is unsigned.
|
|
*/
|
|
absolute_min_time = 0;
|
|
absolute_max_time = absolute_min_time - 1;
|
|
}
|
|
}
|
|
|
|
static time_t
|
|
yeartot(y)
|
|
const long y;
|
|
{
|
|
register long myy;
|
|
register long seconds;
|
|
register time_t t;
|
|
|
|
myy = EPOCH_YEAR;
|
|
t = 0;
|
|
while (myy != y) {
|
|
if (myy < y) {
|
|
seconds = isleap(myy) ? SECSPERLYEAR : SECSPERNYEAR;
|
|
++myy;
|
|
if (t > absolute_max_time - seconds) {
|
|
t = absolute_max_time;
|
|
break;
|
|
}
|
|
t += seconds;
|
|
} else {
|
|
--myy;
|
|
seconds = isleap(myy) ? SECSPERLYEAR : SECSPERNYEAR;
|
|
if (t < absolute_min_time + seconds) {
|
|
t = absolute_min_time;
|
|
break;
|
|
}
|
|
t -= seconds;
|
|
}
|
|
}
|
|
return t;
|
|
}
|
|
|
|
static time_t
|
|
hunt(char *name, time_t lot, time_t hit)
|
|
{
|
|
time_t t;
|
|
long diff;
|
|
struct tm lotm;
|
|
register struct tm * lotmp;
|
|
struct tm tm;
|
|
register struct tm * tmp;
|
|
char loab[MAX_STRING_LENGTH];
|
|
|
|
lotmp = my_localtime(&lot);
|
|
if (lotmp != NULL) {
|
|
lotm = *lotmp;
|
|
(void) strncpy(loab, abbr(&lotm), (sizeof loab) - 1);
|
|
}
|
|
for ( ; ; ) {
|
|
diff = (long) (hit - lot);
|
|
if (diff < 2)
|
|
break;
|
|
t = lot;
|
|
t += diff / 2;
|
|
if (t <= lot)
|
|
++t;
|
|
else if (t >= hit)
|
|
--t;
|
|
tmp = my_localtime(&t);
|
|
if (tmp != NULL)
|
|
tm = *tmp;
|
|
if ((lotmp == NULL || tmp == NULL) ? (lotmp == tmp) :
|
|
(delta(&tm, &lotm) == (t - lot) &&
|
|
tm.tm_isdst == lotm.tm_isdst &&
|
|
strcmp(abbr(&tm), loab) == 0)) {
|
|
lot = t;
|
|
lotm = tm;
|
|
lotmp = tmp;
|
|
} else hit = t;
|
|
}
|
|
show(name, lot, TRUE);
|
|
show(name, hit, TRUE);
|
|
return hit;
|
|
}
|
|
|
|
/*
|
|
** Thanks to Paul Eggert for logic used in delta.
|
|
*/
|
|
|
|
static long
|
|
delta(newp, oldp)
|
|
struct tm * newp;
|
|
struct tm * oldp;
|
|
{
|
|
register long result;
|
|
register int tmy;
|
|
|
|
if (newp->tm_year < oldp->tm_year)
|
|
return -delta(oldp, newp);
|
|
result = 0;
|
|
for (tmy = oldp->tm_year; tmy < newp->tm_year; ++tmy)
|
|
result += DAYSPERNYEAR + isleap_sum(tmy, TM_YEAR_BASE);
|
|
result += newp->tm_yday - oldp->tm_yday;
|
|
result *= HOURSPERDAY;
|
|
result += newp->tm_hour - oldp->tm_hour;
|
|
result *= MINSPERHOUR;
|
|
result += newp->tm_min - oldp->tm_min;
|
|
result *= SECSPERMIN;
|
|
result += newp->tm_sec - oldp->tm_sec;
|
|
return result;
|
|
}
|
|
|
|
static void
|
|
show(char *zone, time_t t, int v)
|
|
{
|
|
register struct tm * tmp;
|
|
|
|
(void) printf("%-*s ", (int) longest, zone);
|
|
if (v) {
|
|
tmp = gmtime(&t);
|
|
if (tmp == NULL) {
|
|
(void) printf(tformat(), t);
|
|
} else {
|
|
dumptime(tmp);
|
|
(void) printf(" UTC");
|
|
}
|
|
(void) printf(" = ");
|
|
}
|
|
tmp = my_localtime(&t);
|
|
dumptime(tmp);
|
|
if (tmp != NULL) {
|
|
if (*abbr(tmp) != '\0')
|
|
(void) printf(" %s", abbr(tmp));
|
|
if (v) {
|
|
(void) printf(" isdst=%d", tmp->tm_isdst);
|
|
#ifdef TM_GMTOFF
|
|
(void) printf(" gmtoff=%ld", tmp->TM_GMTOFF);
|
|
#endif /* defined TM_GMTOFF */
|
|
}
|
|
}
|
|
(void) printf("\n");
|
|
if (tmp != NULL && *abbr(tmp) != '\0')
|
|
abbrok(abbr(tmp), zone);
|
|
}
|
|
|
|
static char *
|
|
abbr(tmp)
|
|
struct tm * tmp;
|
|
{
|
|
register char * result;
|
|
static char nada;
|
|
|
|
if (tmp->tm_isdst != 0 && tmp->tm_isdst != 1)
|
|
return &nada;
|
|
result = tzname[tmp->tm_isdst];
|
|
return (result == NULL) ? &nada : result;
|
|
}
|
|
|
|
/*
|
|
** The code below can fail on certain theoretical systems;
|
|
** it works on all known real-world systems as of 2004-12-30.
|
|
*/
|
|
|
|
static const char *
|
|
tformat()
|
|
{
|
|
if (0.5 == (time_t) 0.5) { /* floating */
|
|
if (sizeof (time_t) > sizeof (double))
|
|
return "%Lg";
|
|
return "%g";
|
|
}
|
|
if (0 > (time_t) -1) { /* signed */
|
|
if (sizeof (time_t) > sizeof (long))
|
|
return "%lld";
|
|
if (sizeof (time_t) > sizeof (int))
|
|
return "%ld";
|
|
return "%d";
|
|
}
|
|
if (sizeof (time_t) > sizeof (unsigned long))
|
|
return "%llu";
|
|
if (sizeof (time_t) > sizeof (unsigned int))
|
|
return "%lu";
|
|
return "%u";
|
|
}
|
|
|
|
static void
|
|
dumptime(timeptr)
|
|
register const struct tm * timeptr;
|
|
{
|
|
static const char wday_name[][3] = {
|
|
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
|
|
};
|
|
static const char mon_name[][3] = {
|
|
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
|
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
|
|
};
|
|
register const char * wn;
|
|
register const char * mn;
|
|
register int lead;
|
|
register int trail;
|
|
|
|
if (timeptr == NULL) {
|
|
(void) printf("NULL");
|
|
return;
|
|
}
|
|
/*
|
|
** The packaged versions of localtime and gmtime never put out-of-range
|
|
** values in tm_wday or tm_mon, but since this code might be compiled
|
|
** with other (perhaps experimental) versions, paranoia is in order.
|
|
*/
|
|
if (timeptr->tm_wday < 0 || timeptr->tm_wday >=
|
|
(int) (sizeof wday_name / sizeof wday_name[0]))
|
|
wn = "???";
|
|
else wn = wday_name[timeptr->tm_wday];
|
|
if (timeptr->tm_mon < 0 || timeptr->tm_mon >=
|
|
(int) (sizeof mon_name / sizeof mon_name[0]))
|
|
mn = "???";
|
|
else mn = mon_name[timeptr->tm_mon];
|
|
(void) printf("%.3s %.3s%3d %.2d:%.2d:%.2d ",
|
|
wn, mn,
|
|
timeptr->tm_mday, timeptr->tm_hour,
|
|
timeptr->tm_min, timeptr->tm_sec);
|
|
#define DIVISOR 10
|
|
trail = timeptr->tm_year % DIVISOR + TM_YEAR_BASE % DIVISOR;
|
|
lead = timeptr->tm_year / DIVISOR + TM_YEAR_BASE / DIVISOR +
|
|
trail / DIVISOR;
|
|
trail %= DIVISOR;
|
|
if (trail < 0 && lead > 0) {
|
|
trail += DIVISOR;
|
|
--lead;
|
|
} else if (lead < 0 && trail > 0) {
|
|
trail -= DIVISOR;
|
|
++lead;
|
|
}
|
|
if (lead == 0)
|
|
(void) printf("%d", trail);
|
|
else (void) printf("%d%d", lead, ((trail < 0) ? -trail : trail));
|
|
}
|