mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 06:20: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.
791 lines
20 KiB
C
791 lines
20 KiB
C
/* Convert text in given files from the specified from-set to the to-set.
|
|
Copyright (C) 1998-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
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. */
|
|
|
|
#include <argp.h>
|
|
#include <assert.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <error.h>
|
|
#include <fcntl.h>
|
|
#include <iconv.h>
|
|
#include <langinfo.h>
|
|
#include <locale.h>
|
|
#include <search.h>
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <libintl.h>
|
|
#ifdef _POSIX_MAPPED_FILES
|
|
# include <sys/mman.h>
|
|
#endif
|
|
#include <charmap.h>
|
|
#include <gconv_int.h>
|
|
#include "iconv_prog.h"
|
|
#include "iconvconfig.h"
|
|
|
|
/* Get libc version number. */
|
|
#include "../version.h"
|
|
|
|
#define PACKAGE _libc_intl_domainname
|
|
|
|
|
|
/* 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_VERBOSE 1000
|
|
#define OPT_LIST 'l'
|
|
|
|
/* Definitions of arguments for argp functions. */
|
|
static const struct argp_option options[] =
|
|
{
|
|
{ NULL, 0, NULL, 0, N_("Input/Output format specification:") },
|
|
{ "from-code", 'f', "NAME", 0, N_("encoding of original text") },
|
|
{ "to-code", 't', "NAME", 0, N_("encoding for output") },
|
|
{ NULL, 0, NULL, 0, N_("Information:") },
|
|
{ "list", 'l', NULL, 0, N_("list all known coded character sets") },
|
|
{ NULL, 0, NULL, 0, N_("Output control:") },
|
|
{ NULL, 'c', NULL, 0, N_("omit invalid characters from output") },
|
|
{ "output", 'o', "FILE", 0, N_("output file") },
|
|
{ "silent", 's', NULL, 0, N_("suppress warnings") },
|
|
{ "verbose", OPT_VERBOSE, NULL, 0, N_("print progress information") },
|
|
{ NULL, 0, NULL, 0, NULL }
|
|
};
|
|
|
|
/* Short description of program. */
|
|
static const char doc[] = N_("\
|
|
Convert encoding of given files from one encoding to another.");
|
|
|
|
/* Strings for arguments in help texts. */
|
|
static const char args_doc[] = N_("[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
|
|
};
|
|
|
|
/* Code sets to convert from and to respectively. An empty string as the
|
|
default causes the 'iconv_open' function to look up the charset of the
|
|
currently selected locale and use it. */
|
|
static const char *from_code = "";
|
|
static const char *to_code = "";
|
|
|
|
/* File to write output to. If NULL write to stdout. */
|
|
static const char *output_file;
|
|
|
|
/* Nonzero if verbose ouput is wanted. */
|
|
int verbose;
|
|
|
|
/* Nonzero if list of all coded character sets is wanted. */
|
|
static int list;
|
|
|
|
/* If nonzero omit invalid character from output. */
|
|
int omit_invalid;
|
|
|
|
/* Prototypes for the functions doing the actual work. */
|
|
static int process_block (iconv_t cd, char *addr, size_t len, FILE *output);
|
|
static int process_fd (iconv_t cd, int fd, FILE *output);
|
|
static int process_file (iconv_t cd, FILE *input, FILE *output);
|
|
static void print_known_names (void) internal_function;
|
|
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
int status = EXIT_SUCCESS;
|
|
int remaining;
|
|
FILE *output;
|
|
iconv_t cd;
|
|
const char *orig_to_code;
|
|
struct charmap_t *from_charmap = NULL;
|
|
struct charmap_t *to_charmap = NULL;
|
|
|
|
/* Set locale via LC_ALL. */
|
|
setlocale (LC_ALL, "");
|
|
|
|
/* Set the text message domain. */
|
|
textdomain (_libc_intl_domainname);
|
|
|
|
/* Parse and process arguments. */
|
|
argp_parse (&argp, argc, argv, 0, &remaining, NULL);
|
|
|
|
/* List all coded character sets if wanted. */
|
|
if (list)
|
|
{
|
|
print_known_names ();
|
|
exit (EXIT_SUCCESS);
|
|
}
|
|
|
|
/* If we have to ignore errors make sure we use the appropriate name for
|
|
the to-character-set. */
|
|
orig_to_code = to_code;
|
|
if (omit_invalid)
|
|
{
|
|
const char *errhand = strchrnul (to_code, '/');
|
|
int nslash = 2;
|
|
char *newp;
|
|
char *cp;
|
|
|
|
if (*errhand == '/')
|
|
{
|
|
--nslash;
|
|
errhand = strchrnul (errhand, '/');
|
|
|
|
if (*errhand == '/')
|
|
{
|
|
--nslash;
|
|
errhand = strchr (errhand, '\0');
|
|
}
|
|
}
|
|
|
|
newp = (char *) alloca (errhand - to_code + nslash + 7 + 1);
|
|
cp = mempcpy (newp, to_code, errhand - to_code);
|
|
while (nslash-- > 0)
|
|
*cp++ = '/';
|
|
if (cp[-1] != '/')
|
|
*cp++ = ',';
|
|
memcpy (cp, "IGNORE", sizeof ("IGNORE"));
|
|
|
|
to_code = newp;
|
|
}
|
|
|
|
/* POSIX 1003.2b introduces a silly thing: the arguments to -t anf -f
|
|
can be file names of charmaps. In this case iconv will have to read
|
|
those charmaps and use them to do the conversion. But there are
|
|
holes in the specification. There is nothing said that if -f is a
|
|
charmap filename that -t must be, too. And vice versa. There is
|
|
also no word about the symbolic names used. What if they don't
|
|
match? */
|
|
if (strchr (from_code, '/') != NULL)
|
|
/* The from-name might be a charmap file name. Try reading the
|
|
file. */
|
|
from_charmap = charmap_read (from_code, /*0, 1*/1, 0, 0, 0);
|
|
|
|
if (strchr (orig_to_code, '/') != NULL)
|
|
/* The to-name might be a charmap file name. Try reading the
|
|
file. */
|
|
to_charmap = charmap_read (orig_to_code, /*0, 1,*/1, 0, 0, 0);
|
|
|
|
|
|
/* Determine output file. */
|
|
if (output_file != NULL && strcmp (output_file, "-") != 0)
|
|
{
|
|
output = fopen (output_file, "w");
|
|
if (output == NULL)
|
|
error (EXIT_FAILURE, errno, _("cannot open output file"));
|
|
}
|
|
else
|
|
output = stdout;
|
|
|
|
/* At this point we have to handle two cases. The first one is
|
|
where a charmap is used for the from- or to-charset, or both. We
|
|
handle this special since it is very different from the sane way of
|
|
doing things. The other case allows converting using the iconv()
|
|
function. */
|
|
if (from_charmap != NULL || to_charmap != NULL)
|
|
/* Construct the conversion table and do the conversion. */
|
|
status = charmap_conversion (from_code, from_charmap, to_code, to_charmap,
|
|
argc, remaining, argv, output);
|
|
else
|
|
{
|
|
/* Let's see whether we have these coded character sets. */
|
|
cd = iconv_open (to_code, from_code);
|
|
if (cd == (iconv_t) -1)
|
|
{
|
|
if (errno == EINVAL)
|
|
{
|
|
/* Try to be nice with the user and tell her which of the
|
|
two encoding names is wrong. This is possible because
|
|
all supported encodings can be converted from/to Unicode,
|
|
in other words, because the graph of encodings is
|
|
connected. */
|
|
bool from_wrong =
|
|
(iconv_open ("UTF-8", from_code) == (iconv_t) -1
|
|
&& errno == EINVAL);
|
|
bool to_wrong =
|
|
(iconv_open (to_code, "UTF-8") == (iconv_t) -1
|
|
&& errno == EINVAL);
|
|
const char *from_pretty =
|
|
(from_code[0] ? from_code : nl_langinfo (CODESET));
|
|
const char *to_pretty =
|
|
(orig_to_code[0] ? orig_to_code : nl_langinfo (CODESET));
|
|
|
|
if (from_wrong)
|
|
{
|
|
if (to_wrong)
|
|
error (0, 0,
|
|
_("\
|
|
conversions from `%s' and to `%s' are not supported"),
|
|
from_pretty, to_pretty);
|
|
else
|
|
error (0, 0,
|
|
_("conversion from `%s' is not supported"),
|
|
from_pretty);
|
|
}
|
|
else
|
|
{
|
|
if (to_wrong)
|
|
error (0, 0,
|
|
_("conversion to `%s' is not supported"),
|
|
to_pretty);
|
|
else
|
|
error (0, 0,
|
|
_("conversion from `%s' to `%s' is not supported"),
|
|
from_pretty, to_pretty);
|
|
}
|
|
|
|
argp_help (&argp, stderr, ARGP_HELP_SEE,
|
|
program_invocation_short_name);
|
|
exit (1);
|
|
}
|
|
else
|
|
error (EXIT_FAILURE, errno,
|
|
_("failed to start conversion processing"));
|
|
}
|
|
|
|
/* Now process the remaining files. Write them to stdout or the file
|
|
specified with the `-o' parameter. If we have no file given as
|
|
the parameter process all from stdin. */
|
|
if (remaining == argc)
|
|
{
|
|
if (process_file (cd, stdin, output) != 0)
|
|
status = EXIT_FAILURE;
|
|
}
|
|
else
|
|
do
|
|
{
|
|
#ifdef _POSIX_MAPPED_FILES
|
|
struct stat st;
|
|
char *addr;
|
|
#endif
|
|
int fd, ret;
|
|
|
|
if (verbose)
|
|
fprintf (stderr, "%s:\n", argv[remaining]);
|
|
if (strcmp (argv[remaining], "-") == 0)
|
|
fd = 0;
|
|
else
|
|
{
|
|
fd = open (argv[remaining], O_RDONLY);
|
|
|
|
if (fd == -1)
|
|
{
|
|
error (0, errno, _("cannot open input file `%s'"),
|
|
argv[remaining]);
|
|
status = EXIT_FAILURE;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
#ifdef _POSIX_MAPPED_FILES
|
|
/* We have possibilities for reading the input file. First try
|
|
to mmap() it since this will provide the fastest solution. */
|
|
if (fstat (fd, &st) == 0
|
|
&& ((addr = mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE,
|
|
fd, 0)) != MAP_FAILED))
|
|
{
|
|
/* Yes, we can use mmap(). The descriptor is not needed
|
|
anymore. */
|
|
if (close (fd) != 0)
|
|
error (EXIT_FAILURE, errno,
|
|
_("error while closing input `%s'"),
|
|
argv[remaining]);
|
|
|
|
ret = process_block (cd, addr, st.st_size, output);
|
|
|
|
/* We don't need the input data anymore. */
|
|
munmap ((void *) addr, st.st_size);
|
|
|
|
if (ret != 0)
|
|
{
|
|
status = EXIT_FAILURE;
|
|
|
|
if (ret < 0)
|
|
/* We cannot go on with producing output since it might
|
|
lead to problem because the last output might leave
|
|
the output stream in an undefined state. */
|
|
break;
|
|
}
|
|
}
|
|
else
|
|
#endif /* _POSIX_MAPPED_FILES */
|
|
{
|
|
/* Read the file in pieces. */
|
|
ret = process_fd (cd, fd, output);
|
|
|
|
/* Now close the file. */
|
|
close (fd);
|
|
|
|
if (ret != 0)
|
|
{
|
|
/* Something went wrong. */
|
|
status = EXIT_FAILURE;
|
|
|
|
if (ret < 0)
|
|
/* We cannot go on with producing output since it might
|
|
lead to problem because the last output might leave
|
|
the output stream in an undefined state. */
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
while (++remaining < argc);
|
|
}
|
|
|
|
/* Close the output file now. */
|
|
if (fclose (output))
|
|
error (EXIT_FAILURE, errno, _("error while closing output file"));
|
|
|
|
return status;
|
|
}
|
|
|
|
|
|
/* Handle program arguments. */
|
|
static error_t
|
|
parse_opt (int key, char *arg, struct argp_state *state)
|
|
{
|
|
switch (key)
|
|
{
|
|
case 'f':
|
|
from_code = arg;
|
|
break;
|
|
case 't':
|
|
to_code = arg;
|
|
break;
|
|
case 'o':
|
|
output_file = arg;
|
|
break;
|
|
case 's':
|
|
/* Nothing, for now at least. We are not giving out any information
|
|
about missing character or so. */
|
|
break;
|
|
case 'c':
|
|
/* Omit invalid characters from output. */
|
|
omit_invalid = 1;
|
|
break;
|
|
case OPT_VERBOSE:
|
|
verbose = 1;
|
|
break;
|
|
case OPT_LIST:
|
|
list = 1;
|
|
break;
|
|
default:
|
|
return ARGP_ERR_UNKNOWN;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static char *
|
|
more_help (int key, const char *text, void *input)
|
|
{
|
|
switch (key)
|
|
{
|
|
case ARGP_KEY_HELP_EXTRA:
|
|
/* We print some extra information. */
|
|
return strdup (gettext ("\
|
|
For bug reporting instructions, please see:\n\
|
|
<http://www.gnu.org/software/libc/bugs.html>.\n"));
|
|
default:
|
|
break;
|
|
}
|
|
return (char *) text;
|
|
}
|
|
|
|
|
|
/* Print the version information. */
|
|
static void
|
|
print_version (FILE *stream, struct argp_state *state)
|
|
{
|
|
fprintf (stream, "iconv (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");
|
|
}
|
|
|
|
|
|
static int
|
|
process_block (iconv_t cd, char *addr, size_t len, FILE *output)
|
|
{
|
|
#define OUTBUF_SIZE 32768
|
|
const char *start = addr;
|
|
char outbuf[OUTBUF_SIZE];
|
|
char *outptr;
|
|
size_t outlen;
|
|
size_t n;
|
|
int ret = 0;
|
|
|
|
while (len > 0)
|
|
{
|
|
outptr = outbuf;
|
|
outlen = OUTBUF_SIZE;
|
|
n = iconv (cd, &addr, &len, &outptr, &outlen);
|
|
|
|
if (n == (size_t) -1 && omit_invalid && errno == EILSEQ)
|
|
{
|
|
ret = 1;
|
|
if (len == 0)
|
|
n = 0;
|
|
else
|
|
errno = E2BIG;
|
|
}
|
|
|
|
if (outptr != outbuf)
|
|
{
|
|
/* We have something to write out. */
|
|
int errno_save = errno;
|
|
|
|
if (fwrite (outbuf, 1, outptr - outbuf, output)
|
|
< (size_t) (outptr - outbuf)
|
|
|| ferror (output))
|
|
{
|
|
/* Error occurred while printing the result. */
|
|
error (0, 0, _("\
|
|
conversion stopped due to problem in writing the output"));
|
|
return -1;
|
|
}
|
|
|
|
errno = errno_save;
|
|
}
|
|
|
|
if (n != (size_t) -1)
|
|
{
|
|
/* All the input test is processed. For state-dependent
|
|
character sets we have to flush the state now. */
|
|
outptr = outbuf;
|
|
outlen = OUTBUF_SIZE;
|
|
n = iconv (cd, NULL, NULL, &outptr, &outlen);
|
|
|
|
if (outptr != outbuf)
|
|
{
|
|
/* We have something to write out. */
|
|
int errno_save = errno;
|
|
|
|
if (fwrite (outbuf, 1, outptr - outbuf, output)
|
|
< (size_t) (outptr - outbuf)
|
|
|| ferror (output))
|
|
{
|
|
/* Error occurred while printing the result. */
|
|
error (0, 0, _("\
|
|
conversion stopped due to problem in writing the output"));
|
|
return -1;
|
|
}
|
|
|
|
errno = errno_save;
|
|
}
|
|
|
|
if (n != (size_t) -1)
|
|
break;
|
|
|
|
if (omit_invalid && errno == EILSEQ)
|
|
{
|
|
ret = 1;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (errno != E2BIG)
|
|
{
|
|
/* iconv() ran into a problem. */
|
|
switch (errno)
|
|
{
|
|
case EILSEQ:
|
|
if (! omit_invalid)
|
|
error (0, 0, _("illegal input sequence at position %ld"),
|
|
(long int) (addr - start));
|
|
break;
|
|
case EINVAL:
|
|
error (0, 0, _("\
|
|
incomplete character or shift sequence at end of buffer"));
|
|
break;
|
|
case EBADF:
|
|
error (0, 0, _("internal error (illegal descriptor)"));
|
|
break;
|
|
default:
|
|
error (0, 0, _("unknown iconv() error %d"), errno);
|
|
break;
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
|
|
static int
|
|
process_fd (iconv_t cd, int fd, FILE *output)
|
|
{
|
|
/* we have a problem with reading from a desriptor since we must not
|
|
provide the iconv() function an incomplete character or shift
|
|
sequence at the end of the buffer. Since we have to deal with
|
|
arbitrary encodings we must read the whole text in a buffer and
|
|
process it in one step. */
|
|
static char *inbuf = NULL;
|
|
static size_t maxlen = 0;
|
|
char *inptr = NULL;
|
|
size_t actlen = 0;
|
|
|
|
while (actlen < maxlen)
|
|
{
|
|
ssize_t n = read (fd, inptr, maxlen - actlen);
|
|
|
|
if (n == 0)
|
|
/* No more text to read. */
|
|
break;
|
|
|
|
if (n == -1)
|
|
{
|
|
/* Error while reading. */
|
|
error (0, errno, _("error while reading the input"));
|
|
return -1;
|
|
}
|
|
|
|
inptr += n;
|
|
actlen += n;
|
|
}
|
|
|
|
if (actlen == maxlen)
|
|
while (1)
|
|
{
|
|
ssize_t n;
|
|
char *new_inbuf;
|
|
|
|
/* Increase the buffer. */
|
|
new_inbuf = (char *) realloc (inbuf, maxlen + 32768);
|
|
if (new_inbuf == NULL)
|
|
{
|
|
error (0, errno, _("unable to allocate buffer for input"));
|
|
return -1;
|
|
}
|
|
inbuf = new_inbuf;
|
|
maxlen += 32768;
|
|
inptr = inbuf + actlen;
|
|
|
|
do
|
|
{
|
|
n = read (fd, inptr, maxlen - actlen);
|
|
|
|
if (n == 0)
|
|
/* No more text to read. */
|
|
break;
|
|
|
|
if (n == -1)
|
|
{
|
|
/* Error while reading. */
|
|
error (0, errno, _("error while reading the input"));
|
|
return -1;
|
|
}
|
|
|
|
inptr += n;
|
|
actlen += n;
|
|
}
|
|
while (actlen < maxlen);
|
|
|
|
if (n == 0)
|
|
/* Break again so we leave both loops. */
|
|
break;
|
|
}
|
|
|
|
/* Now we have all the input in the buffer. Process it in one run. */
|
|
return process_block (cd, inbuf, actlen, output);
|
|
}
|
|
|
|
|
|
static int
|
|
process_file (iconv_t cd, FILE *input, FILE *output)
|
|
{
|
|
/* This should be safe since we use this function only for `stdin' and
|
|
we haven't read anything so far. */
|
|
return process_fd (cd, fileno (input), output);
|
|
}
|
|
|
|
|
|
/* Print all known character sets/encodings. */
|
|
static void *printlist;
|
|
static size_t column;
|
|
static int not_first;
|
|
|
|
static void
|
|
insert_print_list (const void *nodep, VISIT value, int level)
|
|
{
|
|
if (value == leaf || value == postorder)
|
|
{
|
|
const struct gconv_alias *s = *(const struct gconv_alias **) nodep;
|
|
tsearch (s->fromname, &printlist, (__compar_fn_t) strverscmp);
|
|
}
|
|
}
|
|
|
|
static void
|
|
do_print_human (const void *nodep, VISIT value, int level)
|
|
{
|
|
if (value == leaf || value == postorder)
|
|
{
|
|
const char *s = *(const char **) nodep;
|
|
size_t len = strlen (s);
|
|
size_t cnt;
|
|
|
|
while (len > 0 && s[len - 1] == '/')
|
|
--len;
|
|
|
|
for (cnt = 0; cnt < len; ++cnt)
|
|
if (isalnum (s[cnt]))
|
|
break;
|
|
if (cnt == len)
|
|
return;
|
|
|
|
if (not_first)
|
|
{
|
|
putchar (',');
|
|
++column;
|
|
|
|
if (column > 2 && column + len > 77)
|
|
{
|
|
fputs ("\n ", stdout);
|
|
column = 2;
|
|
}
|
|
else
|
|
{
|
|
putchar (' ');
|
|
++column;
|
|
}
|
|
}
|
|
else
|
|
not_first = 1;
|
|
|
|
fwrite (s, len, 1, stdout);
|
|
column += len;
|
|
}
|
|
}
|
|
|
|
static void
|
|
do_print (const void *nodep, VISIT value, int level)
|
|
{
|
|
if (value == leaf || value == postorder)
|
|
{
|
|
const char *s = *(const char **) nodep;
|
|
|
|
puts (s);
|
|
}
|
|
}
|
|
|
|
static void
|
|
internal_function
|
|
add_known_names (struct gconv_module *node)
|
|
{
|
|
if (node->left != NULL)
|
|
add_known_names (node->left);
|
|
if (node->right != NULL)
|
|
add_known_names (node->right);
|
|
do
|
|
{
|
|
if (strcmp (node->from_string, "INTERNAL"))
|
|
tsearch (node->from_string, &printlist,
|
|
(__compar_fn_t) strverscmp);
|
|
if (strcmp (node->to_string, "INTERNAL") != 0)
|
|
tsearch (node->to_string, &printlist, (__compar_fn_t) strverscmp);
|
|
|
|
node = node->same;
|
|
}
|
|
while (node != NULL);
|
|
}
|
|
|
|
|
|
static void
|
|
insert_cache (void)
|
|
{
|
|
const struct gconvcache_header *header;
|
|
const char *strtab;
|
|
const struct hash_entry *hashtab;
|
|
size_t cnt;
|
|
|
|
header = (const struct gconvcache_header *) __gconv_get_cache ();
|
|
strtab = (char *) header + header->string_offset;
|
|
hashtab = (struct hash_entry *) ((char *) header + header->hash_offset);
|
|
|
|
for (cnt = 0; cnt < header->hash_size; ++cnt)
|
|
if (hashtab[cnt].string_offset != 0)
|
|
{
|
|
const char *str = strtab + hashtab[cnt].string_offset;
|
|
|
|
if (strcmp (str, "INTERNAL") != 0)
|
|
tsearch (str, &printlist, (__compar_fn_t) strverscmp);
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
internal_function
|
|
print_known_names (void)
|
|
{
|
|
iconv_t h;
|
|
void *cache;
|
|
|
|
/* We must initialize the internal databases first. */
|
|
h = iconv_open ("L1", "L1");
|
|
iconv_close (h);
|
|
|
|
/* See whether we have a cache. */
|
|
cache = __gconv_get_cache ();
|
|
if (cache != NULL)
|
|
/* Yep, use only this information. */
|
|
insert_cache ();
|
|
else
|
|
{
|
|
struct gconv_module *modules;
|
|
|
|
/* No, then use the information read from the gconv-modules file.
|
|
First add the aliases. */
|
|
twalk (__gconv_get_alias_db (), insert_print_list);
|
|
|
|
/* Add the from- and to-names from the known modules. */
|
|
modules = __gconv_get_modules_db ();
|
|
if (modules != NULL)
|
|
add_known_names (modules);
|
|
}
|
|
|
|
bool human_readable = isatty (fileno (stdout));
|
|
|
|
if (human_readable)
|
|
fputs (_("\
|
|
The following list contain all the coded character sets known. This does\n\
|
|
not necessarily mean that all combinations of these names can be used for\n\
|
|
the FROM and TO command line parameters. One coded character set can be\n\
|
|
listed with several different names (aliases).\n\n "), stdout);
|
|
|
|
/* Now print the collected names. */
|
|
column = 2;
|
|
twalk (printlist, human_readable ? do_print_human : do_print);
|
|
|
|
if (human_readable && column != 0)
|
|
puts ("");
|
|
}
|