mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-09 19:00:08 +00:00
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.
1156 lines
27 KiB
C
1156 lines
27 KiB
C
/* Copyright (C) 2002, 2004, 2005 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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <assert.h>
|
|
#include <ctype.h>
|
|
#include <langinfo.h>
|
|
#include <limits.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
#include <stdbool.h>
|
|
|
|
#ifdef _LIBC
|
|
# include "../locale/localeinfo.h"
|
|
#endif
|
|
|
|
|
|
#ifndef __P
|
|
# if defined __GNUC__ || (defined __STDC__ && __STDC__)
|
|
# define __P(args) args
|
|
# else
|
|
# define __P(args) ()
|
|
# endif /* GCC. */
|
|
#endif /* Not __P. */
|
|
|
|
|
|
#if ! HAVE_LOCALTIME_R && ! defined localtime_r
|
|
# ifdef _LIBC
|
|
# define localtime_r __localtime_r
|
|
# else
|
|
/* Approximate localtime_r as best we can in its absence. */
|
|
# define localtime_r my_localtime_r
|
|
static struct tm *localtime_r __P ((const time_t *, struct tm *));
|
|
static struct tm *
|
|
localtime_r (t, tp)
|
|
const time_t *t;
|
|
struct tm *tp;
|
|
{
|
|
struct tm *l = localtime (t);
|
|
if (! l)
|
|
return 0;
|
|
*tp = *l;
|
|
return tp;
|
|
}
|
|
# endif /* ! _LIBC */
|
|
#endif /* ! HAVE_LOCALTIME_R && ! defined (localtime_r) */
|
|
|
|
|
|
#define match_char(ch1, ch2) if (ch1 != ch2) return NULL
|
|
#if defined __GNUC__ && __GNUC__ >= 2
|
|
# define match_string(cs1, s2) \
|
|
({ size_t len = strlen (cs1); \
|
|
int result = __strncasecmp_l ((cs1), (s2), len, locale) == 0; \
|
|
if (result) (s2) += len; \
|
|
result; })
|
|
#else
|
|
/* Oh come on. Get a reasonable compiler. */
|
|
# define match_string(cs1, s2) \
|
|
(strncasecmp ((cs1), (s2), strlen (cs1)) ? 0 : ((s2) += strlen (cs1), 1))
|
|
#endif
|
|
/* We intentionally do not use isdigit() for testing because this will
|
|
lead to problems with the wide character version. */
|
|
#define get_number(from, to, n) \
|
|
do { \
|
|
int __n = n; \
|
|
val = 0; \
|
|
while (*rp == ' ') \
|
|
++rp; \
|
|
if (*rp < '0' || *rp > '9') \
|
|
return NULL; \
|
|
do { \
|
|
val *= 10; \
|
|
val += *rp++ - '0'; \
|
|
} while (--__n > 0 && val * 10 <= to && *rp >= '0' && *rp <= '9'); \
|
|
if (val < from || val > to) \
|
|
return NULL; \
|
|
} while (0)
|
|
#ifdef _NL_CURRENT
|
|
# define get_alt_number(from, to, n) \
|
|
({ \
|
|
__label__ do_normal; \
|
|
\
|
|
if (*decided != raw) \
|
|
{ \
|
|
val = _nl_parse_alt_digit (&rp HELPER_LOCALE_ARG); \
|
|
if (val == -1 && *decided != loc) \
|
|
{ \
|
|
*decided = loc; \
|
|
goto do_normal; \
|
|
} \
|
|
if (val < from || val > to) \
|
|
return NULL; \
|
|
} \
|
|
else \
|
|
{ \
|
|
do_normal: \
|
|
get_number (from, to, n); \
|
|
} \
|
|
0; \
|
|
})
|
|
#else
|
|
# define get_alt_number(from, to, n) \
|
|
/* We don't have the alternate representation. */ \
|
|
get_number(from, to, n)
|
|
#endif
|
|
#define recursive(new_fmt) \
|
|
(*(new_fmt) != '\0' \
|
|
&& (rp = __strptime_internal (rp, (new_fmt), tm, \
|
|
decided, era_cnt LOCALE_ARG)) != NULL)
|
|
|
|
|
|
#ifdef _LIBC
|
|
/* This is defined in locale/C-time.c in the GNU libc. */
|
|
extern const struct locale_data _nl_C_LC_TIME attribute_hidden;
|
|
|
|
# define weekday_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (DAY_1)].string)
|
|
# define ab_weekday_name \
|
|
(&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABDAY_1)].string)
|
|
# define month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (MON_1)].string)
|
|
# define ab_month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABMON_1)].string)
|
|
# define HERE_D_T_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_T_FMT)].string)
|
|
# define HERE_D_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_FMT)].string)
|
|
# define HERE_AM_STR (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (AM_STR)].string)
|
|
# define HERE_PM_STR (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (PM_STR)].string)
|
|
# define HERE_T_FMT_AMPM \
|
|
(_nl_C_LC_TIME.values[_NL_ITEM_INDEX (T_FMT_AMPM)].string)
|
|
# define HERE_T_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (T_FMT)].string)
|
|
|
|
# define strncasecmp(s1, s2, n) __strncasecmp (s1, s2, n)
|
|
#else
|
|
static char const weekday_name[][10] =
|
|
{
|
|
"Sunday", "Monday", "Tuesday", "Wednesday",
|
|
"Thursday", "Friday", "Saturday"
|
|
};
|
|
static char const ab_weekday_name[][4] =
|
|
{
|
|
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
|
|
};
|
|
static char const month_name[][10] =
|
|
{
|
|
"January", "February", "March", "April", "May", "June",
|
|
"July", "August", "September", "October", "November", "December"
|
|
};
|
|
static char const ab_month_name[][4] =
|
|
{
|
|
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
|
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
|
|
};
|
|
# define HERE_D_T_FMT "%a %b %e %H:%M:%S %Y"
|
|
# define HERE_D_FMT "%m/%d/%y"
|
|
# define HERE_AM_STR "AM"
|
|
# define HERE_PM_STR "PM"
|
|
# define HERE_T_FMT_AMPM "%I:%M:%S %p"
|
|
# define HERE_T_FMT "%H:%M:%S"
|
|
|
|
static const unsigned short int __mon_yday[2][13] =
|
|
{
|
|
/* Normal years. */
|
|
{ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
|
|
/* Leap years. */
|
|
{ 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
|
|
};
|
|
#endif
|
|
|
|
#if defined _LIBC
|
|
/* We use this code also for the extended locale handling where the
|
|
function gets as an additional argument the locale which has to be
|
|
used. To access the values we have to redefine the _NL_CURRENT
|
|
macro. */
|
|
# define strptime __strptime_l
|
|
# undef _NL_CURRENT
|
|
# define _NL_CURRENT(category, item) \
|
|
(current->values[_NL_ITEM_INDEX (item)].string)
|
|
# undef _NL_CURRENT_WORD
|
|
# define _NL_CURRENT_WORD(category, item) \
|
|
(current->values[_NL_ITEM_INDEX (item)].word)
|
|
# define LOCALE_PARAM , locale
|
|
# define LOCALE_ARG , locale
|
|
# define LOCALE_PARAM_PROTO , __locale_t locale
|
|
# define LOCALE_PARAM_DECL __locale_t locale;
|
|
# define HELPER_LOCALE_ARG , current
|
|
# define ISSPACE(Ch) __isspace_l (Ch, locale)
|
|
#else
|
|
# define LOCALE_PARAM
|
|
# define LOCALE_ARG
|
|
# define LOCALE_PARAM_DECL
|
|
# define LOCALE_PARAM_PROTO
|
|
# define HELPER_LOCALE_ARG
|
|
# define ISSPACE(Ch) isspace (Ch)
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifndef __isleap
|
|
/* Nonzero if YEAR is a leap year (every 4 years,
|
|
except every 100th isn't, and every 400th is). */
|
|
# define __isleap(year) \
|
|
((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
|
|
#endif
|
|
|
|
/* Compute the day of the week. */
|
|
static void
|
|
day_of_the_week (struct tm *tm)
|
|
{
|
|
/* We know that January 1st 1970 was a Thursday (= 4). Compute the
|
|
the difference between this data in the one on TM and so determine
|
|
the weekday. */
|
|
int corr_year = 1900 + tm->tm_year - (tm->tm_mon < 2);
|
|
int wday = (-473
|
|
+ (365 * (tm->tm_year - 70))
|
|
+ (corr_year / 4)
|
|
- ((corr_year / 4) / 25) + ((corr_year / 4) % 25 < 0)
|
|
+ (((corr_year / 4) / 25) / 4)
|
|
+ __mon_yday[0][tm->tm_mon]
|
|
+ tm->tm_mday - 1);
|
|
tm->tm_wday = ((wday % 7) + 7) % 7;
|
|
}
|
|
|
|
/* Compute the day of the year. */
|
|
static void
|
|
day_of_the_year (struct tm *tm)
|
|
{
|
|
tm->tm_yday = (__mon_yday[__isleap (1900 + tm->tm_year)][tm->tm_mon]
|
|
+ (tm->tm_mday - 1));
|
|
}
|
|
|
|
|
|
#ifdef _LIBC
|
|
char *
|
|
internal_function
|
|
#else
|
|
static char *
|
|
#endif
|
|
__strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM)
|
|
const char *rp;
|
|
const char *fmt;
|
|
struct tm *tm;
|
|
enum ptime_locale_status *decided;
|
|
int era_cnt;
|
|
LOCALE_PARAM_DECL
|
|
{
|
|
#ifdef _LIBC
|
|
struct locale_data *const current = locale->__locales[LC_TIME];
|
|
#endif
|
|
|
|
const char *rp_backup;
|
|
int cnt;
|
|
size_t val;
|
|
int have_I, is_pm;
|
|
int century, want_century;
|
|
int want_era;
|
|
int have_wday, want_xday;
|
|
int have_yday;
|
|
int have_mon, have_mday;
|
|
int have_uweek, have_wweek;
|
|
int week_no;
|
|
size_t num_eras;
|
|
struct era_entry *era;
|
|
|
|
have_I = is_pm = 0;
|
|
century = -1;
|
|
want_century = 0;
|
|
want_era = 0;
|
|
era = NULL;
|
|
week_no = 0;
|
|
|
|
have_wday = want_xday = have_yday = have_mon = have_mday = have_uweek = 0;
|
|
have_wweek = 0;
|
|
|
|
while (*fmt != '\0')
|
|
{
|
|
/* A white space in the format string matches 0 more or white
|
|
space in the input string. */
|
|
if (ISSPACE (*fmt))
|
|
{
|
|
while (ISSPACE (*rp))
|
|
++rp;
|
|
++fmt;
|
|
continue;
|
|
}
|
|
|
|
/* Any character but `%' must be matched by the same character
|
|
in the iput string. */
|
|
if (*fmt != '%')
|
|
{
|
|
match_char (*fmt++, *rp++);
|
|
continue;
|
|
}
|
|
|
|
++fmt;
|
|
#ifndef _NL_CURRENT
|
|
/* We need this for handling the `E' modifier. */
|
|
start_over:
|
|
#endif
|
|
|
|
/* Make back up of current processing pointer. */
|
|
rp_backup = rp;
|
|
|
|
switch (*fmt++)
|
|
{
|
|
case '%':
|
|
/* Match the `%' character itself. */
|
|
match_char ('%', *rp++);
|
|
break;
|
|
case 'a':
|
|
case 'A':
|
|
/* Match day of week. */
|
|
for (cnt = 0; cnt < 7; ++cnt)
|
|
{
|
|
#ifdef _NL_CURRENT
|
|
if (*decided !=raw)
|
|
{
|
|
if (match_string (_NL_CURRENT (LC_TIME, DAY_1 + cnt), rp))
|
|
{
|
|
if (*decided == not
|
|
&& strcmp (_NL_CURRENT (LC_TIME, DAY_1 + cnt),
|
|
weekday_name[cnt]))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
if (match_string (_NL_CURRENT (LC_TIME, ABDAY_1 + cnt), rp))
|
|
{
|
|
if (*decided == not
|
|
&& strcmp (_NL_CURRENT (LC_TIME, ABDAY_1 + cnt),
|
|
ab_weekday_name[cnt]))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
}
|
|
#endif
|
|
if (*decided != loc
|
|
&& (match_string (weekday_name[cnt], rp)
|
|
|| match_string (ab_weekday_name[cnt], rp)))
|
|
{
|
|
*decided = raw;
|
|
break;
|
|
}
|
|
}
|
|
if (cnt == 7)
|
|
/* Does not match a weekday name. */
|
|
return NULL;
|
|
tm->tm_wday = cnt;
|
|
have_wday = 1;
|
|
break;
|
|
case 'b':
|
|
case 'B':
|
|
case 'h':
|
|
/* Match month name. */
|
|
for (cnt = 0; cnt < 12; ++cnt)
|
|
{
|
|
#ifdef _NL_CURRENT
|
|
if (*decided !=raw)
|
|
{
|
|
if (match_string (_NL_CURRENT (LC_TIME, MON_1 + cnt), rp))
|
|
{
|
|
if (*decided == not
|
|
&& strcmp (_NL_CURRENT (LC_TIME, MON_1 + cnt),
|
|
month_name[cnt]))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
if (match_string (_NL_CURRENT (LC_TIME, ABMON_1 + cnt), rp))
|
|
{
|
|
if (*decided == not
|
|
&& strcmp (_NL_CURRENT (LC_TIME, ABMON_1 + cnt),
|
|
ab_month_name[cnt]))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
}
|
|
#endif
|
|
if (match_string (month_name[cnt], rp)
|
|
|| match_string (ab_month_name[cnt], rp))
|
|
{
|
|
*decided = raw;
|
|
break;
|
|
}
|
|
}
|
|
if (cnt == 12)
|
|
/* Does not match a month name. */
|
|
return NULL;
|
|
tm->tm_mon = cnt;
|
|
want_xday = 1;
|
|
break;
|
|
case 'c':
|
|
/* Match locale's date and time format. */
|
|
#ifdef _NL_CURRENT
|
|
if (*decided != raw)
|
|
{
|
|
if (!recursive (_NL_CURRENT (LC_TIME, D_T_FMT)))
|
|
{
|
|
if (*decided == loc)
|
|
return NULL;
|
|
else
|
|
rp = rp_backup;
|
|
}
|
|
else
|
|
{
|
|
if (*decided == not &&
|
|
strcmp (_NL_CURRENT (LC_TIME, D_T_FMT), HERE_D_T_FMT))
|
|
*decided = loc;
|
|
want_xday = 1;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
#endif
|
|
if (!recursive (HERE_D_T_FMT))
|
|
return NULL;
|
|
want_xday = 1;
|
|
break;
|
|
case 'C':
|
|
/* Match century number. */
|
|
match_century:
|
|
get_number (0, 99, 2);
|
|
century = val;
|
|
want_xday = 1;
|
|
break;
|
|
case 'd':
|
|
case 'e':
|
|
/* Match day of month. */
|
|
get_number (1, 31, 2);
|
|
tm->tm_mday = val;
|
|
have_mday = 1;
|
|
want_xday = 1;
|
|
break;
|
|
case 'F':
|
|
if (!recursive ("%Y-%m-%d"))
|
|
return NULL;
|
|
want_xday = 1;
|
|
break;
|
|
case 'x':
|
|
#ifdef _NL_CURRENT
|
|
if (*decided != raw)
|
|
{
|
|
if (!recursive (_NL_CURRENT (LC_TIME, D_FMT)))
|
|
{
|
|
if (*decided == loc)
|
|
return NULL;
|
|
else
|
|
rp = rp_backup;
|
|
}
|
|
else
|
|
{
|
|
if (*decided == not
|
|
&& strcmp (_NL_CURRENT (LC_TIME, D_FMT), HERE_D_FMT))
|
|
*decided = loc;
|
|
want_xday = 1;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
#endif
|
|
/* Fall through. */
|
|
case 'D':
|
|
/* Match standard day format. */
|
|
if (!recursive (HERE_D_FMT))
|
|
return NULL;
|
|
want_xday = 1;
|
|
break;
|
|
case 'k':
|
|
case 'H':
|
|
/* Match hour in 24-hour clock. */
|
|
get_number (0, 23, 2);
|
|
tm->tm_hour = val;
|
|
have_I = 0;
|
|
break;
|
|
case 'l':
|
|
/* Match hour in 12-hour clock. GNU extension. */
|
|
case 'I':
|
|
/* Match hour in 12-hour clock. */
|
|
get_number (1, 12, 2);
|
|
tm->tm_hour = val % 12;
|
|
have_I = 1;
|
|
break;
|
|
case 'j':
|
|
/* Match day number of year. */
|
|
get_number (1, 366, 3);
|
|
tm->tm_yday = val - 1;
|
|
have_yday = 1;
|
|
break;
|
|
case 'm':
|
|
/* Match number of month. */
|
|
get_number (1, 12, 2);
|
|
tm->tm_mon = val - 1;
|
|
have_mon = 1;
|
|
want_xday = 1;
|
|
break;
|
|
case 'M':
|
|
/* Match minute. */
|
|
get_number (0, 59, 2);
|
|
tm->tm_min = val;
|
|
break;
|
|
case 'n':
|
|
case 't':
|
|
/* Match any white space. */
|
|
while (ISSPACE (*rp))
|
|
++rp;
|
|
break;
|
|
case 'p':
|
|
/* Match locale's equivalent of AM/PM. */
|
|
#ifdef _NL_CURRENT
|
|
if (*decided != raw)
|
|
{
|
|
if (match_string (_NL_CURRENT (LC_TIME, AM_STR), rp))
|
|
{
|
|
if (strcmp (_NL_CURRENT (LC_TIME, AM_STR), HERE_AM_STR))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
if (match_string (_NL_CURRENT (LC_TIME, PM_STR), rp))
|
|
{
|
|
if (strcmp (_NL_CURRENT (LC_TIME, PM_STR), HERE_PM_STR))
|
|
*decided = loc;
|
|
is_pm = 1;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
#endif
|
|
if (!match_string (HERE_AM_STR, rp))
|
|
{
|
|
if (match_string (HERE_PM_STR, rp))
|
|
is_pm = 1;
|
|
else
|
|
return NULL;
|
|
}
|
|
break;
|
|
case 'r':
|
|
#ifdef _NL_CURRENT
|
|
if (*decided != raw)
|
|
{
|
|
if (!recursive (_NL_CURRENT (LC_TIME, T_FMT_AMPM)))
|
|
{
|
|
if (*decided == loc)
|
|
return NULL;
|
|
else
|
|
rp = rp_backup;
|
|
}
|
|
else
|
|
{
|
|
if (*decided == not &&
|
|
strcmp (_NL_CURRENT (LC_TIME, T_FMT_AMPM),
|
|
HERE_T_FMT_AMPM))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
#endif
|
|
if (!recursive (HERE_T_FMT_AMPM))
|
|
return NULL;
|
|
break;
|
|
case 'R':
|
|
if (!recursive ("%H:%M"))
|
|
return NULL;
|
|
break;
|
|
case 's':
|
|
{
|
|
/* The number of seconds may be very high so we cannot use
|
|
the `get_number' macro. Instead read the number
|
|
character for character and construct the result while
|
|
doing this. */
|
|
time_t secs = 0;
|
|
if (*rp < '0' || *rp > '9')
|
|
/* We need at least one digit. */
|
|
return NULL;
|
|
|
|
do
|
|
{
|
|
secs *= 10;
|
|
secs += *rp++ - '0';
|
|
}
|
|
while (*rp >= '0' && *rp <= '9');
|
|
|
|
if (localtime_r (&secs, tm) == NULL)
|
|
/* Error in function. */
|
|
return NULL;
|
|
}
|
|
break;
|
|
case 'S':
|
|
get_number (0, 61, 2);
|
|
tm->tm_sec = val;
|
|
break;
|
|
case 'X':
|
|
#ifdef _NL_CURRENT
|
|
if (*decided != raw)
|
|
{
|
|
if (!recursive (_NL_CURRENT (LC_TIME, T_FMT)))
|
|
{
|
|
if (*decided == loc)
|
|
return NULL;
|
|
else
|
|
rp = rp_backup;
|
|
}
|
|
else
|
|
{
|
|
if (strcmp (_NL_CURRENT (LC_TIME, T_FMT), HERE_T_FMT))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
#endif
|
|
/* Fall through. */
|
|
case 'T':
|
|
if (!recursive (HERE_T_FMT))
|
|
return NULL;
|
|
break;
|
|
case 'u':
|
|
get_number (1, 7, 1);
|
|
tm->tm_wday = val % 7;
|
|
have_wday = 1;
|
|
break;
|
|
case 'g':
|
|
get_number (0, 99, 2);
|
|
/* XXX This cannot determine any field in TM. */
|
|
break;
|
|
case 'G':
|
|
if (*rp < '0' || *rp > '9')
|
|
return NULL;
|
|
/* XXX Ignore the number since we would need some more
|
|
information to compute a real date. */
|
|
do
|
|
++rp;
|
|
while (*rp >= '0' && *rp <= '9');
|
|
break;
|
|
case 'U':
|
|
get_number (0, 53, 2);
|
|
week_no = val;
|
|
have_uweek = 1;
|
|
break;
|
|
case 'W':
|
|
get_number (0, 53, 2);
|
|
week_no = val;
|
|
have_wweek = 1;
|
|
break;
|
|
case 'V':
|
|
get_number (0, 53, 2);
|
|
/* XXX This cannot determine any field in TM without some
|
|
information. */
|
|
break;
|
|
case 'w':
|
|
/* Match number of weekday. */
|
|
get_number (0, 6, 1);
|
|
tm->tm_wday = val;
|
|
have_wday = 1;
|
|
break;
|
|
case 'y':
|
|
match_year_in_century:
|
|
/* Match year within century. */
|
|
get_number (0, 99, 2);
|
|
/* The "Year 2000: The Millennium Rollover" paper suggests that
|
|
values in the range 69-99 refer to the twentieth century. */
|
|
tm->tm_year = val >= 69 ? val : val + 100;
|
|
/* Indicate that we want to use the century, if specified. */
|
|
want_century = 1;
|
|
want_xday = 1;
|
|
break;
|
|
case 'Y':
|
|
/* Match year including century number. */
|
|
get_number (0, 9999, 4);
|
|
tm->tm_year = val - 1900;
|
|
want_century = 0;
|
|
want_xday = 1;
|
|
break;
|
|
case 'Z':
|
|
/* XXX How to handle this? */
|
|
break;
|
|
case 'z':
|
|
/* We recognize two formats: if two digits are given, these
|
|
specify hours. If fours digits are used, minutes are
|
|
also specified. */
|
|
{
|
|
val = 0;
|
|
while (*rp == ' ')
|
|
++rp;
|
|
if (*rp != '+' && *rp != '-')
|
|
return NULL;
|
|
bool neg = *rp++ == '-';
|
|
int n = 0;
|
|
while (n < 4 && *rp >= '0' && *rp <= '9')
|
|
{
|
|
val = val * 10 + *rp++ - '0';
|
|
++n;
|
|
}
|
|
if (n == 2)
|
|
val *= 100;
|
|
else if (n != 4)
|
|
/* Only two or four digits recognized. */
|
|
return NULL;
|
|
else
|
|
{
|
|
/* We have to convert the minutes into decimal. */
|
|
if (val % 100 >= 60)
|
|
return NULL;
|
|
val = (val / 100) * 100 + ((val % 100) * 50) / 30;
|
|
}
|
|
if (val > 1200)
|
|
return NULL;
|
|
tm->tm_gmtoff = (val * 3600) / 100;
|
|
if (neg)
|
|
tm->tm_gmtoff = -tm->tm_gmtoff;
|
|
}
|
|
break;
|
|
case 'E':
|
|
#ifdef _NL_CURRENT
|
|
switch (*fmt++)
|
|
{
|
|
case 'c':
|
|
/* Match locale's alternate date and time format. */
|
|
if (*decided != raw)
|
|
{
|
|
const char *fmt = _NL_CURRENT (LC_TIME, ERA_D_T_FMT);
|
|
|
|
if (*fmt == '\0')
|
|
fmt = _NL_CURRENT (LC_TIME, D_T_FMT);
|
|
|
|
if (!recursive (fmt))
|
|
{
|
|
if (*decided == loc)
|
|
return NULL;
|
|
else
|
|
rp = rp_backup;
|
|
}
|
|
else
|
|
{
|
|
if (strcmp (fmt, HERE_D_T_FMT))
|
|
*decided = loc;
|
|
want_xday = 1;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
/* The C locale has no era information, so use the
|
|
normal representation. */
|
|
if (!recursive (HERE_D_T_FMT))
|
|
return NULL;
|
|
want_xday = 1;
|
|
break;
|
|
case 'C':
|
|
if (*decided != raw)
|
|
{
|
|
if (era_cnt >= 0)
|
|
{
|
|
era = _nl_select_era_entry (era_cnt HELPER_LOCALE_ARG);
|
|
if (era != NULL && match_string (era->era_name, rp))
|
|
{
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
else
|
|
return NULL;
|
|
}
|
|
|
|
num_eras = _NL_CURRENT_WORD (LC_TIME,
|
|
_NL_TIME_ERA_NUM_ENTRIES);
|
|
for (era_cnt = 0; era_cnt < (int) num_eras;
|
|
++era_cnt, rp = rp_backup)
|
|
{
|
|
era = _nl_select_era_entry (era_cnt
|
|
HELPER_LOCALE_ARG);
|
|
if (era != NULL && match_string (era->era_name, rp))
|
|
{
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
}
|
|
if (era_cnt != (int) num_eras)
|
|
break;
|
|
|
|
era_cnt = -1;
|
|
if (*decided == loc)
|
|
return NULL;
|
|
|
|
*decided = raw;
|
|
}
|
|
/* The C locale has no era information, so use the
|
|
normal representation. */
|
|
goto match_century;
|
|
case 'y':
|
|
if (*decided != raw)
|
|
{
|
|
get_number(0, 9999, 4);
|
|
tm->tm_year = val;
|
|
want_era = 1;
|
|
want_xday = 1;
|
|
want_century = 1;
|
|
|
|
if (era_cnt >= 0)
|
|
{
|
|
assert (*decided == loc);
|
|
|
|
era = _nl_select_era_entry (era_cnt HELPER_LOCALE_ARG);
|
|
bool match = false;
|
|
if (era != NULL)
|
|
{
|
|
int delta = ((tm->tm_year - era->offset)
|
|
* era->absolute_direction);
|
|
match = (delta >= 0
|
|
&& delta < (((int64_t) era->stop_date[0]
|
|
- (int64_t) era->start_date[0])
|
|
* era->absolute_direction));
|
|
}
|
|
if (! match)
|
|
return NULL;
|
|
|
|
break;
|
|
}
|
|
|
|
num_eras = _NL_CURRENT_WORD (LC_TIME,
|
|
_NL_TIME_ERA_NUM_ENTRIES);
|
|
for (era_cnt = 0; era_cnt < (int) num_eras; ++era_cnt)
|
|
{
|
|
era = _nl_select_era_entry (era_cnt
|
|
HELPER_LOCALE_ARG);
|
|
if (era != NULL)
|
|
{
|
|
int delta = ((tm->tm_year - era->offset)
|
|
* era->absolute_direction);
|
|
if (delta >= 0
|
|
&& delta < (((int64_t) era->stop_date[0]
|
|
- (int64_t) era->start_date[0])
|
|
* era->absolute_direction))
|
|
{
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if (era_cnt != (int) num_eras)
|
|
break;
|
|
|
|
era_cnt = -1;
|
|
if (*decided == loc)
|
|
return NULL;
|
|
|
|
*decided = raw;
|
|
}
|
|
|
|
goto match_year_in_century;
|
|
case 'Y':
|
|
if (*decided != raw)
|
|
{
|
|
num_eras = _NL_CURRENT_WORD (LC_TIME,
|
|
_NL_TIME_ERA_NUM_ENTRIES);
|
|
for (era_cnt = 0; era_cnt < (int) num_eras;
|
|
++era_cnt, rp = rp_backup)
|
|
{
|
|
era = _nl_select_era_entry (era_cnt HELPER_LOCALE_ARG);
|
|
if (era != NULL && recursive (era->era_format))
|
|
break;
|
|
}
|
|
if (era_cnt == (int) num_eras)
|
|
{
|
|
era_cnt = -1;
|
|
if (*decided == loc)
|
|
return NULL;
|
|
else
|
|
rp = rp_backup;
|
|
}
|
|
else
|
|
{
|
|
*decided = loc;
|
|
era_cnt = -1;
|
|
break;
|
|
}
|
|
|
|
*decided = raw;
|
|
}
|
|
get_number (0, 9999, 4);
|
|
tm->tm_year = val - 1900;
|
|
want_century = 0;
|
|
want_xday = 1;
|
|
break;
|
|
case 'x':
|
|
if (*decided != raw)
|
|
{
|
|
const char *fmt = _NL_CURRENT (LC_TIME, ERA_D_FMT);
|
|
|
|
if (*fmt == '\0')
|
|
fmt = _NL_CURRENT (LC_TIME, D_FMT);
|
|
|
|
if (!recursive (fmt))
|
|
{
|
|
if (*decided == loc)
|
|
return NULL;
|
|
else
|
|
rp = rp_backup;
|
|
}
|
|
else
|
|
{
|
|
if (strcmp (fmt, HERE_D_FMT))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
if (!recursive (HERE_D_FMT))
|
|
return NULL;
|
|
break;
|
|
case 'X':
|
|
if (*decided != raw)
|
|
{
|
|
const char *fmt = _NL_CURRENT (LC_TIME, ERA_T_FMT);
|
|
|
|
if (*fmt == '\0')
|
|
fmt = _NL_CURRENT (LC_TIME, T_FMT);
|
|
|
|
if (!recursive (fmt))
|
|
{
|
|
if (*decided == loc)
|
|
return NULL;
|
|
else
|
|
rp = rp_backup;
|
|
}
|
|
else
|
|
{
|
|
if (strcmp (fmt, HERE_T_FMT))
|
|
*decided = loc;
|
|
break;
|
|
}
|
|
*decided = raw;
|
|
}
|
|
if (!recursive (HERE_T_FMT))
|
|
return NULL;
|
|
break;
|
|
default:
|
|
return NULL;
|
|
}
|
|
break;
|
|
#else
|
|
/* We have no information about the era format. Just use
|
|
the normal format. */
|
|
if (*fmt != 'c' && *fmt != 'C' && *fmt != 'y' && *fmt != 'Y'
|
|
&& *fmt != 'x' && *fmt != 'X')
|
|
/* This is an illegal format. */
|
|
return NULL;
|
|
|
|
goto start_over;
|
|
#endif
|
|
case 'O':
|
|
switch (*fmt++)
|
|
{
|
|
case 'd':
|
|
case 'e':
|
|
/* Match day of month using alternate numeric symbols. */
|
|
get_alt_number (1, 31, 2);
|
|
tm->tm_mday = val;
|
|
have_mday = 1;
|
|
want_xday = 1;
|
|
break;
|
|
case 'H':
|
|
/* Match hour in 24-hour clock using alternate numeric
|
|
symbols. */
|
|
get_alt_number (0, 23, 2);
|
|
tm->tm_hour = val;
|
|
have_I = 0;
|
|
break;
|
|
case 'I':
|
|
/* Match hour in 12-hour clock using alternate numeric
|
|
symbols. */
|
|
get_alt_number (1, 12, 2);
|
|
tm->tm_hour = val % 12;
|
|
have_I = 1;
|
|
break;
|
|
case 'm':
|
|
/* Match month using alternate numeric symbols. */
|
|
get_alt_number (1, 12, 2);
|
|
tm->tm_mon = val - 1;
|
|
have_mon = 1;
|
|
want_xday = 1;
|
|
break;
|
|
case 'M':
|
|
/* Match minutes using alternate numeric symbols. */
|
|
get_alt_number (0, 59, 2);
|
|
tm->tm_min = val;
|
|
break;
|
|
case 'S':
|
|
/* Match seconds using alternate numeric symbols. */
|
|
get_alt_number (0, 61, 2);
|
|
tm->tm_sec = val;
|
|
break;
|
|
case 'U':
|
|
get_alt_number (0, 53, 2);
|
|
week_no = val;
|
|
have_uweek = 1;
|
|
break;
|
|
case 'W':
|
|
get_alt_number (0, 53, 2);
|
|
week_no = val;
|
|
have_wweek = 1;
|
|
break;
|
|
case 'V':
|
|
get_alt_number (0, 53, 2);
|
|
/* XXX This cannot determine any field in TM without
|
|
further information. */
|
|
break;
|
|
case 'w':
|
|
/* Match number of weekday using alternate numeric symbols. */
|
|
get_alt_number (0, 6, 1);
|
|
tm->tm_wday = val;
|
|
have_wday = 1;
|
|
break;
|
|
case 'y':
|
|
/* Match year within century using alternate numeric symbols. */
|
|
get_alt_number (0, 99, 2);
|
|
tm->tm_year = val >= 69 ? val : val + 100;
|
|
want_xday = 1;
|
|
break;
|
|
default:
|
|
return NULL;
|
|
}
|
|
break;
|
|
default:
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
if (have_I && is_pm)
|
|
tm->tm_hour += 12;
|
|
|
|
if (century != -1)
|
|
{
|
|
if (want_century)
|
|
tm->tm_year = tm->tm_year % 100 + (century - 19) * 100;
|
|
else
|
|
/* Only the century, but not the year. Strange, but so be it. */
|
|
tm->tm_year = (century - 19) * 100;
|
|
}
|
|
|
|
if (era_cnt != -1)
|
|
{
|
|
era = _nl_select_era_entry (era_cnt HELPER_LOCALE_ARG);
|
|
if (era == NULL)
|
|
return NULL;
|
|
if (want_era)
|
|
tm->tm_year = (era->start_date[0]
|
|
+ ((tm->tm_year - era->offset)
|
|
* era->absolute_direction));
|
|
else
|
|
/* Era start year assumed. */
|
|
tm->tm_year = era->start_date[0];
|
|
}
|
|
else
|
|
if (want_era)
|
|
{
|
|
/* No era found but we have seen an E modifier. Rectify some
|
|
values. */
|
|
if (want_century && century == -1 && tm->tm_year < 69)
|
|
tm->tm_year += 100;
|
|
}
|
|
|
|
if (want_xday && !have_wday)
|
|
{
|
|
if ( !(have_mon && have_mday) && have_yday)
|
|
{
|
|
/* We don't have tm_mon and/or tm_mday, compute them. */
|
|
int t_mon = 0;
|
|
while (__mon_yday[__isleap(1900 + tm->tm_year)][t_mon] <= tm->tm_yday)
|
|
t_mon++;
|
|
if (!have_mon)
|
|
tm->tm_mon = t_mon - 1;
|
|
if (!have_mday)
|
|
tm->tm_mday =
|
|
(tm->tm_yday
|
|
- __mon_yday[__isleap(1900 + tm->tm_year)][t_mon - 1] + 1);
|
|
}
|
|
day_of_the_week (tm);
|
|
}
|
|
|
|
if (want_xday && !have_yday)
|
|
day_of_the_year (tm);
|
|
|
|
if ((have_uweek || have_wweek) && have_wday)
|
|
{
|
|
int save_wday = tm->tm_wday;
|
|
int save_mday = tm->tm_mday;
|
|
int save_mon = tm->tm_mon;
|
|
int w_offset = have_uweek ? 0 : 1;
|
|
|
|
tm->tm_mday = 1;
|
|
tm->tm_mon = 0;
|
|
day_of_the_week (tm);
|
|
if (have_mday)
|
|
tm->tm_mday = save_mday;
|
|
if (have_mon)
|
|
tm->tm_mon = save_mon;
|
|
|
|
if (!have_yday)
|
|
tm->tm_yday = ((7 - (tm->tm_wday - w_offset)) % 7
|
|
+ (week_no - 1) *7
|
|
+ save_wday - w_offset);
|
|
|
|
if (!have_mday || !have_mon)
|
|
{
|
|
int t_mon = 0;
|
|
while (__mon_yday[__isleap(1900 + tm->tm_year)][t_mon]
|
|
<= tm->tm_yday)
|
|
t_mon++;
|
|
if (!have_mon)
|
|
tm->tm_mon = t_mon - 1;
|
|
if (!have_mday)
|
|
tm->tm_mday =
|
|
(tm->tm_yday
|
|
- __mon_yday[__isleap(1900 + tm->tm_year)][t_mon - 1] + 1);
|
|
}
|
|
|
|
tm->tm_wday = save_wday;
|
|
}
|
|
|
|
return (char *) rp;
|
|
}
|
|
|
|
|
|
char *
|
|
strptime (buf, format, tm LOCALE_PARAM)
|
|
const char *buf;
|
|
const char *format;
|
|
struct tm *tm;
|
|
LOCALE_PARAM_DECL
|
|
{
|
|
enum ptime_locale_status decided;
|
|
|
|
#ifdef _NL_CURRENT
|
|
decided = not;
|
|
#else
|
|
decided = raw;
|
|
#endif
|
|
return __strptime_internal (buf, format, tm, &decided, -1 LOCALE_ARG);
|
|
}
|
|
|
|
#ifdef _LIBC
|
|
weak_alias (__strptime_l, strptime_l)
|
|
#endif
|