mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10: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.
634 lines
17 KiB
C
634 lines
17 KiB
C
/* Copyright (C) 1995-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 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 <argp.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <libintl.h>
|
|
#include <locale.h>
|
|
#include <mcheck.h>
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <error.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include "localedef.h"
|
|
#include "charmap.h"
|
|
#include "locfile.h"
|
|
|
|
/* Undefine the following line in the production version. */
|
|
/* #define NDEBUG 1 */
|
|
#include <assert.h>
|
|
|
|
|
|
/* List of copied locales. */
|
|
struct copy_def_list_t *copy_list;
|
|
|
|
/* If this is defined be POSIX conform. */
|
|
int posix_conformance;
|
|
|
|
/* If not zero give a lot more messages. */
|
|
int verbose;
|
|
|
|
/* If not zero suppress warnings and information messages. */
|
|
int be_quiet;
|
|
|
|
/* If not zero, produce old-style hash table instead of 3-level access
|
|
tables. */
|
|
int oldstyle_tables;
|
|
|
|
/* If not zero force output even if warning were issued. */
|
|
static int force_output;
|
|
|
|
/* Prefix for output files. */
|
|
const char *output_prefix;
|
|
|
|
/* Name of the character map file. */
|
|
static const char *charmap_file;
|
|
|
|
/* Name of the locale definition file. */
|
|
static const char *input_file;
|
|
|
|
/* Name of the repertoire map file. */
|
|
const char *repertoire_global;
|
|
|
|
/* Name of the locale.alias file. */
|
|
const char *alias_file;
|
|
|
|
/* List of all locales. */
|
|
static struct localedef_t *locales;
|
|
|
|
/* If true don't add locale data to archive. */
|
|
bool no_archive;
|
|
|
|
/* If true add named locales to archive. */
|
|
static bool add_to_archive;
|
|
|
|
/* If true delete named locales from archive. */
|
|
static bool delete_from_archive;
|
|
|
|
/* If true replace archive content when adding. */
|
|
static bool replace_archive;
|
|
|
|
/* If true list archive content. */
|
|
static bool list_archive;
|
|
|
|
/* Maximum number of retries when opening the locale archive. */
|
|
int max_locarchive_open_retry = 10;
|
|
|
|
|
|
/* Name and version of program. */
|
|
static void print_version (FILE *stream, struct argp_state *state);
|
|
void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
|
|
|
|
#define OPT_POSIX 301
|
|
#define OPT_QUIET 302
|
|
#define OPT_OLDSTYLE 303
|
|
#define OPT_PREFIX 304
|
|
#define OPT_NO_ARCHIVE 305
|
|
#define OPT_ADD_TO_ARCHIVE 306
|
|
#define OPT_REPLACE 307
|
|
#define OPT_DELETE_FROM_ARCHIVE 308
|
|
#define OPT_LIST_ARCHIVE 309
|
|
|
|
/* Definitions of arguments for argp functions. */
|
|
static const struct argp_option options[] =
|
|
{
|
|
{ NULL, 0, NULL, 0, N_("Input Files:") },
|
|
{ "charmap", 'f', "FILE", 0,
|
|
N_("Symbolic character names defined in FILE") },
|
|
{ "inputfile", 'i', "FILE", 0, N_("Source definitions are found in FILE") },
|
|
{ "repertoire-map", 'u', "FILE", 0,
|
|
N_("FILE contains mapping from symbolic names to UCS4 values") },
|
|
|
|
{ NULL, 0, NULL, 0, N_("Output control:") },
|
|
{ "force", 'c', NULL, 0,
|
|
N_("Create output even if warning messages were issued") },
|
|
{ "old-style", OPT_OLDSTYLE, NULL, 0, N_("Create old-style tables") },
|
|
{ "prefix", OPT_PREFIX, "PATH", 0, N_("Optional output file prefix") },
|
|
{ "posix", OPT_POSIX, NULL, 0, N_("Be strictly POSIX conform") },
|
|
{ "quiet", OPT_QUIET, NULL, 0,
|
|
N_("Suppress warnings and information messages") },
|
|
{ "verbose", 'v', NULL, 0, N_("Print more messages") },
|
|
{ NULL, 0, NULL, 0, N_("Archive control:") },
|
|
{ "no-archive", OPT_NO_ARCHIVE, NULL, 0,
|
|
N_("Don't add new data to archive") },
|
|
{ "add-to-archive", OPT_ADD_TO_ARCHIVE, NULL, 0,
|
|
N_("Add locales named by parameters to archive") },
|
|
{ "replace", OPT_REPLACE, NULL, 0, N_("Replace existing archive content") },
|
|
{ "delete-from-archive", OPT_DELETE_FROM_ARCHIVE, NULL, 0,
|
|
N_("Remove locales named by parameters from archive") },
|
|
{ "list-archive", OPT_LIST_ARCHIVE, NULL, 0, N_("List content of archive") },
|
|
{ "alias-file", 'A', "FILE", 0,
|
|
N_("locale.alias file to consult when making archive")},
|
|
{ NULL, 0, NULL, 0, NULL }
|
|
};
|
|
|
|
/* Short description of program. */
|
|
static const char doc[] = N_("Compile locale specification");
|
|
|
|
/* Strings for arguments in help texts. */
|
|
static const char args_doc[] = N_("\
|
|
NAME\n\
|
|
[--add-to-archive|--delete-from-archive] FILE...\n\
|
|
--list-archive [FILE]");
|
|
|
|
/* Prototype for option handler. */
|
|
static error_t parse_opt (int key, char *arg, struct argp_state *state);
|
|
|
|
/* Function to print some extra text in the help message. */
|
|
static char *more_help (int key, const char *text, void *input);
|
|
|
|
/* Data structure to communicate with argp functions. */
|
|
static struct argp argp =
|
|
{
|
|
options, parse_opt, args_doc, doc, NULL, more_help
|
|
};
|
|
|
|
|
|
/* Prototypes for global functions. */
|
|
extern void *xmalloc (size_t __n);
|
|
|
|
/* Prototypes for local functions. */
|
|
static void error_print (void);
|
|
static const char *construct_output_path (char *path);
|
|
static const char *normalize_codeset (const char *codeset, size_t name_len);
|
|
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
const char *output_path;
|
|
int cannot_write_why;
|
|
struct charmap_t *charmap;
|
|
struct localedef_t global;
|
|
int remaining;
|
|
|
|
/* Set initial values for global variables. */
|
|
copy_list = NULL;
|
|
posix_conformance = getenv ("POSIXLY_CORRECT") != NULL;
|
|
error_print_progname = error_print;
|
|
|
|
/* Set locale. Do not set LC_ALL because the other categories must
|
|
not be affected (according to POSIX.2). */
|
|
setlocale (LC_MESSAGES, "");
|
|
setlocale (LC_CTYPE, "");
|
|
|
|
/* Initialize the message catalog. */
|
|
textdomain (_libc_intl_domainname);
|
|
|
|
/* Parse and process arguments. */
|
|
argp_err_exit_status = 4;
|
|
argp_parse (&argp, argc, argv, 0, &remaining, NULL);
|
|
|
|
/* Handle a few special cases. */
|
|
if (list_archive)
|
|
show_archive_content (verbose);
|
|
if (add_to_archive)
|
|
return add_locales_to_archive (argc - remaining, &argv[remaining],
|
|
replace_archive);
|
|
if (delete_from_archive)
|
|
return delete_locales_from_archive (argc - remaining, &argv[remaining]);
|
|
|
|
/* POSIX.2 requires to be verbose about missing characters in the
|
|
character map. */
|
|
verbose |= posix_conformance;
|
|
|
|
if (argc - remaining != 1)
|
|
{
|
|
/* We need exactly one non-option parameter. */
|
|
argp_help (&argp, stdout, ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR,
|
|
program_invocation_short_name);
|
|
exit (4);
|
|
}
|
|
|
|
/* The parameter describes the output path of the constructed files.
|
|
If the described files cannot be written return a NULL pointer. */
|
|
output_path = construct_output_path (argv[remaining]);
|
|
if (output_path == NULL && ! no_archive)
|
|
error (4, errno, _("cannot create directory for output files"));
|
|
cannot_write_why = errno;
|
|
|
|
/* Now that the parameters are processed we have to reset the local
|
|
ctype locale. (P1003.2 4.35.5.2) */
|
|
setlocale (LC_CTYPE, "POSIX");
|
|
|
|
/* Look whether the system really allows locale definitions. POSIX
|
|
defines error code 3 for this situation so I think it must be
|
|
a fatal error (see P1003.2 4.35.8). */
|
|
if (sysconf (_SC_2_LOCALEDEF) < 0)
|
|
WITH_CUR_LOCALE (error (3, 0, _("\
|
|
FATAL: system does not define `_POSIX2_LOCALEDEF'")));
|
|
|
|
/* Process charmap file. */
|
|
charmap = charmap_read (charmap_file, verbose, 1, be_quiet, 1);
|
|
|
|
/* Add the first entry in the locale list. */
|
|
memset (&global, '\0', sizeof (struct localedef_t));
|
|
global.name = input_file ?: "/dev/stdin";
|
|
global.needed = ALL_LOCALES;
|
|
locales = &global;
|
|
|
|
/* Now read the locale file. */
|
|
if (locfile_read (&global, charmap) != 0)
|
|
WITH_CUR_LOCALE (error (4, errno, _("\
|
|
cannot open locale definition file `%s'"), input_file));
|
|
|
|
/* Perhaps we saw some `copy' instructions. */
|
|
while (1)
|
|
{
|
|
struct localedef_t *runp = locales;
|
|
|
|
while (runp != NULL && (runp->needed & runp->avail) == runp->needed)
|
|
runp = runp->next;
|
|
|
|
if (runp == NULL)
|
|
/* Everything read. */
|
|
break;
|
|
|
|
if (locfile_read (runp, charmap) != 0)
|
|
WITH_CUR_LOCALE (error (4, errno, _("\
|
|
cannot open locale definition file `%s'"), runp->name));
|
|
}
|
|
|
|
/* Check the categories we processed in source form. */
|
|
check_all_categories (locales, charmap);
|
|
|
|
/* We are now able to write the data files. If warning were given we
|
|
do it only if it is explicitly requested (--force). */
|
|
if (error_message_count == 0 || force_output != 0)
|
|
{
|
|
if (cannot_write_why != 0)
|
|
WITH_CUR_LOCALE (error (4, cannot_write_why, _("\
|
|
cannot write output files to `%s'"), output_path));
|
|
else
|
|
write_all_categories (locales, charmap, argv[remaining], output_path);
|
|
}
|
|
else
|
|
WITH_CUR_LOCALE (error (4, 0, _("\
|
|
no output file produced because warnings were issued")));
|
|
|
|
/* This exit status is prescribed by POSIX.2 4.35.7. */
|
|
exit (error_message_count != 0);
|
|
}
|
|
|
|
|
|
/* Handle program arguments. */
|
|
static error_t
|
|
parse_opt (int key, char *arg, struct argp_state *state)
|
|
{
|
|
switch (key)
|
|
{
|
|
case OPT_QUIET:
|
|
be_quiet = 1;
|
|
break;
|
|
case OPT_POSIX:
|
|
posix_conformance = 1;
|
|
break;
|
|
case OPT_OLDSTYLE:
|
|
oldstyle_tables = 1;
|
|
break;
|
|
case OPT_PREFIX:
|
|
output_prefix = arg;
|
|
break;
|
|
case OPT_NO_ARCHIVE:
|
|
no_archive = true;
|
|
break;
|
|
case OPT_ADD_TO_ARCHIVE:
|
|
add_to_archive = true;
|
|
break;
|
|
case OPT_REPLACE:
|
|
replace_archive = true;
|
|
break;
|
|
case OPT_DELETE_FROM_ARCHIVE:
|
|
delete_from_archive = true;
|
|
break;
|
|
case OPT_LIST_ARCHIVE:
|
|
list_archive = true;
|
|
break;
|
|
case 'c':
|
|
force_output = 1;
|
|
break;
|
|
case 'f':
|
|
charmap_file = arg;
|
|
break;
|
|
case 'A':
|
|
alias_file = arg;
|
|
break;
|
|
case 'i':
|
|
input_file = arg;
|
|
break;
|
|
case 'u':
|
|
repertoire_global = arg;
|
|
break;
|
|
case 'v':
|
|
verbose = 1;
|
|
break;
|
|
default:
|
|
return ARGP_ERR_UNKNOWN;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static char *
|
|
more_help (int key, const char *text, void *input)
|
|
{
|
|
char *cp;
|
|
|
|
switch (key)
|
|
{
|
|
case ARGP_KEY_HELP_EXTRA:
|
|
/* We print some extra information. */
|
|
if (asprintf (&cp, gettext ("\
|
|
System's directory for character maps : %s\n\
|
|
repertoire maps: %s\n\
|
|
locale path : %s\n\
|
|
%s"),
|
|
CHARMAP_PATH, REPERTOIREMAP_PATH, LOCALE_PATH, gettext ("\
|
|
For bug reporting instructions, please see:\n\
|
|
<http://www.gnu.org/software/libc/bugs.html>.\n")) < 0)
|
|
return NULL;
|
|
return cp;
|
|
default:
|
|
break;
|
|
}
|
|
return (char *) text;
|
|
}
|
|
|
|
/* Print the version information. */
|
|
static void
|
|
print_version (FILE *stream, struct argp_state *state)
|
|
{
|
|
fprintf (stream, "localedef (GNU %s) %s\n", PACKAGE, VERSION);
|
|
fprintf (stream, gettext ("\
|
|
Copyright (C) %s Free Software Foundation, Inc.\n\
|
|
This is free software; see the source for copying conditions. There is NO\n\
|
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
|
|
"), "2007");
|
|
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
|
|
}
|
|
|
|
|
|
/* The address of this function will be assigned to the hook in the error
|
|
functions. */
|
|
static void
|
|
error_print (void)
|
|
{
|
|
}
|
|
|
|
|
|
/* The parameter to localedef describes the output path. If it does
|
|
contain a '/' character it is a relative path. Otherwise it names the
|
|
locale this definition is for. */
|
|
static const char *
|
|
construct_output_path (char *path)
|
|
{
|
|
const char *normal = NULL;
|
|
char *result;
|
|
char *endp;
|
|
|
|
if (strchr (path, '/') == NULL)
|
|
{
|
|
/* This is a system path. First examine whether the locale name
|
|
contains a reference to the codeset. This should be
|
|
normalized. */
|
|
char *startp;
|
|
size_t n;
|
|
|
|
startp = path;
|
|
/* We must be prepared for finding a CEN name or a location of
|
|
the introducing `.' where it is not possible anymore. */
|
|
while (*startp != '\0' && *startp != '@' && *startp != '.')
|
|
++startp;
|
|
if (*startp == '.')
|
|
{
|
|
/* We found a codeset specification. Now find the end. */
|
|
endp = ++startp;
|
|
while (*endp != '\0' && *endp != '@')
|
|
++endp;
|
|
|
|
if (endp > startp)
|
|
normal = normalize_codeset (startp, endp - startp);
|
|
}
|
|
else
|
|
/* This is to keep gcc quiet. */
|
|
endp = NULL;
|
|
|
|
/* We put an additional '\0' at the end of the string because at
|
|
the end of the function we need another byte for the trailing
|
|
'/'. */
|
|
if (normal == NULL)
|
|
n = asprintf (&result, "%s%s/%s%c",
|
|
output_prefix ?: "", LOCALEDIR, path, '\0');
|
|
else
|
|
n = asprintf (&result, "%s%s/%.*s%s%s%c",
|
|
output_prefix ?: "", LOCALEDIR,
|
|
(int) (startp - path), path, normal, endp, '\0');
|
|
|
|
if (n < 0)
|
|
return NULL;
|
|
|
|
endp = result + n - 1;
|
|
}
|
|
else
|
|
{
|
|
/* This is a user path. Please note the additional byte in the
|
|
memory allocation. */
|
|
size_t len = strlen (path) + 1;
|
|
result = xmalloc (len + 1);
|
|
endp = mempcpy (result, path, len) - 1;
|
|
|
|
/* If the user specified an output path we cannot add the output
|
|
to the archive. */
|
|
no_archive = true;
|
|
}
|
|
|
|
errno = 0;
|
|
|
|
if (no_archive && euidaccess (result, W_OK) == -1)
|
|
/* Perhaps the directory does not exist now. Try to create it. */
|
|
if (errno == ENOENT)
|
|
{
|
|
errno = 0;
|
|
if (mkdir (result, 0777) < 0)
|
|
return NULL;
|
|
}
|
|
|
|
*endp++ = '/';
|
|
*endp = '\0';
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/* Normalize codeset name. There is no standard for the codeset
|
|
names. Normalization allows the user to use any of the common
|
|
names. */
|
|
static const char *
|
|
normalize_codeset (codeset, name_len)
|
|
const char *codeset;
|
|
size_t name_len;
|
|
{
|
|
int len = 0;
|
|
int only_digit = 1;
|
|
char *retval;
|
|
char *wp;
|
|
size_t cnt;
|
|
|
|
for (cnt = 0; cnt < name_len; ++cnt)
|
|
if (isalnum (codeset[cnt]))
|
|
{
|
|
++len;
|
|
|
|
if (isalpha (codeset[cnt]))
|
|
only_digit = 0;
|
|
}
|
|
|
|
retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
|
|
|
|
if (retval != NULL)
|
|
{
|
|
if (only_digit)
|
|
wp = stpcpy (retval, "iso");
|
|
else
|
|
wp = retval;
|
|
|
|
for (cnt = 0; cnt < name_len; ++cnt)
|
|
if (isalpha (codeset[cnt]))
|
|
*wp++ = tolower (codeset[cnt]);
|
|
else if (isdigit (codeset[cnt]))
|
|
*wp++ = codeset[cnt];
|
|
|
|
*wp = '\0';
|
|
}
|
|
|
|
return (const char *) retval;
|
|
}
|
|
|
|
|
|
struct localedef_t *
|
|
add_to_readlist (int category, const char *name, const char *repertoire_name,
|
|
int generate, struct localedef_t *copy_locale)
|
|
{
|
|
struct localedef_t *runp = locales;
|
|
|
|
while (runp != NULL && strcmp (name, runp->name) != 0)
|
|
runp = runp->next;
|
|
|
|
if (runp == NULL)
|
|
{
|
|
/* Add a new entry at the end. */
|
|
struct localedef_t *newp;
|
|
|
|
assert (generate == 1);
|
|
|
|
newp = xcalloc (1, sizeof (struct localedef_t));
|
|
newp->name = name;
|
|
newp->repertoire_name = repertoire_name;
|
|
|
|
if (locales == NULL)
|
|
runp = locales = newp;
|
|
else
|
|
{
|
|
runp = locales;
|
|
while (runp->next != NULL)
|
|
runp = runp->next;
|
|
runp = runp->next = newp;
|
|
}
|
|
}
|
|
|
|
if (generate
|
|
&& (runp->needed & (1 << category)) != 0
|
|
&& (runp->avail & (1 << category)) == 0)
|
|
WITH_CUR_LOCALE (error (5, 0, _("\
|
|
circular dependencies between locale definitions")));
|
|
|
|
if (copy_locale != NULL)
|
|
{
|
|
if (runp->categories[category].generic != NULL)
|
|
WITH_CUR_LOCALE (error (5, 0, _("\
|
|
cannot add already read locale `%s' a second time"), name));
|
|
else
|
|
runp->categories[category].generic =
|
|
copy_locale->categories[category].generic;
|
|
}
|
|
|
|
runp->needed |= 1 << category;
|
|
|
|
return runp;
|
|
}
|
|
|
|
|
|
struct localedef_t *
|
|
find_locale (int category, const char *name, const char *repertoire_name,
|
|
const struct charmap_t *charmap)
|
|
{
|
|
struct localedef_t *result;
|
|
|
|
/* Find the locale, but do not generate it since this would be a bug. */
|
|
result = add_to_readlist (category, name, repertoire_name, 0, NULL);
|
|
|
|
assert (result != NULL);
|
|
|
|
if ((result->avail & (1 << category)) == 0
|
|
&& locfile_read (result, charmap) != 0)
|
|
WITH_CUR_LOCALE (error (4, errno, _("\
|
|
cannot open locale definition file `%s'"), result->name));
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
struct localedef_t *
|
|
load_locale (int category, const char *name, const char *repertoire_name,
|
|
const struct charmap_t *charmap, struct localedef_t *copy_locale)
|
|
{
|
|
struct localedef_t *result;
|
|
|
|
/* Generate the locale if it does not exist. */
|
|
result = add_to_readlist (category, name, repertoire_name, 1, copy_locale);
|
|
|
|
assert (result != NULL);
|
|
|
|
if ((result->avail & (1 << category)) == 0
|
|
&& locfile_read (result, charmap) != 0)
|
|
WITH_CUR_LOCALE (error (4, errno, _("\
|
|
cannot open locale definition file `%s'"), result->name));
|
|
|
|
return result;
|
|
}
|
|
|
|
static void
|
|
turn_on_mcheck (void)
|
|
{
|
|
/* Enable `malloc' debugging. */
|
|
mcheck (NULL);
|
|
/* Use the following line for a more thorough but much slower testing. */
|
|
/* mcheck_pedantic (NULL); */
|
|
}
|
|
|
|
void (*__malloc_initialize_hook) (void) = turn_on_mcheck;
|