mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-11 03:40:06 +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.
1238 lines
38 KiB
C
1238 lines
38 KiB
C
/* Copyright (C) 1995-2005, 2006 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License version 2 as
|
|
published by the Free Software Foundation.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; 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 <byteswap.h>
|
|
#include <langinfo.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <wchar.h>
|
|
#include <sys/uio.h>
|
|
|
|
#include <assert.h>
|
|
|
|
#include "localedef.h"
|
|
#include "linereader.h"
|
|
#include "localeinfo.h"
|
|
#include "locfile.h"
|
|
|
|
|
|
/* Entry describing an entry of the era specification. */
|
|
struct era_data
|
|
{
|
|
int32_t direction;
|
|
int32_t offset;
|
|
int32_t start_date[3];
|
|
int32_t stop_date[3];
|
|
const char *name;
|
|
const char *format;
|
|
uint32_t *wname;
|
|
uint32_t *wformat;
|
|
};
|
|
|
|
|
|
/* The real definition of the struct for the LC_TIME locale. */
|
|
struct locale_time_t
|
|
{
|
|
const char *abday[7];
|
|
const uint32_t *wabday[7];
|
|
int abday_defined;
|
|
const char *day[7];
|
|
const uint32_t *wday[7];
|
|
int day_defined;
|
|
const char *abmon[12];
|
|
const uint32_t *wabmon[12];
|
|
int abmon_defined;
|
|
const char *mon[12];
|
|
const uint32_t *wmon[12];
|
|
int mon_defined;
|
|
const char *am_pm[2];
|
|
const uint32_t *wam_pm[2];
|
|
int am_pm_defined;
|
|
const char *d_t_fmt;
|
|
const uint32_t *wd_t_fmt;
|
|
const char *d_fmt;
|
|
const uint32_t *wd_fmt;
|
|
const char *t_fmt;
|
|
const uint32_t *wt_fmt;
|
|
const char *t_fmt_ampm;
|
|
const uint32_t *wt_fmt_ampm;
|
|
const char **era;
|
|
const uint32_t **wera;
|
|
uint32_t num_era;
|
|
const char *era_year;
|
|
const uint32_t *wera_year;
|
|
const char *era_d_t_fmt;
|
|
const uint32_t *wera_d_t_fmt;
|
|
const char *era_t_fmt;
|
|
const uint32_t *wera_t_fmt;
|
|
const char *era_d_fmt;
|
|
const uint32_t *wera_d_fmt;
|
|
const char *alt_digits[100];
|
|
const uint32_t *walt_digits[100];
|
|
const char *date_fmt;
|
|
const uint32_t *wdate_fmt;
|
|
int alt_digits_defined;
|
|
unsigned char week_ndays;
|
|
uint32_t week_1stday;
|
|
unsigned char week_1stweek;
|
|
unsigned char first_weekday;
|
|
unsigned char first_workday;
|
|
unsigned char cal_direction;
|
|
const char *timezone;
|
|
const uint32_t *wtimezone;
|
|
|
|
struct era_data *era_entries;
|
|
};
|
|
|
|
|
|
/* This constant is used to represent an empty wide character string. */
|
|
static const uint32_t empty_wstr[1] = { 0 };
|
|
|
|
|
|
static void
|
|
time_startup (struct linereader *lr, struct localedef_t *locale,
|
|
int ignore_content)
|
|
{
|
|
if (!ignore_content)
|
|
locale->categories[LC_TIME].time =
|
|
(struct locale_time_t *) xcalloc (1, sizeof (struct locale_time_t));
|
|
|
|
if (lr != NULL)
|
|
{
|
|
lr->translate_strings = 1;
|
|
lr->return_widestr = 1;
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
time_finish (struct localedef_t *locale, const struct charmap_t *charmap)
|
|
{
|
|
struct locale_time_t *time = locale->categories[LC_TIME].time;
|
|
int nothing = 0;
|
|
|
|
/* Now resolve copying and also handle completely missing definitions. */
|
|
if (time == NULL)
|
|
{
|
|
/* First see whether we were supposed to copy. If yes, find the
|
|
actual definition. */
|
|
if (locale->copy_name[LC_TIME] != NULL)
|
|
{
|
|
/* Find the copying locale. This has to happen transitively since
|
|
the locale we are copying from might also copying another one. */
|
|
struct localedef_t *from = locale;
|
|
|
|
do
|
|
from = find_locale (LC_TIME, from->copy_name[LC_TIME],
|
|
from->repertoire_name, charmap);
|
|
while (from->categories[LC_TIME].time == NULL
|
|
&& from->copy_name[LC_TIME] != NULL);
|
|
|
|
time = locale->categories[LC_TIME].time
|
|
= from->categories[LC_TIME].time;
|
|
}
|
|
|
|
/* If there is still no definition issue an warning and create an
|
|
empty one. */
|
|
if (time == NULL)
|
|
{
|
|
if (! be_quiet)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
No definition for %s category found"), "LC_TIME"));
|
|
time_startup (NULL, locale, 0);
|
|
time = locale->categories[LC_TIME].time;
|
|
nothing = 1;
|
|
}
|
|
}
|
|
|
|
#define noparen(arg1, argn...) arg1, ##argn
|
|
#define TESTARR_ELEM(cat, val) \
|
|
if (!time->cat##_defined) \
|
|
{ \
|
|
const char *initval[] = { noparen val }; \
|
|
unsigned int i; \
|
|
\
|
|
if (! be_quiet && ! nothing) \
|
|
WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"), \
|
|
"LC_TIME", #cat)); \
|
|
\
|
|
for (i = 0; i < sizeof (initval) / sizeof (initval[0]); ++i) \
|
|
time->cat[i] = initval[i]; \
|
|
}
|
|
|
|
TESTARR_ELEM (abday, ( "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ));
|
|
TESTARR_ELEM (day, ( "Sunday", "Monday", "Tuesday", "Wednesday",
|
|
"Thursday", "Friday", "Saturday" ));
|
|
TESTARR_ELEM (abmon, ( "Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
|
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ));
|
|
TESTARR_ELEM (mon, ( "January", "February", "March", "April",
|
|
"May", "June", "July", "August",
|
|
"September", "October", "November", "December" ));
|
|
TESTARR_ELEM (am_pm, ( "AM", "PM" ));
|
|
|
|
#define TEST_ELEM(cat, initval) \
|
|
if (time->cat == NULL) \
|
|
{ \
|
|
if (! be_quiet && ! nothing) \
|
|
WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"), \
|
|
"LC_TIME", #cat)); \
|
|
\
|
|
time->cat = initval; \
|
|
}
|
|
|
|
TEST_ELEM (d_t_fmt, "%a %b %e %H:%M:%S %Y");
|
|
TEST_ELEM (d_fmt, "%m/%d/%y");
|
|
TEST_ELEM (t_fmt, "%H:%M:%S");
|
|
|
|
/* According to C.Y.Alexis Cheng <alexis@vnet.ibm.com> the T_FMT_AMPM
|
|
field is optional. */
|
|
if (time->t_fmt_ampm == NULL)
|
|
{
|
|
if (time->am_pm[0][0] == '\0' && time->am_pm[1][0] == '\0')
|
|
{
|
|
/* No AM/PM strings defined, use the 24h format as default. */
|
|
time->t_fmt_ampm = time->t_fmt;
|
|
time->wt_fmt_ampm = time->wt_fmt;
|
|
}
|
|
else
|
|
{
|
|
time->t_fmt_ampm = "%I:%M:%S %p";
|
|
time->wt_fmt_ampm = (const uint32_t *) L"%I:%M:%S %p";
|
|
}
|
|
}
|
|
|
|
/* Now process the era entries. */
|
|
if (time->num_era != 0)
|
|
{
|
|
const int days_per_month[12] = { 31, 29, 31, 30, 31, 30,
|
|
31, 31, 30, 31 ,30, 31 };
|
|
size_t idx;
|
|
wchar_t *wstr;
|
|
|
|
time->era_entries =
|
|
(struct era_data *) xmalloc (time->num_era
|
|
* sizeof (struct era_data));
|
|
|
|
for (idx = 0; idx < time->num_era; ++idx)
|
|
{
|
|
size_t era_len = strlen (time->era[idx]);
|
|
char *str = xmalloc ((era_len + 1 + 3) & ~3);
|
|
char *endp;
|
|
|
|
memcpy (str, time->era[idx], era_len + 1);
|
|
|
|
/* First character must be + or - for the direction. */
|
|
if (*str != '+' && *str != '-')
|
|
{
|
|
if (!be_quiet)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: direction flag in string %Zd in `era' field is not '+' nor '-'"),
|
|
"LC_TIME", idx + 1));
|
|
/* Default arbitrarily to '+'. */
|
|
time->era_entries[idx].direction = '+';
|
|
}
|
|
else
|
|
time->era_entries[idx].direction = *str;
|
|
if (*++str != ':')
|
|
{
|
|
if (!be_quiet)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: direction flag in string %Zd in `era' field is not a single character"),
|
|
"LC_TIME", idx + 1));
|
|
(void) strsep (&str, ":");
|
|
}
|
|
else
|
|
++str;
|
|
|
|
/* Now the offset year. */
|
|
time->era_entries[idx].offset = strtol (str, &endp, 10);
|
|
if (endp == str)
|
|
{
|
|
if (!be_quiet)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: invalid number for offset in string %Zd in `era' field"),
|
|
"LC_TIME", idx + 1));
|
|
(void) strsep (&str, ":");
|
|
}
|
|
else if (*endp != ':')
|
|
{
|
|
if (!be_quiet)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: garbage at end of offset value in string %Zd in `era' field"),
|
|
"LC_TIME", idx + 1));
|
|
(void) strsep (&str, ":");
|
|
}
|
|
else
|
|
str = endp + 1;
|
|
|
|
/* Next is the starting date in ISO format. */
|
|
if (strncmp (str, "-*", 2) == 0)
|
|
{
|
|
time->era_entries[idx].start_date[0] =
|
|
time->era_entries[idx].start_date[1] =
|
|
time->era_entries[idx].start_date[2] = 0x80000000;
|
|
if (str[2] != ':')
|
|
goto garbage_start_date;
|
|
str += 3;
|
|
}
|
|
else if (strncmp (str, "+*", 2) == 0)
|
|
{
|
|
time->era_entries[idx].start_date[0] =
|
|
time->era_entries[idx].start_date[1] =
|
|
time->era_entries[idx].start_date[2] = 0x7fffffff;
|
|
if (str[2] != ':')
|
|
goto garbage_start_date;
|
|
str += 3;
|
|
}
|
|
else
|
|
{
|
|
time->era_entries[idx].start_date[0] = strtol (str, &endp, 10);
|
|
if (endp == str || *endp != '/')
|
|
goto invalid_start_date;
|
|
else
|
|
str = endp + 1;
|
|
time->era_entries[idx].start_date[0] -= 1900;
|
|
/* year -1 represent 1 B.C. (not -1 A.D.) */
|
|
if (time->era_entries[idx].start_date[0] < -1900)
|
|
++time->era_entries[idx].start_date[0];
|
|
|
|
time->era_entries[idx].start_date[1] = strtol (str, &endp, 10);
|
|
if (endp == str || *endp != '/')
|
|
goto invalid_start_date;
|
|
else
|
|
str = endp + 1;
|
|
time->era_entries[idx].start_date[1] -= 1;
|
|
|
|
time->era_entries[idx].start_date[2] = strtol (str, &endp, 10);
|
|
if (endp == str)
|
|
{
|
|
invalid_start_date:
|
|
if (!be_quiet)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: invalid starting date in string %Zd in `era' field"),
|
|
"LC_TIME", idx + 1));
|
|
(void) strsep (&str, ":");
|
|
}
|
|
else if (*endp != ':')
|
|
{
|
|
garbage_start_date:
|
|
if (!be_quiet)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: garbage at end of starting date in string %Zd in `era' field "),
|
|
"LC_TIME", idx + 1));
|
|
(void) strsep (&str, ":");
|
|
}
|
|
else
|
|
{
|
|
str = endp + 1;
|
|
|
|
/* Check for valid value. */
|
|
if ((time->era_entries[idx].start_date[1] < 0
|
|
|| time->era_entries[idx].start_date[1] >= 12
|
|
|| time->era_entries[idx].start_date[2] < 0
|
|
|| (time->era_entries[idx].start_date[2]
|
|
> days_per_month[time->era_entries[idx].start_date[1]])
|
|
|| (time->era_entries[idx].start_date[1] == 2
|
|
&& time->era_entries[idx].start_date[2] == 29
|
|
&& !__isleap (time->era_entries[idx].start_date[0])))
|
|
&& !be_quiet)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: starting date is invalid in string %Zd in `era' field"),
|
|
"LC_TIME", idx + 1));
|
|
}
|
|
}
|
|
|
|
/* Next is the stopping date in ISO format. */
|
|
if (strncmp (str, "-*", 2) == 0)
|
|
{
|
|
time->era_entries[idx].stop_date[0] =
|
|
time->era_entries[idx].stop_date[1] =
|
|
time->era_entries[idx].stop_date[2] = 0x80000000;
|
|
if (str[2] != ':')
|
|
goto garbage_stop_date;
|
|
str += 3;
|
|
}
|
|
else if (strncmp (str, "+*", 2) == 0)
|
|
{
|
|
time->era_entries[idx].stop_date[0] =
|
|
time->era_entries[idx].stop_date[1] =
|
|
time->era_entries[idx].stop_date[2] = 0x7fffffff;
|
|
if (str[2] != ':')
|
|
goto garbage_stop_date;
|
|
str += 3;
|
|
}
|
|
else
|
|
{
|
|
time->era_entries[idx].stop_date[0] = strtol (str, &endp, 10);
|
|
if (endp == str || *endp != '/')
|
|
goto invalid_stop_date;
|
|
else
|
|
str = endp + 1;
|
|
time->era_entries[idx].stop_date[0] -= 1900;
|
|
/* year -1 represent 1 B.C. (not -1 A.D.) */
|
|
if (time->era_entries[idx].stop_date[0] < -1900)
|
|
++time->era_entries[idx].stop_date[0];
|
|
|
|
time->era_entries[idx].stop_date[1] = strtol (str, &endp, 10);
|
|
if (endp == str || *endp != '/')
|
|
goto invalid_stop_date;
|
|
else
|
|
str = endp + 1;
|
|
time->era_entries[idx].stop_date[1] -= 1;
|
|
|
|
time->era_entries[idx].stop_date[2] = strtol (str, &endp, 10);
|
|
if (endp == str)
|
|
{
|
|
invalid_stop_date:
|
|
if (!be_quiet)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: invalid stopping date in string %Zd in `era' field"),
|
|
"LC_TIME", idx + 1));
|
|
(void) strsep (&str, ":");
|
|
}
|
|
else if (*endp != ':')
|
|
{
|
|
garbage_stop_date:
|
|
if (!be_quiet)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: garbage at end of stopping date in string %Zd in `era' field"),
|
|
"LC_TIME", idx + 1));
|
|
(void) strsep (&str, ":");
|
|
}
|
|
else
|
|
{
|
|
str = endp + 1;
|
|
|
|
/* Check for valid value. */
|
|
if ((time->era_entries[idx].stop_date[1] < 0
|
|
|| time->era_entries[idx].stop_date[1] >= 12
|
|
|| time->era_entries[idx].stop_date[2] < 0
|
|
|| (time->era_entries[idx].stop_date[2]
|
|
> days_per_month[time->era_entries[idx].stop_date[1]])
|
|
|| (time->era_entries[idx].stop_date[1] == 2
|
|
&& time->era_entries[idx].stop_date[2] == 29
|
|
&& !__isleap (time->era_entries[idx].stop_date[0])))
|
|
&& !be_quiet)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: stopping date is invalid in string %Zd in `era' field"),
|
|
"LC_TIME", idx + 1));
|
|
}
|
|
}
|
|
|
|
if (str == NULL || *str == '\0')
|
|
{
|
|
if (!be_quiet)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: missing era name in string %Zd in `era' field"), "LC_TIME", idx + 1));
|
|
time->era_entries[idx].name =
|
|
time->era_entries[idx].format = "";
|
|
}
|
|
else
|
|
{
|
|
time->era_entries[idx].name = strsep (&str, ":");
|
|
|
|
if (str == NULL || *str == '\0')
|
|
{
|
|
if (!be_quiet)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: missing era format in string %Zd in `era' field"),
|
|
"LC_TIME", idx + 1));
|
|
time->era_entries[idx].name =
|
|
time->era_entries[idx].format = "";
|
|
}
|
|
else
|
|
time->era_entries[idx].format = str;
|
|
}
|
|
|
|
/* Now generate the wide character name and format. */
|
|
wstr = wcschr ((wchar_t *) time->wera[idx], L':');/* end direction */
|
|
wstr = wstr ? wcschr (wstr + 1, L':') : NULL; /* end offset */
|
|
wstr = wstr ? wcschr (wstr + 1, L':') : NULL; /* end start */
|
|
wstr = wstr ? wcschr (wstr + 1, L':') : NULL; /* end end */
|
|
if (wstr != NULL)
|
|
{
|
|
time->era_entries[idx].wname = (uint32_t *) wstr + 1;
|
|
wstr = wcschr (wstr + 1, L':'); /* end name */
|
|
if (wstr != NULL)
|
|
{
|
|
*wstr = L'\0';
|
|
time->era_entries[idx].wformat = (uint32_t *) wstr + 1;
|
|
}
|
|
else
|
|
time->era_entries[idx].wname =
|
|
time->era_entries[idx].wformat = (uint32_t *) L"";
|
|
}
|
|
else
|
|
time->era_entries[idx].wname =
|
|
time->era_entries[idx].wformat = (uint32_t *) L"";
|
|
}
|
|
}
|
|
|
|
if (time->week_ndays == 0)
|
|
time->week_ndays = 7;
|
|
|
|
if (time->week_1stday == 0)
|
|
time->week_1stday = 19971130;
|
|
|
|
if (time->week_1stweek > time->week_ndays)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: third operand for value of field `%s' must not be larger than %d"),
|
|
"LC_TIME", "week", 7));
|
|
|
|
if (time->first_weekday == '\0')
|
|
/* The definition does not specify this so the default is used. */
|
|
time->first_weekday = 1;
|
|
else if (time->first_weekday > time->week_ndays)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: values for field `%s' must not be larger than %d"),
|
|
"LC_TIME", "first_weekday", 7));
|
|
|
|
if (time->first_workday == '\0')
|
|
/* The definition does not specify this so the default is used. */
|
|
time->first_workday = 1;
|
|
else if (time->first_workday > time->week_ndays)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: values for field `%s' must not be larger than %d"),
|
|
"LC_TIME", "first_workday", 7));
|
|
|
|
if (time->cal_direction == '\0')
|
|
/* The definition does not specify this so the default is used. */
|
|
time->cal_direction = 1;
|
|
else if (time->cal_direction > 3)
|
|
WITH_CUR_LOCALE (error (0, 0, _("\
|
|
%s: values for field `%s' must not be larger than %d"),
|
|
"LC_TIME", "cal_direction", 3));
|
|
|
|
/* XXX We don't perform any tests on the timezone value since this is
|
|
simply useless, stupid $&$!@... */
|
|
if (time->timezone == NULL)
|
|
time->timezone = "";
|
|
|
|
if (time->date_fmt == NULL)
|
|
time->date_fmt = "%a %b %e %H:%M:%S %Z %Y";
|
|
if (time->wdate_fmt == NULL)
|
|
time->wdate_fmt = (const uint32_t *) L"%a %b %e %H:%M:%S %Z %Y";
|
|
}
|
|
|
|
|
|
void
|
|
time_output (struct localedef_t *locale, const struct charmap_t *charmap,
|
|
const char *output_path)
|
|
{
|
|
struct locale_time_t *time = locale->categories[LC_TIME].time;
|
|
struct iovec *iov = alloca (sizeof *iov
|
|
* (2 + _NL_ITEM_INDEX (_NL_NUM_LC_TIME)
|
|
+ time->num_era - 1
|
|
+ 2 * 99
|
|
+ 2 + time->num_era * 10));
|
|
struct locale_file data;
|
|
uint32_t idx[_NL_ITEM_INDEX (_NL_NUM_LC_TIME)];
|
|
size_t cnt, last_idx, num, n;
|
|
|
|
data.magic = LIMAGIC (LC_TIME);
|
|
data.n = _NL_ITEM_INDEX (_NL_NUM_LC_TIME);
|
|
iov[0].iov_base = (void *) &data;
|
|
iov[0].iov_len = sizeof (data);
|
|
|
|
iov[1].iov_base = (void *) idx;
|
|
iov[1].iov_len = sizeof (idx);
|
|
|
|
idx[0] = iov[0].iov_len + iov[1].iov_len;
|
|
|
|
/* The ab'days. */
|
|
for (cnt = 0; cnt <= _NL_ITEM_INDEX (ABDAY_7); ++cnt)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->abday[cnt - _NL_ITEM_INDEX (ABDAY_1)] ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
/* The days. */
|
|
for (; cnt <= _NL_ITEM_INDEX (DAY_7); ++cnt)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->day[cnt - _NL_ITEM_INDEX (DAY_1)] ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
/* The ab'mons. */
|
|
for (; cnt <= _NL_ITEM_INDEX (ABMON_12); ++cnt)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->abmon[cnt - _NL_ITEM_INDEX (ABMON_1)] ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
/* The mons. */
|
|
for (; cnt <= _NL_ITEM_INDEX (MON_12); ++cnt)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->mon[cnt - _NL_ITEM_INDEX (MON_1)] ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
/* AM/PM. */
|
|
for (; cnt <= _NL_ITEM_INDEX (PM_STR); ++cnt)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->am_pm[cnt - _NL_ITEM_INDEX (AM_STR)] ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->d_t_fmt ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->d_fmt ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->t_fmt ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->t_fmt_ampm ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len;
|
|
last_idx = ++cnt;
|
|
|
|
idx[1 + last_idx] = idx[last_idx];
|
|
for (num = 0; num < time->num_era; ++num, ++cnt)
|
|
{
|
|
iov[2 + cnt].iov_base = (void *) time->era[num];
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + last_idx] += iov[2 + cnt].iov_len;
|
|
}
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->era_year ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->era_d_fmt ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
idx[1 + last_idx] = idx[last_idx];
|
|
for (num = 0; num < 100; ++num, ++cnt)
|
|
{
|
|
iov[2 + cnt].iov_base = (void *) (time->alt_digits[num] ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + last_idx] += iov[2 + cnt].iov_len;
|
|
}
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->era_d_t_fmt ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->era_t_fmt ?: "");
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
|
|
/* We must align the following data. */
|
|
iov[2 + cnt].iov_base = (void *) "\0\0";
|
|
iov[2 + cnt].iov_len = ((idx[last_idx] + 3) & ~3) - idx[last_idx];
|
|
idx[last_idx] = (idx[last_idx] + 3) & ~3;
|
|
++cnt;
|
|
|
|
/* The `era' data in usable form. */
|
|
iov[2 + cnt].iov_base = (void *) &time->num_era;
|
|
iov[2 + cnt].iov_len = sizeof (uint32_t);
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
idx[1 + last_idx] = idx[last_idx];
|
|
for (num = 0; num < time->num_era; ++num)
|
|
{
|
|
size_t l, l2;
|
|
|
|
iov[2 + cnt].iov_base = (void *) &time->era_entries[num].direction;
|
|
iov[2 + cnt].iov_len = sizeof (int32_t);
|
|
++cnt;
|
|
iov[2 + cnt].iov_base = (void *) &time->era_entries[num].offset;
|
|
iov[2 + cnt].iov_len = sizeof (int32_t);
|
|
++cnt;
|
|
iov[2 + cnt].iov_base = (void *) &time->era_entries[num].start_date[0];
|
|
iov[2 + cnt].iov_len = sizeof (int32_t);
|
|
++cnt;
|
|
iov[2 + cnt].iov_base = (void *) &time->era_entries[num].start_date[1];
|
|
iov[2 + cnt].iov_len = sizeof (int32_t);
|
|
++cnt;
|
|
iov[2 + cnt].iov_base = (void *) &time->era_entries[num].start_date[2];
|
|
iov[2 + cnt].iov_len = sizeof (int32_t);
|
|
++cnt;
|
|
iov[2 + cnt].iov_base = (void *) &time->era_entries[num].stop_date[0];
|
|
iov[2 + cnt].iov_len = sizeof (int32_t);
|
|
++cnt;
|
|
iov[2 + cnt].iov_base = (void *) &time->era_entries[num].stop_date[1];
|
|
iov[2 + cnt].iov_len = sizeof (int32_t);
|
|
++cnt;
|
|
iov[2 + cnt].iov_base = (void *) &time->era_entries[num].stop_date[2];
|
|
iov[2 + cnt].iov_len = sizeof (int32_t);
|
|
++cnt;
|
|
|
|
l = ((char *) rawmemchr (time->era_entries[num].format, '\0')
|
|
- time->era_entries[num].name) + 1;
|
|
l2 = (l + 3) & ~3;
|
|
iov[2 + cnt].iov_base = alloca (l2);
|
|
memset (mempcpy (iov[2 + cnt].iov_base, time->era_entries[num].name, l),
|
|
'\0', l2 - l);
|
|
iov[2 + cnt].iov_len = l2;
|
|
++cnt;
|
|
|
|
idx[1 + last_idx] += 8 * sizeof (int32_t) + l2;
|
|
|
|
assert (idx[1 + last_idx] % 4 == 0);
|
|
|
|
iov[2 + cnt].iov_base = (void *) time->era_entries[num].wname;
|
|
iov[2 + cnt].iov_len = ((wcschr ((wchar_t *) time->era_entries[num].wformat, L'\0')
|
|
- (wchar_t *) time->era_entries[num].wname + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] += iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
}
|
|
++last_idx;
|
|
|
|
/* The wide character ab'days. */
|
|
for (n = 0; n < 7; ++n, ++cnt, ++last_idx)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->wabday[n] ?: empty_wstr);
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
/* The wide character days. */
|
|
for (n = 0; n < 7; ++n, ++cnt, ++last_idx)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->wday[n] ?: empty_wstr);
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
/* The wide character ab'mons. */
|
|
for (n = 0; n < 12; ++n, ++cnt, ++last_idx)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->wabmon[n] ?: empty_wstr);
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
/* The wide character mons. */
|
|
for (n = 0; n < 12; ++n, ++cnt, ++last_idx)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->wmon[n] ?: empty_wstr);
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
/* Wide character AM/PM. */
|
|
for (n = 0; n < 2; ++n, ++cnt, ++last_idx)
|
|
{
|
|
iov[2 + cnt].iov_base =
|
|
(void *) (time->wam_pm[n] ?: empty_wstr);
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
}
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->wd_t_fmt ?: empty_wstr);
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->wd_fmt ?: empty_wstr);
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->wt_fmt ?: empty_wstr);
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->wt_fmt_ampm ?: empty_wstr);
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->wera_year ?: empty_wstr);
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->wera_d_fmt ?: empty_wstr);
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
idx[1 + last_idx] = idx[last_idx];
|
|
for (num = 0; num < 100; ++num, ++cnt)
|
|
{
|
|
iov[2 + cnt].iov_base = (void *) (time->walt_digits[num]
|
|
?: empty_wstr);
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] += iov[2 + cnt].iov_len;
|
|
}
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->wera_d_t_fmt ?: empty_wstr);
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) (time->wera_t_fmt ?: empty_wstr);
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) &time->week_ndays;
|
|
iov[2 + cnt].iov_len = 1;
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
/* We must align the following data. */
|
|
iov[2 + cnt].iov_base = (void *) "\0\0";
|
|
iov[2 + cnt].iov_len = ((idx[last_idx] + 3) & ~3) - idx[last_idx];
|
|
idx[last_idx] = (idx[last_idx] + 3) & ~3;
|
|
++cnt;
|
|
|
|
iov[2 + cnt].iov_base = (void *) &time->week_1stday;
|
|
iov[2 + cnt].iov_len = sizeof(uint32_t);
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) &time->week_1stweek;
|
|
iov[2 + cnt].iov_len = 1;
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) &time->first_weekday;
|
|
iov[2 + cnt].iov_len = 1;
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) &time->first_workday;
|
|
iov[2 + cnt].iov_len = 1;
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) &time->cal_direction;
|
|
iov[2 + cnt].iov_len = 1;
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) time->timezone;
|
|
iov[2 + cnt].iov_len = strlen (time->timezone) + 1;
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) time->date_fmt;
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
/* We must align the following data. */
|
|
iov[2 + cnt].iov_base = (void *) "\0\0";
|
|
iov[2 + cnt].iov_len = -idx[last_idx] & 3;
|
|
idx[last_idx] += -idx[last_idx] & 3;
|
|
++cnt;
|
|
|
|
iov[2 + cnt].iov_base = (void *) time->wdate_fmt;
|
|
iov[2 + cnt].iov_len = ((wcslen (iov[2 + cnt].iov_base) + 1)
|
|
* sizeof (uint32_t));
|
|
idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
iov[2 + cnt].iov_base = (void *) charmap->code_set_name;
|
|
iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1;
|
|
++cnt;
|
|
++last_idx;
|
|
|
|
assert (cnt == (_NL_ITEM_INDEX (_NL_NUM_LC_TIME)
|
|
+ time->num_era - 1
|
|
+ 2 * 99
|
|
+ 2 + time->num_era * 10));
|
|
assert (last_idx == _NL_ITEM_INDEX (_NL_NUM_LC_TIME));
|
|
|
|
write_locale_data (output_path, LC_TIME, "LC_TIME", 2 + cnt, iov);
|
|
}
|
|
|
|
|
|
/* The parser for the LC_TIME section of the locale definition. */
|
|
void
|
|
time_read (struct linereader *ldfile, struct localedef_t *result,
|
|
const struct charmap_t *charmap, const char *repertoire_name,
|
|
int ignore_content)
|
|
{
|
|
struct repertoire_t *repertoire = NULL;
|
|
struct locale_time_t *time;
|
|
struct token *now;
|
|
enum token_t nowtok;
|
|
size_t cnt;
|
|
|
|
/* Get the repertoire we have to use. */
|
|
if (repertoire_name != NULL)
|
|
repertoire = repertoire_read (repertoire_name);
|
|
|
|
/* The rest of the line containing `LC_TIME' must be free. */
|
|
lr_ignore_rest (ldfile, 1);
|
|
|
|
|
|
do
|
|
{
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose);
|
|
nowtok = now->tok;
|
|
}
|
|
while (nowtok == tok_eol);
|
|
|
|
/* If we see `copy' now we are almost done. */
|
|
if (nowtok == tok_copy)
|
|
{
|
|
handle_copy (ldfile, charmap, repertoire_name, result, tok_lc_time,
|
|
LC_TIME, "LC_TIME", ignore_content);
|
|
return;
|
|
}
|
|
|
|
/* Prepare the data structures. */
|
|
time_startup (ldfile, result, ignore_content);
|
|
time = result->categories[LC_TIME].time;
|
|
|
|
while (1)
|
|
{
|
|
/* Of course we don't proceed beyond the end of file. */
|
|
if (nowtok == tok_eof)
|
|
break;
|
|
|
|
/* Ingore empty lines. */
|
|
if (nowtok == tok_eol)
|
|
{
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose);
|
|
nowtok = now->tok;
|
|
continue;
|
|
}
|
|
|
|
switch (nowtok)
|
|
{
|
|
#define STRARR_ELEM(cat, min, max) \
|
|
case tok_##cat: \
|
|
/* Ignore the rest of the line if we don't need the input of \
|
|
this line. */ \
|
|
if (ignore_content) \
|
|
{ \
|
|
lr_ignore_rest (ldfile, 0); \
|
|
break; \
|
|
} \
|
|
\
|
|
for (cnt = 0; cnt < max; ++cnt) \
|
|
{ \
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose); \
|
|
if (now->tok == tok_eol) \
|
|
{ \
|
|
if (cnt < min) \
|
|
lr_error (ldfile, _("%s: too few values for field `%s'"), \
|
|
"LC_TIME", #cat); \
|
|
if (!ignore_content) \
|
|
do \
|
|
{ \
|
|
time->cat[cnt] = ""; \
|
|
time->w##cat[cnt] = empty_wstr; \
|
|
} \
|
|
while (++cnt < max); \
|
|
break; \
|
|
} \
|
|
else if (now->tok != tok_string) \
|
|
goto err_label; \
|
|
else if (!ignore_content && (now->val.str.startmb == NULL \
|
|
|| now->val.str.startwc == NULL)) \
|
|
{ \
|
|
lr_error (ldfile, _("%s: unknown character in field `%s'"), \
|
|
"LC_TIME", #cat); \
|
|
time->cat[cnt] = ""; \
|
|
time->w##cat[cnt] = empty_wstr; \
|
|
} \
|
|
else if (!ignore_content) \
|
|
{ \
|
|
time->cat[cnt] = now->val.str.startmb; \
|
|
time->w##cat[cnt] = now->val.str.startwc; \
|
|
} \
|
|
\
|
|
/* Match the semicolon. */ \
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose); \
|
|
if (now->tok != tok_semicolon && now->tok != tok_eol) \
|
|
break; \
|
|
} \
|
|
if (now->tok != tok_eol) \
|
|
{ \
|
|
while (!ignore_content && cnt < min) \
|
|
{ \
|
|
time->cat[cnt] = ""; \
|
|
time->w##cat[cnt++] = empty_wstr; \
|
|
} \
|
|
\
|
|
if (now->tok == tok_semicolon) \
|
|
{ \
|
|
now = lr_token (ldfile, charmap, result, repertoire, \
|
|
verbose); \
|
|
if (now->tok == tok_eol) \
|
|
lr_error (ldfile, _("extra trailing semicolon")); \
|
|
else if (now->tok == tok_string) \
|
|
{ \
|
|
lr_error (ldfile, _("\
|
|
%s: too many values for field `%s'"), \
|
|
"LC_TIME", #cat); \
|
|
lr_ignore_rest (ldfile, 0); \
|
|
} \
|
|
else \
|
|
goto err_label; \
|
|
} \
|
|
else \
|
|
goto err_label; \
|
|
} \
|
|
time->cat##_defined = 1; \
|
|
break
|
|
|
|
STRARR_ELEM (abday, 7, 7);
|
|
STRARR_ELEM (day, 7, 7);
|
|
STRARR_ELEM (abmon, 12, 12);
|
|
STRARR_ELEM (mon, 12, 12);
|
|
STRARR_ELEM (am_pm, 2, 2);
|
|
STRARR_ELEM (alt_digits, 0, 100);
|
|
|
|
case tok_era:
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
this line. */
|
|
if (ignore_content)
|
|
{
|
|
lr_ignore_rest (ldfile, 0);
|
|
break;
|
|
}
|
|
do
|
|
{
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose);
|
|
if (now->tok != tok_string)
|
|
goto err_label;
|
|
if (!ignore_content && (now->val.str.startmb == NULL
|
|
|| now->val.str.startwc == NULL))
|
|
{
|
|
lr_error (ldfile, _("%s: unknown character in field `%s'"),
|
|
"LC_TIME", "era");
|
|
lr_ignore_rest (ldfile, 0);
|
|
break;
|
|
}
|
|
if (!ignore_content)
|
|
{
|
|
time->era = xrealloc (time->era,
|
|
(time->num_era + 1) * sizeof (char *));
|
|
time->era[time->num_era] = now->val.str.startmb;
|
|
|
|
time->wera = xrealloc (time->wera,
|
|
(time->num_era + 1)
|
|
* sizeof (char *));
|
|
time->wera[time->num_era++] = now->val.str.startwc;
|
|
}
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose);
|
|
if (now->tok != tok_eol && now->tok != tok_semicolon)
|
|
goto err_label;
|
|
}
|
|
while (now->tok == tok_semicolon);
|
|
break;
|
|
|
|
#define STR_ELEM(cat) \
|
|
case tok_##cat: \
|
|
/* Ignore the rest of the line if we don't need the input of \
|
|
this line. */ \
|
|
if (ignore_content) \
|
|
{ \
|
|
lr_ignore_rest (ldfile, 0); \
|
|
break; \
|
|
} \
|
|
\
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose); \
|
|
if (now->tok != tok_string) \
|
|
goto err_label; \
|
|
else if (time->cat != NULL) \
|
|
lr_error (ldfile, _("\
|
|
%s: field `%s' declared more than once"), "LC_TIME", #cat); \
|
|
else if (!ignore_content && (now->val.str.startmb == NULL \
|
|
|| now->val.str.startwc == NULL)) \
|
|
{ \
|
|
lr_error (ldfile, _("%s: unknown character in field `%s'"), \
|
|
"LC_TIME", #cat); \
|
|
time->cat = ""; \
|
|
time->w##cat = empty_wstr; \
|
|
} \
|
|
else if (!ignore_content) \
|
|
{ \
|
|
time->cat = now->val.str.startmb; \
|
|
time->w##cat = now->val.str.startwc; \
|
|
} \
|
|
break
|
|
|
|
STR_ELEM (d_t_fmt);
|
|
STR_ELEM (d_fmt);
|
|
STR_ELEM (t_fmt);
|
|
STR_ELEM (t_fmt_ampm);
|
|
STR_ELEM (era_year);
|
|
STR_ELEM (era_d_t_fmt);
|
|
STR_ELEM (era_d_fmt);
|
|
STR_ELEM (era_t_fmt);
|
|
STR_ELEM (timezone);
|
|
STR_ELEM (date_fmt);
|
|
|
|
#define INT_ELEM(cat) \
|
|
case tok_##cat: \
|
|
/* Ignore the rest of the line if we don't need the input of \
|
|
this line. */ \
|
|
if (ignore_content) \
|
|
{ \
|
|
lr_ignore_rest (ldfile, 0); \
|
|
break; \
|
|
} \
|
|
\
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose); \
|
|
if (now->tok != tok_number) \
|
|
goto err_label; \
|
|
else if (time->cat != 0) \
|
|
lr_error (ldfile, _("%s: field `%s' declared more than once"), \
|
|
"LC_TIME", #cat); \
|
|
else if (!ignore_content) \
|
|
time->cat = now->val.num; \
|
|
break
|
|
|
|
INT_ELEM (first_weekday);
|
|
INT_ELEM (first_workday);
|
|
INT_ELEM (cal_direction);
|
|
|
|
case tok_week:
|
|
/* Ignore the rest of the line if we don't need the input of
|
|
this line. */
|
|
if (ignore_content)
|
|
{
|
|
lr_ignore_rest (ldfile, 0);
|
|
break;
|
|
}
|
|
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose);
|
|
if (now->tok != tok_number)
|
|
goto err_label;
|
|
time->week_ndays = now->val.num;
|
|
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose);
|
|
if (now->tok != tok_semicolon)
|
|
goto err_label;
|
|
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose);
|
|
if (now->tok != tok_number)
|
|
goto err_label;
|
|
time->week_1stday = now->val.num;
|
|
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose);
|
|
if (now->tok != tok_semicolon)
|
|
goto err_label;
|
|
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose);
|
|
if (now->tok != tok_number)
|
|
goto err_label;
|
|
time->week_1stweek = now->val.num;
|
|
|
|
lr_ignore_rest (ldfile, 1);
|
|
break;
|
|
|
|
case tok_end:
|
|
/* Next we assume `LC_TIME'. */
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose);
|
|
if (now->tok == tok_eof)
|
|
break;
|
|
if (now->tok == tok_eol)
|
|
lr_error (ldfile, _("%s: incomplete `END' line"), "LC_TIME");
|
|
else if (now->tok != tok_lc_time)
|
|
lr_error (ldfile, _("\
|
|
%1$s: definition does not end with `END %1$s'"), "LC_TIME");
|
|
lr_ignore_rest (ldfile, now->tok == tok_lc_time);
|
|
return;
|
|
|
|
default:
|
|
err_label:
|
|
SYNTAX_ERROR (_("%s: syntax error"), "LC_TIME");
|
|
}
|
|
|
|
/* Prepare for the next round. */
|
|
now = lr_token (ldfile, charmap, result, repertoire, verbose);
|
|
nowtok = now->tok;
|
|
}
|
|
|
|
/* When we come here we reached the end of the file. */
|
|
lr_error (ldfile, _("%s: premature end of file"), "LC_TIME");
|
|
}
|