mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 00:31:08 +00:00
11bf311edc
2007-01-11 Jakub Jelinek <jakub@redhat.com> * sysdeps/i386/soft-fp/sfp-machine.h: Remove. * sysdeps/x86_64/soft-fp/sfp-machine.h: Likewise. 2007-01-10 Ulrich Drepper <drepper@redhat.com> * io/fts.c: Make sure fts_cur is always valid after return from fts_read. Patch by Miloslav Trmac <mitr@redhat.com>. 2006-10-27 Richard Sandiford <richard@codesourcery.com> * elf/elf.h (R_MIPS_GLOB_DAT): Define. (R_MIPS_NUM): Bump by 1. 2007-01-03 Jakub Jelinek <jakub@redhat.com> * posix/execvp.c: Include alloca.h. (allocate_scripts_argv): Renamed to... (scripts_argv): ... this. Don't allocate buffer here nor count arguments. (execvp): Use alloca if possible. * posix/Makefile: Add rules to build and run tst-vfork3 test. * posix/tst-vfork3.c: New test. * stdlib/Makefile (tst-strtod3-ENV): Define. 2007-01-02 Ulrich Drepper <drepper@redhat.com> * posix/getconf.c: Update copyright year. * nss/getent.c: Likewise. * iconv/iconvconfig.c: Likewise. * iconv/iconv_prog.c: Likewise. * elf/ldconfig.c: Likewise. * catgets/gencat.c: Likewise. * csu/version.c: Likewise. * elf/ldd.bash.in: Likewise. * elf/sprof.c (print_version): Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * nscd/nscd.c (print_version): Likewise. * debug/xtrace.sh: Likewise. * malloc/memusage.sh: Likewise. * malloc/mtrace.pl: Likewise. * debug/catchsegv.sh: Likewise. 2006-12-24 Ulrich Drepper <drepper@redhat.com> * malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment attempts. 2006-12-23 Ulrich Drepper <drepper@redhat.com> * posix/wordexp.c: Remove some unnecessary tests. 2006-12-20 SUGIOKA Toshinobu <sugioka@itonet.co.jp> * sysdeps/unix/sysv/linux/sh/bits/shm.h: New file. * nss/getXXbyYY_r.c: Include atomic.h. (INTERNAL (REENTRANT_NAME)): Write startp after start_fct, add atomic_write_barrier () in between. 2006-11-28 Jakub Jelinek <jakub@redhat.com> * elf/dl-support.c: Include dl-procinfo.h. * sysdeps/powerpc/dl-procinfo.h (PPC_PLATFORM_POWER4, PPC_PLATFORM_PPC970, PPC_PLATFORM_POWER5, PPC_PLATFORM_POWER5_PLUS, PPC_PLATFORM_POWER6, PPC_PLATFORM_CELL_BE, PPC_PLATFORM_POWER6X): Define. (_dl_string_platform): Use PPC_PLATFORM_* macros instead of hardcoded constants. * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platform): Use PPC_PLATFORM_* macros for array designators. 2006-11-11 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Add 3 new cap names to the beginning. (_dl_powerpc_platforms): Add "power6x". * sysdeps/powerpc/dl-procinfo.h (_DL_HWCAP_FIRST): Decrease. (HWCAP_IMPORTANT): Add PPC_FEATURE_HAS_DFP. (_DL_PLATFORMS_COUNT): Increase. (_dl_string_platform): Handle power6x case. * sysdeps/powerpc/sysdep.h (PPC_FEATURE_PA6T, PPC_FEATURE_HAS_DFP, PPC_FEATURE_POWER6_EXT): Define. (PPC_FEATURE_POWER5, PPC_FEATURE_POWER5_PLUS): Correct Comment. [-2^31 .. 2^31) range. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_RELATIME. * sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags): Handle relatime mount option. 2006-12-13 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Include kernel-features.h. 2006-12-11 Ulrich Drepper <drepper@redhat.com> * stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. [BZ #3664] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix test to recognize empty parsed strings. * stdlib/Makefile (tests): Add tst-strtod2. * stdlib/tst-strtod2.c: New file. [BZ #3673] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix exp_limit computation. * stdlib/Makefile (tests): Add tst-atof2. * stdlib/tst-atof2.c: New file. [BZ #3674] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Adjust exponent value correctly if removing trailing zero of hex-float. * stdlib/Makefile (tests): Add tst-atof1. * stdlib/tst-atof1.c: New file. * misc/mntent_r.c (__hasmntopt): Check p[optlen] even when p == rest. Start searching for next comma at p rather than rest. * misc/Makefile (tests): Add tst-mntent2. * misc/tst-mntent2.c: New test. 2006-12-08 Ulrich Drepper <drepper@redhat.com> * malloc/memusage.c: Handle realloc with new size of zero and non-NULL pointer correctly. (me): Really write first record twice. (struct entry): Make format bi-arch safe. (dest): Write out more realloc statistics. * malloc/memusagestat.c (struct entry): Make format bi-arch safe. 2006-12-05 Jakub Jelinek <jakub@redhat.com> * nis/nis_subr.c (nis_getnames): Revert last change. 2006-12-03 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sysv/linux/sh/sys/io.h: Removed. 2006-11-30 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/i386/i686/memcmp.S: Use jump table as the base of jump table entries. 2006-11-30 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/i386/clone.S: Provide CFI for the outermost `clone' function to ensure proper unwinding stop of gdb. * sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise. 2006-12-01 Ulrich Drepper <drepper@redhat.com> * nscd/nscd.init: Remove obsolete and commented-out -S option handling. 2006-11-23 Jakub Jelinek <jakub@redhat.com> [BZ #3514] * manual/string.texi (strncmp): Fix pastos from wcscmp description. [BZ #3515] * manual/string.texi (strtok): Remove duplicate paragraph. 2006-12-01 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with libgcc not supporting `rflags' unwinding (register # >= 17). 2006-11-30 Jakub Jelinek <jakub@redhat.com> * sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc succeeded. 2006-11-29 Daniel Jacobowitz <dan@codesourcery.com> Jakub Jelinek <jakub@redhat.com> Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c (restore_rt): Add correct unwind information. * sysdeps/unix/sysv/linux/x86_64/Makefile: Provide symbols for 'restore_rt' even in the 'signal' directory. * sysdeps/unix/sysv/linux/x86_64/ucontext_i.sym: Extend the regs list. malloc crashed. Don't allocate memory unnecessarily in each loop. 2006-10-21 Jakub Jelinek <jakub@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Fix last change. 2006-11-20 Ulrich Drepper <drepper@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Optimize a bit. 2006-11-18 Bruno Haible <bruno@clisp.org> * sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Invoke __sysconf only after having tried to call getgroups32. 2006-11-19 Ulrich Drepper <drepper@redhat.com> * nss/nss_files/files-hosts.c (LINE_PARSER): Support IPv6-style addresses for IPv4 queries if they can be mapped. 2006-11-16 Jakub Jelinek <jakub@redhat.com> * sysdeps/x86_64/fpu/s_copysignf.S (__copysignf): Switch to .text. * sysdeps/x86_64/fpu/s_copysign.S (__copysign): Likewise. (signmask): Add .size directive. (othermask): Add .type directive. 2006-11-14 Ulrich Drepper <drepper@redhat.com> * po/nl.po: Update from translation team. * timezone/zdump.c: Redo fix for BZ #3137. 2006-11-14 Jakub Jelinek <jakub@redhat.com> * nss/nss_files/files-alias.c (get_next_alias): Set line back to first_unused after parsing :include: file. * timezone/africa: Update from tzdata2006o. * timezone/antarctica: Likewise. * timezone/asia: Likewise. * timezone/australasia: Likewise. * timezone/backward: Likewise. * timezone/europe: Likewise. * timezone/iso3166.tab: Likewise. * timezone/northamerica: Likewise. * timezone/southamerica: Likewise. * timezone/zone.tab: Likewise. * time/tzfile.c (__tzfile_read): Extend to handle new file format on machines with 64-bit time_t. * timezone/checktab.awk: Update from tzcode2006o. * timezone/ialloc.c: Likewise. * timezone/private.h: Likewise. * timezone/scheck.c: Likewise. * timezone/tzfile.h: Likewise. * timezone/tzselect.ksh: Likewise. * timezone/zdump.c: Likewise. * timezone/zic.c: Likewise. [BZ #3483] * elf/ldconfig.c (main): Call setlocale and textdomain. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. [BZ #3480] * manual/argp.texi: Fix typos. * manual/charset.texi: Likewise. * manual/errno.texi: Likewise. * manual/filesys.texi: Likewise. * manual/lang.texi: Likewise. * manual/maint.texi: Likewise. * manual/memory.texi: Likewise. * manual/message.texi: Likewise. * manual/resource.texi: Likewise. * manual/search.texi: Likewise. * manual/signal.texi: Likewise. * manual/startup.texi: Likewise. * manual/stdio.texi: Likewise. * manual/sysinfo.texi: Likewise. * manual/syslog.texi: Likewise. * manual/time.texi: Likewise. Patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>. [BZ #3465] * sunrpc/clnt_raw.c: Minimal message improvements. * sunrpc/pm_getmaps.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nis_print_group_entry.c: Likewise. * locale/programs/repertoire.c: Likewise. * locale/programs/charmap.c: Likewise. * malloc/memusage.sh: Likewise. * elf/dl-deps.c: Likewise. * locale/programs/ld-collate.c: Likewise. * libio/vswprintf.c: Likewise. * malloc/memusagestat.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/rpc_main.c: Likewise. * nscd/cache.c: Likewise. * locale/programs/repertoire.c: Unify output messages. * locale/programs/charmap.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-numeric.c: Likewise. * locale/programs/ld-time.c: Likewise. * elf/ldconfig.c: Likewise. * nscd/selinux.c: Likewise. * elf/cache.c: Likewise. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. 2006-11-10 Jakub Jelinek <jakub@redhat.com> * string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization if N is one bigger than return value. * string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1 and l1 last arguments, if buf is defined, verify the return value equals to strlen (buf) and verify no byte beyond passed length is modified. 2006-11-10 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. * sysdeps/gnu/siglist.c (__old_sys_siglist, __old_sys_sigabbrev): Use __new_sys_siglist instead of _sys_siglist_internal as second macro argument. (_old_sys_siglist): Use declare_symbol_alias macro instead of strong_alias. 2006-11-09 Ulrich Drepper <drepper@redhat.com> [BZ #3493] * posix/unistd.h (sysconf): Remove const attribute. * sysdeps/posix/getaddrinfo.c (getaddrinfo): Fix test for temporary or deprecated addresses. Patch by Sridhar Samudrala <sri@us.ibm.com>. * string/Makefile (tests): Add tst-strxfrm2. * string/tst-strxfrm2.c: New file. 2006-10-09 Jakub Jelinek <jakub@redhat.com> * elf/dl-debug.c (_dl_debug_initialize): Check r->r_map for 0 rather than r->r_brk. * string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal optimization even if needed > n. 2006-11-07 Jakub Jelinek <jakub@redhat.com> * include/libc-symbols.h (declare_symbol): Rename to... (declare_symbol_alias): ... this. Add ORIGINAL argument, imply strong_alias (ORIGINAL, SYMBOL) in asm to make sure it preceedes .size directive. * sysdeps/gnu/errlist-compat.awk: Adjust for declare_symbol_alias changes. * sysdeps/gnu/siglist.c: Likewise. 2006-11-03 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/fpu/bits/mathinline.h [__LIBC_INTERNAL_MATH_INLINES]: Moved to ... * sysdeps/powerpc/fpu/math_private.h: ...here. New file. 2006-11-05 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Update handling of cache descriptor 0x49 for new models. * sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_check_word): Likewise. 2006-11-02 Ulrich Drepper <drepper@redhat.com> * configure.in: Work around ld --help change and avoid -z relro test completely if the architecture doesn't care about security. 2006-11-01 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. 2006-10-31 Ulrich Drepper <drepper@redhat.com> * stdlib/atexit.c (atexit): Don't mark as hidden when used to generate compatibility version. 2006-10-29 Ulrich Drepper <drepper@redhat.com> * configure.in: Relax -z relro requirement a bit. * po/sv.po: Update from translation team. 2006-10-29 Jakub Jelinek <jakub@redhat.com> * elf/dl-sym.c (do_sym): Use RTLD_SINGLE_THREAD_P. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Likewise. * elf/dl-close.c (_dl_close_worker): Likewise. * elf/dl-open.c (_dl_open_worker): Likewise. * sysdeps/generic/sysdep-cancel.h (RTLD_SINGLE_THREAD_P): Define. * configure.in: Require assembler support for visibility, compiler support for visibility and aliases, linker support for various -z options. * Makeconfig: Remove conditional code which now is unnecessary. * config.h.in: Likewise. * config.make.in: Likewise. * dlfcn/Makefile: Likewise. * elf/Makefile: Likewise. * elf/dl-load.c: Likewise. * elf/rtld.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * io/Makefile: Likewise. * io/fstat.c: Likewise. * io/fstat64.c: Likewise. * io/fstatat.c: Likewise. * io/fstatat64.c: Likewise. * io/lstat.c: Likewise. * io/lstat64.c: Likewise. * io/mknod.c: Likewise. * io/mknodat.c: Likewise. * io/stat.c: Likewise. * io/stat64.c: Likewise. * libio/stdio.c: Likewise. * nscd/Makefile: Likewise. * stdlib/Makefile: Likewise. * stdlib/atexit.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/i386/sysdep.h: Likewise. * sysdeps/i386/i686/memcmp.S: Likewise. * sysdeps/powerpc/powerpc32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise. * Makerules: USE_TLS support is now default. * tls.make.c: Likewise. * csu/Versions: Likewise. * csu/libc-start.c: Likewise. * csu/libc-tls.c: Likewise. * csu/version.c: Likewise. * dlfcn/dlinfo.c: Likewise. * elf/dl-addr.c: Likewise. * elf/dl-cache.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-object.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-sysdep.c: Likewise. * elf/dl-tls.c: Likewise. * elf/ldconfig.c: Likewise. * elf/rtld.c: Likewise. * elf/tst-tls-dlinfo.c: Likewise. * elf/tst-tls1.c: Likewise. * elf/tst-tls10.h: Likewise. * elf/tst-tls14.c: Likewise. * elf/tst-tls2.c: Likewise. * elf/tst-tls3.c: Likewise. * elf/tst-tls4.c: Likewise. * elf/tst-tls5.c: Likewise. * elf/tst-tls6.c: Likewise. * elf/tst-tls7.c: Likewise. * elf/tst-tls8.c: Likewise. * elf/tst-tls9.c: Likewise. * elf/tst-tlsmod1.c: Likewise. * elf/tst-tlsmod13.c: Likewise. * elf/tst-tlsmod13a.c: Likewise. * elf/tst-tlsmod14a.c: Likewise. * elf/tst-tlsmod2.c: Likewise. * elf/tst-tlsmod3.c: Likewise. * elf/tst-tlsmod4.c: Likewise. * elf/tst-tlsmod5.c: Likewise. * elf/tst-tlsmod6.c: Likewise. * include/errno.h: Likewise. * include/link.h: Likewise. * include/tls.h: Likewise. * locale/global-locale.c: Likewise. * locale/localeinfo.h: Likewise. * malloc/arena.c: Likewise. * malloc/hooks.c: Likewise. * malloc/malloc.c: Likewise. * resolv/Versions: Likewise. * sysdeps/alpha/dl-machine.h: Likewise. * sysdeps/alpha/libc-tls.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/tls.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/ia64/dl-machine.h: Likewise. * sysdeps/ia64/libc-tls.c: Likewise. * sysdeps/mach/hurd/fork.c: Likewise. * sysdeps/mach/hurd/i386/tls.h: Likewise. * sysdeps/powerpc/powerpc32/dl-machine.c: Likwise. * sysdeps/powerpc/powerpc32/dl-machine.h: Likewise. * sysdeps/powerpc/powerpc64/dl-machine.h: Likewise. * sysdeps/s390/libc-tls.c: Likewise. * sysdeps/s390/s390-32/dl-machine.h: Likewise. * sysdeps/s390/s390-64/dl-machine.h: Likewise. * sysdeps/sh/dl-machine.h: Likewise. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. * sysdeps/x86_64/dl-machine.h: Likewise. [BZ #3426] * stdlib/stdlib.h: Adjust comment for canonicalize_file_name to reality. 2006-10-27 Jakub Jelinek <jakub@redhat.com> * elf/dl-lookup.c (_dl_debug_bindings): Remove unused symbol_scope argument. (_dl_lookup_symbol_x): Adjust caller. * sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove _ns_global_scope. * elf/rtld.c (dl_main): Don't initialize _ns_global_scope. * elf/dl-libc.c: Revert l_scope name changes. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * elf/dl-close.c (_dl_close): Likewise. * elf/dl-open.c (dl_open_worker): Likewise. If not SINGLE_THREAD_P, always use __rtld_mrlock_{change,done}. Always free old scope list here if not l_scope_mem. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name change. Never free scope list here. Just __rtld_mrlock_lock before the lookup and __rtld_mrlock_unlock it after the lookup. * elf/dl-sym.c: Likewise. * include/link.h (struct r_scoperec): Remove. (struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem with l_scope_mem and l_scoperec_lock with l_scope_lock. 2006-10-25 Ulrich Drepper <drepper@redhat.com> * sysdeps/gnu/netinet/tcp.h: Define TCP_CONGESTION. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * configure.in: Disable building profile libraries by default. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * elf/dl-lookup.c (_dl_lookup_symbol_x): Add warning to _dl_lookup_symbol_x code. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * elf/dl-runtime.c: Include sysdep-cancel.h. (_dl_fixup, _dl_profile_fixup): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-sym.c: Include sysdep-cancel.h. (do_sym): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-close.c: Include sysdep-cancel.h. (_dl_close): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-open.c: Include sysdep-cancel.h. (dl_open_worker): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. 2006-10-17 Jakub Jelinek <jakub@redhat.com> [BZ #3313] * malloc/malloc.c (malloc_consolidate): Set maxfb to address of last fastbin rather than end of fastbin array. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/i486/bits/atomic.h (catomic_decrement): Use correct body macro. * sysdeps/x86_64/bits/atomic.h (__arch_c_compare_and_exchange_val_64_acq): Add missing casts. (catomic_decrement): Use correct body macro. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * include/atomic.h: Add a unique prefix to all local variables in macros. * csu/tst-atomic.c (do_test): Test also catomic_* macros. 2006-10-14 Ulrich Drepper <drepper@redhat.com> * resolv/arpa/nameser.h: Document that ns_t_a6 is deprecated. [BZ #3313] * malloc/malloc.c (malloc_consolidate): Don't use get_fast_max to determine highest fast bin to consolidate, always look into all of them. (do_check_malloc_state): Only require for empty bins for large sizes in main arena. * libio/stdio.h: Add more __wur attributes. 2006-11-12 Andreas Jaeger <aj@suse.de> [BZ #2510] * manual/search.texi (Hash Search Function): Clarify. (Array Search Function): Clarify. 2006-11-12 Joseph Myers <joseph@codesourcery.com> [BZ #2830] * math/atest-exp.c (main): Cast hex value to mp_limb_t before shifting. * math/atest-exp2.c (read_mpn_hex): Likewise. * math/atest-sincos.c (main): Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add epoll_pwait. * sysdeps/unix/sysv/linux/sys/epoll.h: Declare epoll_pwait. * sysdeps/unix/sysv/linux/Versions (libc): Add epoll_pwait for version GLIBC_2.6. * Versions.def: Add GLIBC_2.6 for libc. * sysdeps/i386/i486/bits/atomic.h: Add catomic_* support. 2006-10-11 Jakub Jelinek <jakub@redhat.com> * malloc/malloc.c (_int_malloc): Remove unused any_larger variable. * nis/nis_defaults.c (__nis_default_access): Don't call getenv twice. * nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv. * sysdeps/generic/unsecvars.h: Add NIS_PATH. 2006-10-11 Ulrich Drepper <drepper@redhat.com> * include/atomic.c: Define catomic_* operations. * sysdeps/x86_64/bits/atomic.h: Likewise. Fix a few minor problems. * stdlib/cxa_finalize.c: Use catomic_* operations instead of atomic_*. * malloc/memusage.c: Likewise. * gmon/mcount.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-profile.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-runtime.c: Likewise. * elf/dl-fptr.c: Likewise. * resolv/res_libc.c: Likewise. 2006-10-10 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast. * sysdeps/mach/hurd/futimes.c: Likewise. * sysdeps/mach/hurd/lutimes.c: Likewise. 2006-10-09 Ulrich Drepper <drepper@redhat.com> Jakub Jelinek <jakub@redhat.com> Implement reference counting of scope records. * elf/dl-close.c (_dl_close): Remove all scopes from removed objects from the list in objects which remain. Always allocate new scope record. * elf/dl-open.c (dl_open_worker): When growing array for scopes, don't resize, allocate a new one. * elf/dl-runtime.c: Update reference counters before using a scope array. * elf/dl-sym.c: Likewise. * elf/dl-libc.c: Adjust for l_scope name change. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * include/link.h: Include <rtld-lowlevel.h>. Define struct r_scoperec. Replace r_scope with pointer to r_scoperec structure. Add l_scoperec_lock. * sysdeps/generic/ldsodefs.h: Include <rtld-lowlevel.h>. * sysdeps/generic/rtld-lowlevel.h: New file. * include/atomic.h: Rename atomic_and to atomic_and_val and atomic_or to atomic_or_val. Define new macros atomic_and and atomic_or which do not return values. * sysdeps/x86_64/bits/atomic.h: Define atomic_and and atomic_or. Various cleanups. * sysdeps/i386/i486/bits/atomic.h: Likewise. * po/sv.po: Update from translation team. 2006-10-07 Ulrich Drepper <drepper@redhat.com> * Versions.def: Add GLIBC_2.6 to libpthread. * include/shlib-compat.h (SHLIB_COMPAT): Expand parameters before use. (versioned_symbol): Likewise. (compat_symbol): Likewise. * po/tr.po: Update from translation team. * nis/Banner: Removed. It's been integral part forever and the author info is incomplete anyway. * libio/Banner: Likewise. 2006-10-06 Ulrich Drepper <drepper@redhat.com> * version.h (VERSION): Bump to 2.5.90 for new development tree.
930 lines
23 KiB
C
930 lines
23 KiB
C
/* Implementation of the locale program according to POSIX 9945-2.
|
|
Copyright (C) 1995-1997, 1999-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 <argz.h>
|
|
#include <dirent.h>
|
|
#include <errno.h>
|
|
#include <error.h>
|
|
#include <fcntl.h>
|
|
#include <langinfo.h>
|
|
#include <libintl.h>
|
|
#include <limits.h>
|
|
#include <locale.h>
|
|
#include <search.h>
|
|
#include <stdio.h>
|
|
#include <stdio_ext.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include "localeinfo.h"
|
|
#include "charmap-dir.h"
|
|
#include "../locarchive.h"
|
|
|
|
extern void *xmalloc (size_t __n);
|
|
extern char *xstrdup (const char *__str);
|
|
|
|
#define ARCHIVE_NAME LOCALEDIR "/locale-archive"
|
|
|
|
/* If set print the name of the category. */
|
|
static int show_category_name;
|
|
|
|
/* If set print the name of the item. */
|
|
static int show_keyword_name;
|
|
|
|
/* Print names of all available locales. */
|
|
static int do_all;
|
|
|
|
/* Print names of all available character maps. */
|
|
static int do_charmaps = 0;
|
|
|
|
/* Nonzero if verbose output is wanted. */
|
|
static int verbose;
|
|
|
|
/* 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;
|
|
|
|
/* Definitions of arguments for argp functions. */
|
|
static const struct argp_option options[] =
|
|
{
|
|
{ NULL, 0, NULL, 0, N_("System information:") },
|
|
{ "all-locales", 'a', NULL, OPTION_NO_USAGE,
|
|
N_("Write names of available locales") },
|
|
{ "charmaps", 'm', NULL, OPTION_NO_USAGE,
|
|
N_("Write names of available charmaps") },
|
|
{ NULL, 0, NULL, 0, N_("Modify output format:") },
|
|
{ "category-name", 'c', NULL, 0, N_("Write names of selected categories") },
|
|
{ "keyword-name", 'k', NULL, 0, N_("Write names of selected keywords") },
|
|
{ "verbose", 'v', NULL, 0, N_("Print more information") },
|
|
{ NULL, 0, NULL, 0, NULL }
|
|
};
|
|
|
|
/* Short description of program. */
|
|
static const char doc[] = N_("Get locale-specific information.\v\
|
|
For bug reporting instructions, please see:\n\
|
|
<http://www.gnu.org/software/libc/bugs.html>.\n");
|
|
|
|
/* Strings for arguments in help texts. */
|
|
static const char args_doc[] = N_("NAME\n[-a|-m]");
|
|
|
|
/* Prototype for option handler. */
|
|
static error_t parse_opt (int key, char *arg, struct argp_state *state);
|
|
|
|
/* Data structure to communicate with argp functions. */
|
|
static struct argp argp =
|
|
{
|
|
options, parse_opt, args_doc, doc
|
|
};
|
|
|
|
|
|
/* We don't have these constants defined because we don't use them. Give
|
|
default values. */
|
|
#define CTYPE_MB_CUR_MIN 0
|
|
#define CTYPE_MB_CUR_MAX 0
|
|
#define CTYPE_HASH_SIZE 0
|
|
#define CTYPE_HASH_LAYERS 0
|
|
#define CTYPE_CLASS 0
|
|
#define CTYPE_TOUPPER_EB 0
|
|
#define CTYPE_TOLOWER_EB 0
|
|
#define CTYPE_TOUPPER_EL 0
|
|
#define CTYPE_TOLOWER_EL 0
|
|
|
|
/* Definition of the data structure which represents a category and its
|
|
items. */
|
|
struct category
|
|
{
|
|
int cat_id;
|
|
const char *name;
|
|
size_t number;
|
|
struct cat_item
|
|
{
|
|
int item_id;
|
|
const char *name;
|
|
enum { std, opt } status;
|
|
enum value_type value_type;
|
|
int min;
|
|
int max;
|
|
} *item_desc;
|
|
};
|
|
|
|
/* Simple helper macro. */
|
|
#define NELEMS(arr) ((sizeof (arr)) / (sizeof (arr[0])))
|
|
|
|
/* For some tricky stuff. */
|
|
#define NO_PAREN(Item, More...) Item, ## More
|
|
|
|
/* We have all categories defined in `categories.def'. Now construct
|
|
the description and data structure used for all categories. */
|
|
#define DEFINE_ELEMENT(Item, More...) { Item, ## More },
|
|
#define DEFINE_CATEGORY(category, name, items, postload) \
|
|
static struct cat_item category##_desc[] = \
|
|
{ \
|
|
NO_PAREN items \
|
|
};
|
|
|
|
#include "categories.def"
|
|
#undef DEFINE_CATEGORY
|
|
|
|
static struct category category[] =
|
|
{
|
|
#define DEFINE_CATEGORY(category, name, items, postload) \
|
|
[category] = { _NL_NUM_##category, name, NELEMS (category##_desc), \
|
|
category##_desc },
|
|
#include "categories.def"
|
|
#undef DEFINE_CATEGORY
|
|
};
|
|
#define NCATEGORIES NELEMS (category)
|
|
|
|
|
|
/* Automatically set variable. */
|
|
extern const char *__progname;
|
|
|
|
/* helper function for extended name handling. */
|
|
extern void locale_special (const char *name, int show_category_name,
|
|
int show_keyword_name);
|
|
|
|
/* Prototypes for local functions. */
|
|
static void print_LC_IDENTIFICATION (void *mapped, size_t size);
|
|
static void print_LC_CTYPE (void *mapped, size_t size);
|
|
static void write_locales (void);
|
|
static int nameentcmp (const void *a, const void *b);
|
|
static int write_archive_locales (void **all_datap, char *linebuf);
|
|
static void write_charmaps (void);
|
|
static void show_locale_vars (void);
|
|
static void show_info (const char *name);
|
|
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
int remaining;
|
|
|
|
/* Set initial values for global variables. */
|
|
show_category_name = 0;
|
|
show_keyword_name = 0;
|
|
|
|
/* Set locale. Do not set LC_ALL because the other categories must
|
|
not be affected (according to POSIX.2). */
|
|
if (setlocale (LC_CTYPE, "") == NULL)
|
|
error (0, errno, gettext ("Cannot set LC_CTYPE to default locale"));
|
|
if (setlocale (LC_MESSAGES, "") == NULL)
|
|
error (0, errno, gettext ("Cannot set LC_MESSAGES to default locale"));
|
|
|
|
/* Initialize the message catalog. */
|
|
textdomain (PACKAGE);
|
|
|
|
/* Parse and process arguments. */
|
|
argp_parse (&argp, argc, argv, 0, &remaining, NULL);
|
|
|
|
/* `-a' requests the names of all available locales. */
|
|
if (do_all != 0)
|
|
{
|
|
if (setlocale (LC_COLLATE, "") == NULL)
|
|
error (0, errno,
|
|
gettext ("Cannot set LC_COLLATE to default locale"));
|
|
write_locales ();
|
|
exit (EXIT_SUCCESS);
|
|
}
|
|
|
|
/* `m' requests the names of all available charmaps. The names can be
|
|
used for the -f argument to localedef(1). */
|
|
if (do_charmaps != 0)
|
|
{
|
|
write_charmaps ();
|
|
exit (EXIT_SUCCESS);
|
|
}
|
|
|
|
/* Specific information about the current locale are requested.
|
|
Change to this locale now. */
|
|
if (setlocale (LC_ALL, "") == NULL)
|
|
error (0, errno, gettext ("Cannot set LC_ALL to default locale"));
|
|
|
|
/* If no real argument is given we have to print the contents of the
|
|
current locale definition variables. These are LANG and the LC_*. */
|
|
if (remaining == argc && show_keyword_name == 0 && show_category_name == 0)
|
|
{
|
|
show_locale_vars ();
|
|
exit (EXIT_SUCCESS);
|
|
}
|
|
|
|
/* Process all given names. */
|
|
while (remaining < argc)
|
|
show_info (argv[remaining++]);
|
|
|
|
exit (EXIT_SUCCESS);
|
|
}
|
|
|
|
|
|
/* Handle program arguments. */
|
|
static error_t
|
|
parse_opt (int key, char *arg, struct argp_state *state)
|
|
{
|
|
switch (key)
|
|
{
|
|
case 'a':
|
|
do_all = 1;
|
|
break;
|
|
case 'c':
|
|
show_category_name = 1;
|
|
break;
|
|
case 'm':
|
|
do_charmaps = 1;
|
|
break;
|
|
case 'k':
|
|
show_keyword_name = 1;
|
|
break;
|
|
case 'v':
|
|
verbose = 1;
|
|
break;
|
|
default:
|
|
return ARGP_ERR_UNKNOWN;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Print the version information. */
|
|
static void
|
|
print_version (FILE *stream, struct argp_state *state)
|
|
{
|
|
fprintf (stream, "locale (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");
|
|
}
|
|
|
|
|
|
/* Simple action function which prints arguments as strings. */
|
|
static void
|
|
print_names (const void *nodep, VISIT value, int level)
|
|
{
|
|
if (value == postorder || value == leaf)
|
|
puts (*(char **) nodep);
|
|
}
|
|
|
|
|
|
static int
|
|
select_dirs (const struct dirent *dirent)
|
|
{
|
|
int result = 0;
|
|
|
|
if (strcmp (dirent->d_name, ".") != 0 && strcmp (dirent->d_name, "..") != 0)
|
|
{
|
|
mode_t mode = 0;
|
|
|
|
#ifdef _DIRENT_HAVE_D_TYPE
|
|
if (dirent->d_type != DT_UNKNOWN && dirent->d_type != DT_LNK)
|
|
mode = DTTOIF (dirent->d_type);
|
|
else
|
|
#endif
|
|
{
|
|
struct stat64 st;
|
|
char buf[sizeof (LOCALEDIR) + strlen (dirent->d_name) + 1];
|
|
|
|
stpcpy (stpcpy (stpcpy (buf, LOCALEDIR), "/"), dirent->d_name);
|
|
|
|
if (stat64 (buf, &st) == 0)
|
|
mode = st.st_mode;
|
|
}
|
|
|
|
result = S_ISDIR (mode);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static void
|
|
print_LC_IDENTIFICATION (void *mapped, size_t size)
|
|
{
|
|
/* Read the information from the file. */
|
|
struct
|
|
{
|
|
unsigned int magic;
|
|
unsigned int nstrings;
|
|
unsigned int strindex[0];
|
|
} *filedata = mapped;
|
|
|
|
if (filedata->magic == LIMAGIC (LC_IDENTIFICATION)
|
|
&& (sizeof *filedata
|
|
+ (filedata->nstrings
|
|
* sizeof (unsigned int))
|
|
<= size))
|
|
{
|
|
const char *str;
|
|
|
|
#define HANDLE(idx, name) \
|
|
str = ((char *) mapped \
|
|
+ filedata->strindex[_NL_ITEM_INDEX (_NL_IDENTIFICATION_##idx)]); \
|
|
if (*str != '\0') \
|
|
printf ("%9s | %s\n", name, str)
|
|
HANDLE (TITLE, "title");
|
|
HANDLE (SOURCE, "source");
|
|
HANDLE (ADDRESS, "address");
|
|
HANDLE (CONTACT, "contact");
|
|
HANDLE (EMAIL, "email");
|
|
HANDLE (TEL, "telephone");
|
|
HANDLE (FAX, "fax");
|
|
HANDLE (LANGUAGE, "language");
|
|
HANDLE (TERRITORY, "territory");
|
|
HANDLE (AUDIENCE, "audience");
|
|
HANDLE (APPLICATION, "application");
|
|
HANDLE (ABBREVIATION, "abbreviation");
|
|
HANDLE (REVISION, "revision");
|
|
HANDLE (DATE, "date");
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
print_LC_CTYPE (void *mapped, size_t size)
|
|
{
|
|
struct
|
|
{
|
|
unsigned int magic;
|
|
unsigned int nstrings;
|
|
unsigned int strindex[0];
|
|
} *filedata = mapped;
|
|
|
|
if (filedata->magic == LIMAGIC (LC_CTYPE)
|
|
&& (sizeof *filedata
|
|
+ (filedata->nstrings
|
|
* sizeof (unsigned int))
|
|
<= size))
|
|
{
|
|
const char *str;
|
|
|
|
str = ((char *) mapped
|
|
+ filedata->strindex[_NL_ITEM_INDEX (_NL_CTYPE_CODESET_NAME)]);
|
|
if (*str != '\0')
|
|
printf (" codeset | %s\n", str);
|
|
}
|
|
}
|
|
|
|
|
|
/* Write the names of all available locales to stdout. We have some
|
|
sources of the information: the contents of the locale directory
|
|
and the locale.alias file. To avoid duplicates and print the
|
|
result is a reasonable order we put all entries is a search tree
|
|
and print them afterwards. */
|
|
static void
|
|
write_locales (void)
|
|
{
|
|
char linebuf[80];
|
|
void *all_data = NULL;
|
|
struct dirent **dirents;
|
|
int ndirents;
|
|
int cnt;
|
|
char *alias_path;
|
|
size_t alias_path_len;
|
|
char *entry;
|
|
int first_locale = 1;
|
|
|
|
#define PUT(name) tsearch (name, &all_data, \
|
|
(int (*) (const void *, const void *)) strcoll)
|
|
#define GET(name) tfind (name, &all_data, \
|
|
(int (*) (const void *, const void *)) strcoll)
|
|
|
|
/* `POSIX' locale is always available (POSIX.2 4.34.3). */
|
|
PUT ("POSIX");
|
|
/* And so is the "C" locale. */
|
|
PUT ("C");
|
|
|
|
memset (linebuf, '-', sizeof (linebuf) - 1);
|
|
linebuf[sizeof (linebuf) - 1] = '\0';
|
|
|
|
/* First scan the locale archive. */
|
|
if (write_archive_locales (&all_data, linebuf))
|
|
first_locale = 0;
|
|
|
|
/* Now we can look for all files in the directory. */
|
|
ndirents = scandir (LOCALEDIR, &dirents, select_dirs, alphasort);
|
|
for (cnt = 0; cnt < ndirents; ++cnt)
|
|
{
|
|
/* Test whether at least the LC_CTYPE data is there. Some
|
|
directories only contain translations. */
|
|
char buf[sizeof (LOCALEDIR) + strlen (dirents[cnt]->d_name)
|
|
+ sizeof "/LC_IDENTIFICATION"];
|
|
char *enddir;
|
|
struct stat64 st;
|
|
|
|
stpcpy (enddir = stpcpy (stpcpy (stpcpy (buf, LOCALEDIR), "/"),
|
|
dirents[cnt]->d_name),
|
|
"/LC_IDENTIFICATION");
|
|
|
|
if (stat64 (buf, &st) == 0 && S_ISREG (st.st_mode))
|
|
{
|
|
if (verbose && GET (dirents[cnt]->d_name) == NULL)
|
|
{
|
|
/* Provide some nice output of all kinds of
|
|
information. */
|
|
int fd;
|
|
|
|
if (! first_locale)
|
|
putchar_unlocked ('\n');
|
|
first_locale = 0;
|
|
|
|
printf ("locale: %-15.15s directory: %.*s\n%s\n",
|
|
dirents[cnt]->d_name, (int) (enddir - buf), buf,
|
|
linebuf);
|
|
|
|
fd = open64 (buf, O_RDONLY);
|
|
if (fd != -1)
|
|
{
|
|
void *mapped = mmap64 (NULL, st.st_size, PROT_READ,
|
|
MAP_SHARED, fd, 0);
|
|
if (mapped != MAP_FAILED)
|
|
{
|
|
print_LC_IDENTIFICATION (mapped, st.st_size);
|
|
|
|
munmap (mapped, st.st_size);
|
|
}
|
|
|
|
close (fd);
|
|
|
|
/* Now try to get the charset information. */
|
|
strcpy (enddir, "/LC_CTYPE");
|
|
fd = open64 (buf, O_RDONLY);
|
|
if (fd != -1 && fstat64 (fd, &st) >= 0
|
|
&& ((mapped = mmap64 (NULL, st.st_size, PROT_READ,
|
|
MAP_SHARED, fd, 0))
|
|
!= MAP_FAILED))
|
|
{
|
|
print_LC_CTYPE (mapped, st.st_size);
|
|
|
|
munmap (mapped, st.st_size);
|
|
}
|
|
|
|
if (fd != -1)
|
|
close (fd);
|
|
}
|
|
}
|
|
|
|
/* If the verbose format is not selected we simply
|
|
collect the names. */
|
|
PUT (xstrdup (dirents[cnt]->d_name));
|
|
}
|
|
}
|
|
if (ndirents > 0)
|
|
free (dirents);
|
|
|
|
/* Now read the locale.alias files. */
|
|
if (argz_create_sep (LOCALE_ALIAS_PATH, ':', &alias_path, &alias_path_len))
|
|
error (1, errno, gettext ("while preparing output"));
|
|
|
|
entry = NULL;
|
|
while ((entry = argz_next (alias_path, alias_path_len, entry)))
|
|
{
|
|
static const char aliasfile[] = "/locale.alias";
|
|
FILE *fp;
|
|
char full_name[strlen (entry) + sizeof aliasfile];
|
|
|
|
stpcpy (stpcpy (full_name, entry), aliasfile);
|
|
fp = fopen (full_name, "rm");
|
|
if (fp == NULL)
|
|
/* Ignore non-existing files. */
|
|
continue;
|
|
|
|
/* No threads present. */
|
|
__fsetlocking (fp, FSETLOCKING_BYCALLER);
|
|
|
|
while (! feof_unlocked (fp))
|
|
{
|
|
/* It is a reasonable approach to use a fix buffer here
|
|
because
|
|
a) we are only interested in the first two fields
|
|
b) these fields must be usable as file names and so must
|
|
not be that long */
|
|
char buf[BUFSIZ];
|
|
char *alias;
|
|
char *value;
|
|
char *cp;
|
|
|
|
if (fgets_unlocked (buf, BUFSIZ, fp) == NULL)
|
|
/* EOF reached. */
|
|
break;
|
|
|
|
cp = buf;
|
|
/* Ignore leading white space. */
|
|
while (isspace (cp[0]) && cp[0] != '\n')
|
|
++cp;
|
|
|
|
/* A leading '#' signals a comment line. */
|
|
if (cp[0] != '\0' && cp[0] != '#' && cp[0] != '\n')
|
|
{
|
|
alias = cp++;
|
|
while (cp[0] != '\0' && !isspace (cp[0]))
|
|
++cp;
|
|
/* Terminate alias name. */
|
|
if (cp[0] != '\0')
|
|
*cp++ = '\0';
|
|
|
|
/* Now look for the beginning of the value. */
|
|
while (isspace (cp[0]))
|
|
++cp;
|
|
|
|
if (cp[0] != '\0')
|
|
{
|
|
value = cp++;
|
|
while (cp[0] != '\0' && !isspace (cp[0]))
|
|
++cp;
|
|
/* Terminate value. */
|
|
if (cp[0] == '\n')
|
|
{
|
|
/* This has to be done to make the following
|
|
test for the end of line possible. We are
|
|
looking for the terminating '\n' which do not
|
|
overwrite here. */
|
|
*cp++ = '\0';
|
|
*cp = '\n';
|
|
}
|
|
else if (cp[0] != '\0')
|
|
*cp++ = '\0';
|
|
|
|
/* Add the alias. */
|
|
if (! verbose && GET (value) != NULL)
|
|
PUT (xstrdup (alias));
|
|
}
|
|
}
|
|
|
|
/* Possibly not the whole line fits into the buffer.
|
|
Ignore the rest of the line. */
|
|
while (strchr (cp, '\n') == NULL)
|
|
{
|
|
cp = buf;
|
|
if (fgets_unlocked (buf, BUFSIZ, fp) == NULL)
|
|
/* Make sure the inner loop will be left. The outer
|
|
loop will exit at the `feof' test. */
|
|
*cp = '\n';
|
|
}
|
|
}
|
|
|
|
fclose (fp);
|
|
}
|
|
|
|
if (! verbose)
|
|
{
|
|
twalk (all_data, print_names);
|
|
}
|
|
}
|
|
|
|
|
|
struct nameent
|
|
{
|
|
char *name;
|
|
uint32_t locrec_offset;
|
|
};
|
|
|
|
|
|
static int
|
|
nameentcmp (const void *a, const void *b)
|
|
{
|
|
return strcoll (((const struct nameent *) a)->name,
|
|
((const struct nameent *) b)->name);
|
|
}
|
|
|
|
|
|
static int
|
|
write_archive_locales (void **all_datap, char *linebuf)
|
|
{
|
|
struct stat64 st;
|
|
void *all_data = *all_datap;
|
|
size_t len = 0;
|
|
struct locarhead *head;
|
|
struct namehashent *namehashtab;
|
|
char *addr = MAP_FAILED;
|
|
int fd, ret = 0;
|
|
uint32_t cnt;
|
|
|
|
fd = open64 (ARCHIVE_NAME, O_RDONLY);
|
|
if (fd < 0)
|
|
return 0;
|
|
|
|
if (fstat64 (fd, &st) < 0 || st.st_size < sizeof (*head))
|
|
goto error_out;
|
|
|
|
len = st.st_size;
|
|
addr = mmap64 (NULL, len, PROT_READ, MAP_SHARED, fd, 0);
|
|
if (addr == MAP_FAILED)
|
|
goto error_out;
|
|
|
|
head = (struct locarhead *) addr;
|
|
if (head->namehash_offset + head->namehash_size > len
|
|
|| head->string_offset + head->string_size > len
|
|
|| head->locrectab_offset + head->locrectab_size > len
|
|
|| head->sumhash_offset + head->sumhash_size > len)
|
|
goto error_out;
|
|
|
|
namehashtab = (struct namehashent *) (addr + head->namehash_offset);
|
|
if (! verbose)
|
|
{
|
|
for (cnt = 0; cnt < head->namehash_size; ++cnt)
|
|
if (namehashtab[cnt].locrec_offset != 0)
|
|
{
|
|
PUT (xstrdup (addr + namehashtab[cnt].name_offset));
|
|
++ret;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
struct nameent *names;
|
|
uint32_t used;
|
|
|
|
names = (struct nameent *) xmalloc (head->namehash_used
|
|
* sizeof (struct nameent));
|
|
for (cnt = used = 0; cnt < head->namehash_size; ++cnt)
|
|
if (namehashtab[cnt].locrec_offset != 0)
|
|
{
|
|
names[used].name = addr + namehashtab[cnt].name_offset;
|
|
names[used++].locrec_offset = namehashtab[cnt].locrec_offset;
|
|
}
|
|
|
|
/* Sort the names. */
|
|
qsort (names, used, sizeof (struct nameent), nameentcmp);
|
|
|
|
for (cnt = 0; cnt < used; ++cnt)
|
|
{
|
|
struct locrecent *locrec;
|
|
|
|
PUT (xstrdup (names[cnt].name));
|
|
|
|
if (cnt)
|
|
putchar_unlocked ('\n');
|
|
|
|
printf ("locale: %-15.15s archive: " ARCHIVE_NAME "\n%s\n",
|
|
names[cnt].name, linebuf);
|
|
|
|
locrec = (struct locrecent *) (addr + names[cnt].locrec_offset);
|
|
|
|
print_LC_IDENTIFICATION (addr
|
|
+ locrec->record[LC_IDENTIFICATION].offset,
|
|
locrec->record[LC_IDENTIFICATION].len);
|
|
|
|
print_LC_CTYPE (addr + locrec->record[LC_CTYPE].offset,
|
|
locrec->record[LC_CTYPE].len);
|
|
}
|
|
|
|
ret = used;
|
|
}
|
|
|
|
error_out:
|
|
if (addr != MAP_FAILED)
|
|
munmap (addr, len);
|
|
close (fd);
|
|
*all_datap = all_data;
|
|
return ret;
|
|
}
|
|
|
|
|
|
/* Write the names of all available character maps to stdout. */
|
|
static void
|
|
write_charmaps (void)
|
|
{
|
|
void *all_data = NULL;
|
|
CHARMAP_DIR *dir;
|
|
const char *dirent;
|
|
|
|
/* Look for all files in the charmap directory. */
|
|
dir = charmap_opendir (CHARMAP_PATH);
|
|
if (dir == NULL)
|
|
return;
|
|
|
|
while ((dirent = charmap_readdir (dir)) != NULL)
|
|
{
|
|
char **aliases;
|
|
char **p;
|
|
|
|
PUT (xstrdup (dirent));
|
|
|
|
aliases = charmap_aliases (CHARMAP_PATH, dirent);
|
|
|
|
#if 0
|
|
/* Add the code_set_name and the aliases. */
|
|
for (p = aliases; *p; p++)
|
|
PUT (xstrdup (*p));
|
|
#else
|
|
/* Add the code_set_name only. Most aliases are obsolete. */
|
|
p = aliases;
|
|
if (*p)
|
|
PUT (xstrdup (*p));
|
|
#endif
|
|
|
|
charmap_free_aliases (aliases);
|
|
}
|
|
|
|
charmap_closedir (dir);
|
|
|
|
twalk (all_data, print_names);
|
|
}
|
|
|
|
|
|
/* We have to show the contents of the environments determining the
|
|
locale. */
|
|
static void
|
|
show_locale_vars (void)
|
|
{
|
|
size_t cat_no;
|
|
const char *lcall = getenv ("LC_ALL");
|
|
const char *lang = getenv ("LANG") ? : "";
|
|
|
|
auto void get_source (const char *name);
|
|
|
|
void get_source (const char *name)
|
|
{
|
|
char *val = getenv (name);
|
|
|
|
if ((lcall ?: "")[0] != '\0' || val == NULL)
|
|
printf ("%s=\"%s\"\n", name,
|
|
(lcall ?: "")[0] ? lcall : (lang ?: "")[0] ? lang : "POSIX");
|
|
else
|
|
printf ("%s=%s\n", name, val);
|
|
}
|
|
|
|
/* LANG has to be the first value. */
|
|
printf ("LANG=%s\n", lang);
|
|
|
|
/* Now all categories in an unspecified order. */
|
|
for (cat_no = 0; cat_no < NCATEGORIES; ++cat_no)
|
|
if (cat_no != LC_ALL)
|
|
get_source (category[cat_no].name);
|
|
|
|
/* The last is the LC_ALL value. */
|
|
printf ("LC_ALL=%s\n", lcall ? : "");
|
|
}
|
|
|
|
|
|
/* Show the information request for NAME. */
|
|
static void
|
|
show_info (const char *name)
|
|
{
|
|
size_t cat_no;
|
|
|
|
auto void print_item (struct cat_item *item);
|
|
|
|
void print_item (struct cat_item *item)
|
|
{
|
|
switch (item->value_type)
|
|
{
|
|
case string:
|
|
if (show_keyword_name)
|
|
printf ("%s=\"", item->name);
|
|
fputs (nl_langinfo (item->item_id) ? : "", stdout);
|
|
if (show_keyword_name)
|
|
putchar ('"');
|
|
putchar ('\n');
|
|
break;
|
|
case stringarray:
|
|
{
|
|
int cnt;
|
|
const char *val;
|
|
|
|
if (show_keyword_name)
|
|
printf ("%s=\"", item->name);
|
|
|
|
for (cnt = 0; cnt < item->max - 1; ++cnt)
|
|
{
|
|
val = nl_langinfo (item->item_id + cnt);
|
|
if (val != NULL)
|
|
fputs (val, stdout);
|
|
putchar (';');
|
|
}
|
|
|
|
val = nl_langinfo (item->item_id + cnt);
|
|
if (val != NULL)
|
|
fputs (val, stdout);
|
|
|
|
if (show_keyword_name)
|
|
putchar ('"');
|
|
putchar ('\n');
|
|
}
|
|
break;
|
|
case stringlist:
|
|
{
|
|
int first = 1;
|
|
const char *val = nl_langinfo (item->item_id) ? : "";
|
|
int cnt;
|
|
|
|
if (show_keyword_name)
|
|
printf ("%s=", item->name);
|
|
|
|
for (cnt = 0; cnt < item->max && *val != '\0'; ++cnt)
|
|
{
|
|
printf ("%s%s%s%s", first ? "" : ";",
|
|
show_keyword_name ? "\"" : "", val,
|
|
show_keyword_name ? "\"" : "");
|
|
val = strchr (val, '\0') + 1;
|
|
first = 0;
|
|
}
|
|
putchar ('\n');
|
|
}
|
|
break;
|
|
case byte:
|
|
{
|
|
const char *val = nl_langinfo (item->item_id);
|
|
|
|
if (show_keyword_name)
|
|
printf ("%s=", item->name);
|
|
|
|
if (val != NULL)
|
|
printf ("%d", *val == '\177' ? -1 : *val);
|
|
putchar ('\n');
|
|
}
|
|
break;
|
|
case bytearray:
|
|
{
|
|
const char *val = nl_langinfo (item->item_id);
|
|
int cnt = val ? strlen (val) : 0;
|
|
|
|
if (show_keyword_name)
|
|
printf ("%s=", item->name);
|
|
|
|
while (cnt > 1)
|
|
{
|
|
printf ("%d;", *val == '\177' ? -1 : *val);
|
|
--cnt;
|
|
++val;
|
|
}
|
|
|
|
printf ("%d\n", cnt == 0 || *val == '\177' ? -1 : *val);
|
|
}
|
|
break;
|
|
case word:
|
|
{
|
|
union { unsigned int word; char *string; } val;
|
|
val.string = nl_langinfo (item->item_id);
|
|
if (show_keyword_name)
|
|
printf ("%s=", item->name);
|
|
|
|
printf ("%d\n", val.word);
|
|
}
|
|
break;
|
|
case wstring:
|
|
case wstringarray:
|
|
case wstringlist:
|
|
/* We don't print wide character information since the same
|
|
information is available in a multibyte string. */
|
|
default:
|
|
break;
|
|
|
|
}
|
|
}
|
|
|
|
for (cat_no = 0; cat_no < NCATEGORIES; ++cat_no)
|
|
if (cat_no != LC_ALL)
|
|
{
|
|
size_t item_no;
|
|
|
|
if (strcmp (name, category[cat_no].name) == 0)
|
|
/* Print the whole category. */
|
|
{
|
|
if (show_category_name != 0)
|
|
puts (category[cat_no].name);
|
|
|
|
for (item_no = 0; item_no < category[cat_no].number; ++item_no)
|
|
print_item (&category[cat_no].item_desc[item_no]);
|
|
|
|
return;
|
|
}
|
|
|
|
for (item_no = 0; item_no < category[cat_no].number; ++item_no)
|
|
if (strcmp (name, category[cat_no].item_desc[item_no].name) == 0)
|
|
{
|
|
if (show_category_name != 0)
|
|
puts (category[cat_no].name);
|
|
|
|
print_item (&category[cat_no].item_desc[item_no]);
|
|
return;
|
|
}
|
|
}
|
|
|
|
/* The name is not a standard one.
|
|
For testing and perhaps advanced use allow some more symbols. */
|
|
locale_special (name, show_category_name, show_keyword_name);
|
|
}
|