mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-14 17:59:28 +08:00
b359e82cea
Tom Fitzsimmons <fitzsim@redhat.com> * configure.in: Add iconvdata support for x86 linux. * configure: Regenerated. * libc/sys/linux/Makefile.am: Add EL/IX level 3 network, dynamic library, iconv, and linuxthreads support. * libc/sys/linux/configure.in: Ditto. * libc/sys/linux/Makefile.in: Regenerated. * libc/sys/linux/configure: Ditto. * iconvdata/EUC-JP.irreversible: New file. * iconvdata/Makefile.am: Ditto. * iconvdata/Makefile.in: Ditto. * iconvdata/SJIS.irreversible: Ditto. * iconvdata/aclocal.m4: Ditto. * iconvdata/configure: Ditto. * iconvdata/configure.in: Ditto. * iconvdata/dummy.c: Ditto. * iconvdata/euc-jp.c: Ditto. * iconvdata/gconv-modules: Ditto. * iconvdata/jis0201.c: Ditto. * iconvdata/jis0201.h: Ditto. * iconvdata/jis0208.c: Ditto. * iconvdata/jis0208.h: Ditto. * iconvdata/jis0212.c: Ditto. * iconvdata/jis0212.h: Ditto. * iconvdata/sjis.c: Ditto. * libc/include/errno.h: Protect definition of error_t. * libc/sys/linux/gethostid.c: New file. * libc/sys/linux/sethostid.c: Ditto. * libc/sys/linux/dl/Makefile.am: Ditto. * libc/sys/linux/dl/Makefile.in: Ditto. * libc/sys/linux/dl/abi-tag.h: Ditto. * libc/sys/linux/dl/atomicity.h: Ditto. * libc/sys/linux/dl/dl-addr.c: Ditto. * libc/sys/linux/dl/dl-cache.c: Ditto. * libc/sys/linux/dl/dl-cache.h: Ditto. * libc/sys/linux/dl/dl-close.c: Ditto. * libc/sys/linux/dl/dl-debug.c: Ditto. * libc/sys/linux/dl/dl-deps.c: Ditto. * libc/sys/linux/dl/dl-dst.h: Ditto. * libc/sys/linux/dl/dl-error.c: Ditto. * libc/sys/linux/dl/dl-fini.c: Ditto. * libc/sys/linux/dl/dl-init.c: Ditto. * libc/sys/linux/dl/dl-iteratephdr.c: Ditto. * libc/sys/linux/dl/dl-libc.c: Ditto. * libc/sys/linux/dl/dl-librecon.h: Ditto. * libc/sys/linux/dl/dl-load.c: Ditto. * libc/sys/linux/dl/dl-lookup.c: Ditto. * libc/sys/linux/dl/dl-lookupcfg.h: Ditto. * libc/sys/linux/dl/dl-minimal.c: Ditto. * libc/sys/linux/dl/dl-misc.c: Ditto. * libc/sys/linux/dl/dl-object.c: Ditto. * libc/sys/linux/dl/dl-open.c: Ditto. * libc/sys/linux/dl/dl-osinfo.h: Ditto. * libc/sys/linux/dl/dl-profile.c: Ditto. * libc/sys/linux/dl/dl-profstub.c: Ditto. * libc/sys/linux/dl/dl-reloc.c: Ditto. * libc/sys/linux/dl/dl-runtime.c: Ditto. * libc/sys/linux/dl/dl-support.c: Ditto. * libc/sys/linux/dl/dl-sym.c: Ditto. * libc/sys/linux/dl/dl-version.c: Ditto. * libc/sys/linux/dl/dlfcn.h: Ditto. * libc/sys/linux/dl/do-lookup.h: Ditto. * libc/sys/linux/dl/do-rel.h: Ditto. * libc/sys/linux/dl/dynamic-link.h: Ditto. * libc/sys/linux/dl/kernel-features.h: Ditto. * libc/sys/linux/dl/ldsodefs.h: Ditto. * libc/sys/linux/dl/libintl.h: Ditto. * libc/sys/linux/dl/trusted-dirs.h: Ditto. * libc/sys/linux/dl/unsecvars.h: Ditto. * libc/sys/linux/iconv/Makefile.am: Ditto. * libc/sys/linux/iconv/Makefile.in: Ditto. * libc/sys/linux/iconv/categories.def: Ditto. * libc/sys/linux/iconv/dummy-repertoire.c: Ditto. * libc/sys/linux/iconv/gconv.c: Ditto. * libc/sys/linux/iconv/gconv_builtin.c: Ditto. * libc/sys/linux/iconv/gconv_builtin.h: Ditto. * libc/sys/linux/iconv/gconv_cache.c: Ditto. * libc/sys/linux/iconv/gconv_charset.h: Ditto. * libc/sys/linux/iconv/gconv_close.c: Ditto. * libc/sys/linux/iconv/gconv_conf.c: Ditto. * libc/sys/linux/iconv/gconv_db.c: Ditto. * libc/sys/linux/iconv/gconv_dl.c: Ditto. * libc/sys/linux/iconv/gconv_int.h: Ditto. * libc/sys/linux/iconv/gconv_open.c: Ditto. * libc/sys/linux/iconv/gconv_simple.c: Ditto. * libc/sys/linux/iconv/gconv_trans.c: Ditto. * libc/sys/linux/iconv/hash-string.h: Ditto. * libc/sys/linux/iconv/iconv.c: Ditto. * libc/sys/linux/iconv/iconv.h: Ditto. * libc/sys/linux/iconv/iconv_charmap.c: Ditto. * libc/sys/linux/iconv/iconv_close.c: Ditto. * libc/sys/linux/iconv/iconv_open.c: Ditto. * libc/sys/linux/iconv/iconvconfig.c: Ditto. * libc/sys/linux/iconv/iconvconfig.h: Ditto. * libc/sys/linux/iconv/loadinfo.h: Ditto. * libc/sys/linux/iconv/localeinfo.h: Ditto. * libc/sys/linux/iconv/loop.c: Ditto. * libc/sys/linux/iconv/skeleton.c: Ditto. * libc/sys/linux/iconv/strtab.c: Ditto. * libc/sys/linux/include/dl-hash.h: Ditto. * libc/sys/linux/include/dlfcn.h: Ditto. * libc/sys/linux/include/fnmatch.h: Ditto. * libc/sys/linux/include/gconv.h: Ditto. * libc/sys/linux/include/glob.h: Ditto. * libc/sys/linux/include/hesiod.h: Ditto. * libc/sys/linux/include/ifaddrs.h: Ditto. * libc/sys/linux/include/libc_private.h: Ditto. * libc/sys/linux/include/link.h: Ditto. * libc/sys/linux/include/namespace.h: Ditto. * libc/sys/linux/include/netconfig.h: Ditto. * libc/sys/linux/include/netdb.h: Ditto. * libc/sys/linux/include/nsswitch.h: Ditto. * libc/sys/linux/include/regex.h: Ditto. * libc/sys/linux/include/resolv.h: Ditto. * libc/sys/linux/include/rune.h: Ditto. * libc/sys/linux/include/runetype.h: Ditto. * libc/sys/linux/include/semaphore.h: Ditto. * libc/sys/linux/include/setlocale.h: Ditto. * libc/sys/linux/include/un-namespace.h: Ditto. * libc/sys/linux/include/wordexp.h: Ditto. * libc/sys/linux/include/arpa/ftp.h: Ditto. * libc/sys/linux/include/arpa/inet.h: Ditto. * libc/sys/linux/include/arpa/nameser.h: Ditto. * libc/sys/linux/include/arpa/nameser_compat.h: Ditto. * libc/sys/linux/include/arpa/telnet.h: Ditto. * libc/sys/linux/include/arpa/tftp.h: Ditto. * libc/sys/linux/include/net/bpf.h: Ditto. * libc/sys/linux/include/net/bpf_compat.h: Ditto. * libc/sys/linux/include/net/bpfdesc.h: Ditto. * libc/sys/linux/include/net/bridge.h: Ditto. * libc/sys/linux/include/net/ethernet.h: Ditto. * libc/sys/linux/include/net/fddi.h: Ditto. * libc/sys/linux/include/net/if.h: Ditto. * libc/sys/linux/include/net/if_arc.h: Ditto. * libc/sys/linux/include/net/if_arp.h: Ditto. * libc/sys/linux/include/net/if_atm.h: Ditto. * libc/sys/linux/include/net/if_dl.h: Ditto. * libc/sys/linux/include/net/if_gif.h: Ditto. * libc/sys/linux/include/net/if_ieee80211.h: Ditto. * libc/sys/linux/include/net/if_llc.h: Ditto. * libc/sys/linux/include/net/if_media.h: Ditto. * libc/sys/linux/include/net/if_mib.h: Ditto. * libc/sys/linux/include/net/if_ppp.h: Ditto. * libc/sys/linux/include/net/if_pppvar.h: Ditto. * libc/sys/linux/include/net/if_slvar.h: Ditto. * libc/sys/linux/include/net/if_sppp.h: Ditto. * libc/sys/linux/include/net/if_stf.h: Ditto. * libc/sys/linux/include/net/if_tap.h: Ditto. * libc/sys/linux/include/net/if_tapvar.h: Ditto. * libc/sys/linux/include/net/if_tun.h: Ditto. * libc/sys/linux/include/net/if_tunvar.h: Ditto. * libc/sys/linux/include/net/if_types.h: Ditto. * libc/sys/linux/include/net/if_var.h: Ditto. * libc/sys/linux/include/net/if_vlan_var.h: Ditto. * libc/sys/linux/include/net/intrq.h: Ditto. * libc/sys/linux/include/net/iso88025.h: Ditto. * libc/sys/linux/include/net/net_osdep.h: Ditto. * libc/sys/linux/include/net/netisr.h: Ditto. * libc/sys/linux/include/net/pfil.h: Ditto. * libc/sys/linux/include/net/pfkeyv2.h: Ditto. * libc/sys/linux/include/net/ppp_comp.h: Ditto. * libc/sys/linux/include/net/ppp_defs.h: Ditto. * libc/sys/linux/include/net/radix.h: Ditto. * libc/sys/linux/include/net/raw_cb.h: Ditto. * libc/sys/linux/include/net/route.h: Ditto. * libc/sys/linux/include/net/slcompress.h: Ditto. * libc/sys/linux/include/net/slip.h: Ditto. * libc/sys/linux/include/net/zlib.h: Ditto. * libc/sys/linux/include/netinet/icmp6.h: Ditto. * libc/sys/linux/include/netinet/icmp_var.h: Ditto. * libc/sys/linux/include/netinet/if_atm.h: Ditto. * libc/sys/linux/include/netinet/if_ether.h: Ditto. * libc/sys/linux/include/netinet/igmp.h: Ditto. * libc/sys/linux/include/netinet/igmp_var.h: Ditto. * libc/sys/linux/include/netinet/in.h: Ditto. * libc/sys/linux/include/netinet/in_gif.h: Ditto. * libc/sys/linux/include/netinet/in_pcb.h: Ditto. * libc/sys/linux/include/netinet/in_systm.h: Ditto. * libc/sys/linux/include/netinet/in_var.h: Ditto. * libc/sys/linux/include/netinet/ip.h: Ditto. * libc/sys/linux/include/netinet/ip6.h: Ditto. * libc/sys/linux/include/netinet/ip_dummynet.h: Ditto. * libc/sys/linux/include/netinet/ip_ecn.h: Ditto. * libc/sys/linux/include/netinet/ip_encap.h: Ditto. * libc/sys/linux/include/netinet/ip_flow.h: Ditto. * libc/sys/linux/include/netinet/ip_fw.h: Ditto. * libc/sys/linux/include/netinet/ip_icmp.h: Ditto. * libc/sys/linux/include/netinet/ip_mroute.h: Ditto. * libc/sys/linux/include/netinet/ip_var.h: Ditto. * libc/sys/linux/include/netinet/ipprotosw.h: Ditto. * libc/sys/linux/include/netinet/tcp.h: Ditto. * libc/sys/linux/include/netinet/tcp_debug.h: Ditto. * libc/sys/linux/include/netinet/tcp_fsm.h: Ditto. * libc/sys/linux/include/netinet/tcp_seq.h: Ditto. * libc/sys/linux/include/netinet/tcp_timer.h: Ditto. * libc/sys/linux/include/netinet/tcp_var.h: Ditto. * libc/sys/linux/include/netinet/tcpip.h: Ditto. * libc/sys/linux/include/netinet/udp.h: Ditto. * libc/sys/linux/include/netinet/udp_var.h: Ditto. * libc/sys/linux/include/netinet6/ah.h: Ditto. * libc/sys/linux/include/netinet6/ah6.h: Ditto. * libc/sys/linux/include/netinet6/esp.h: Ditto. * libc/sys/linux/include/netinet6/esp6.h: Ditto. * libc/sys/linux/include/netinet6/esp_rijndael.h: Ditto. * libc/sys/linux/include/netinet6/icmp6.h: Ditto. * libc/sys/linux/include/netinet6/in6.h: Ditto. * libc/sys/linux/include/netinet6/in6_gif.h: Ditto. * libc/sys/linux/include/netinet6/in6_ifattach.h: Ditto. * libc/sys/linux/include/netinet6/in6_pcb.h: Ditto. * libc/sys/linux/include/netinet6/in6_prefix.h: Ditto. * libc/sys/linux/include/netinet6/in6_var.h: Ditto. * libc/sys/linux/include/netinet6/ip6.h: Ditto. * libc/sys/linux/include/netinet6/ip6_ecn.h: Ditto. * libc/sys/linux/include/netinet6/ip6_fw.h: Ditto. * libc/sys/linux/include/netinet6/ip6_mroute.h: Ditto. * libc/sys/linux/include/netinet6/ip6_var.h: Ditto. * libc/sys/linux/include/netinet6/ip6protosw.h: Ditto. * libc/sys/linux/include/netinet6/ipcomp.h: Ditto. * libc/sys/linux/include/netinet6/ipcomp6.h: Ditto. * libc/sys/linux/include/netinet6/ipsec.h: Ditto. * libc/sys/linux/include/netinet6/ipsec6.h: Ditto. * libc/sys/linux/include/netinet6/mld6_var.h: Ditto. * libc/sys/linux/include/netinet6/nd6.h: Ditto. * libc/sys/linux/include/netinet6/pim6.h: Ditto. * libc/sys/linux/include/netinet6/pim6_var.h: Ditto. * libc/sys/linux/include/netinet6/raw_ip6.h: Ditto. * libc/sys/linux/include/netinet6/scope6_var.h: Ditto. * libc/sys/linux/include/netinet6/tcp6_var.h: Ditto. * libc/sys/linux/include/netinet6/udp6_var.h: Ditto. * libc/sys/linux/include/netns/idp.h: Ditto. * libc/sys/linux/include/netns/idp_var.h: Ditto. * libc/sys/linux/include/netns/ns.h: Ditto. * libc/sys/linux/include/netns/ns_error.h: Ditto. * libc/sys/linux/include/netns/ns_if.h: Ditto. * libc/sys/linux/include/netns/ns_pcb.h: Ditto. * libc/sys/linux/include/netns/sp.h: Ditto. * libc/sys/linux/include/netns/spidp.h: Ditto. * libc/sys/linux/include/netns/spp_debug.h: Ditto. * libc/sys/linux/include/netns/spp_timer.h: Ditto. * libc/sys/linux/include/netns/spp_var.h: Ditto. * libc/sys/linux/include/rpc/Makefile: Ditto. * libc/sys/linux/include/rpc/auth.h: Ditto. * libc/sys/linux/include/rpc/auth_des.h: Ditto. * libc/sys/linux/include/rpc/auth_kerb.h: Ditto. * libc/sys/linux/include/rpc/auth_unix.h: Ditto. * libc/sys/linux/include/rpc/clnt.h: Ditto. * libc/sys/linux/include/rpc/clnt_soc.h: Ditto. * libc/sys/linux/include/rpc/clnt_stat.h: Ditto. * libc/sys/linux/include/rpc/des.h: Ditto. * libc/sys/linux/include/rpc/des_crypt.h: Ditto. * libc/sys/linux/include/rpc/nettype.h: Ditto. * libc/sys/linux/include/rpc/pmap_clnt.h: Ditto. * libc/sys/linux/include/rpc/pmap_prot.h: Ditto. * libc/sys/linux/include/rpc/pmap_rmt.h: Ditto. * libc/sys/linux/include/rpc/raw.h: Ditto. * libc/sys/linux/include/rpc/rpc.h: Ditto. * libc/sys/linux/include/rpc/rpc_com.h: Ditto. * libc/sys/linux/include/rpc/rpc_msg.h: Ditto. * libc/sys/linux/include/rpc/rpcb_clnt.h: Ditto. * libc/sys/linux/include/rpc/rpcb_prot.h: Ditto. * libc/sys/linux/include/rpc/rpcb_prot.x: Ditto. * libc/sys/linux/include/rpc/rpcent.h: Ditto. * libc/sys/linux/include/rpc/svc.h: Ditto. * libc/sys/linux/include/rpc/svc_auth.h: Ditto. * libc/sys/linux/include/rpc/svc_dg.h: Ditto. * libc/sys/linux/include/rpc/svc_soc.h: Ditto. * libc/sys/linux/include/rpc/types.h: Ditto. * libc/sys/linux/include/rpc/xdr.h: Ditto. * libc/sys/linux/intl/Makefile.am: Ditto. * libc/sys/linux/intl/Makefile.in: Ditto. * libc/sys/linux/intl/bindtextdom.c: Ditto. * libc/sys/linux/intl/catgets.c: Ditto. * libc/sys/linux/intl/catgetsinfo.h: Ditto. * libc/sys/linux/intl/config.h: Ditto. * libc/sys/linux/intl/dcgettext.c: Ditto. * libc/sys/linux/intl/dcigettext.c: Ditto. * libc/sys/linux/intl/dcngettext.c: Ditto. * libc/sys/linux/intl/dgettext.c: Ditto. * libc/sys/linux/intl/dngettext.c: Ditto. * libc/sys/linux/intl/explodename.c: Ditto. * libc/sys/linux/intl/finddomain.c: Ditto. * libc/sys/linux/intl/gettext.c: Ditto. * libc/sys/linux/intl/gettext.h: Ditto. * libc/sys/linux/intl/gettextP.h: Ditto. * libc/sys/linux/intl/hash-string.h: Ditto. * libc/sys/linux/intl/l10nflist.c: Ditto. * libc/sys/linux/intl/loadinfo.h: Ditto. * libc/sys/linux/intl/loadmsgcat.c: Ditto. * libc/sys/linux/intl/locale.alias: Ditto. * libc/sys/linux/intl/localealias.c: Ditto. * libc/sys/linux/intl/ngettext.c: Ditto. * libc/sys/linux/intl/open_catalog.c: Ditto. * libc/sys/linux/intl/plural.c: Ditto. * libc/sys/linux/intl/plural.y: Ditto. * libc/sys/linux/intl/stpcpy.c: Ditto. * libc/sys/linux/intl/textdomain.c: Ditto. * libc/sys/linux/linuxthreads/LICENSE: Ditto. * libc/sys/linux/linuxthreads/Makefile.am: Ditto. * libc/sys/linux/linuxthreads/Makefile.in: Ditto. * libc/sys/linux/linuxthreads/aclocal.m4: Ditto. * libc/sys/linux/linuxthreads/attr.c: Ditto. * libc/sys/linux/linuxthreads/barrier.c: Ditto. * libc/sys/linux/linuxthreads/bp-sym.h: Ditto. * libc/sys/linux/linuxthreads/cancel.c: Ditto. * libc/sys/linux/linuxthreads/condvar.c: Ditto. * libc/sys/linux/linuxthreads/config.h: Ditto. * libc/sys/linux/linuxthreads/configure: Ditto. * libc/sys/linux/linuxthreads/configure.in: Ditto. * libc/sys/linux/linuxthreads/defs.awk: Ditto. * libc/sys/linux/linuxthreads/ecmutex.c: Ditto. * libc/sys/linux/linuxthreads/events.c: Ditto. * libc/sys/linux/linuxthreads/getcpuclockid.c: Ditto. * libc/sys/linux/linuxthreads/getreent.c: Ditto. * libc/sys/linux/linuxthreads/internals.h: Ditto. * libc/sys/linux/linuxthreads/join.c: Ditto. * libc/sys/linux/linuxthreads/joinrace.c: Ditto. * libc/sys/linux/linuxthreads/kernel-features.h: Ditto. * libc/sys/linux/linuxthreads/libc-internal.h: Ditto. * libc/sys/linux/linuxthreads/libc-symbols.h: Ditto. * libc/sys/linux/linuxthreads/linuxthreads.texi: Ditto. * libc/sys/linux/linuxthreads/lockfile.c: Ditto. * libc/sys/linux/linuxthreads/manager.c: Ditto. * libc/sys/linux/linuxthreads/mq_notify.c: Ditto. * libc/sys/linux/linuxthreads/mutex.c: Ditto. * libc/sys/linux/linuxthreads/no-tsd.c: Ditto. * libc/sys/linux/linuxthreads/oldsemaphore.c: Ditto. * libc/sys/linux/linuxthreads/posix-timer.h: Ditto. * libc/sys/linux/linuxthreads/prio.c: Ditto. * libc/sys/linux/linuxthreads/proc_service.h: Ditto. * libc/sys/linux/linuxthreads/pt-machine.c: Ditto. * libc/sys/linux/linuxthreads/ptclock_gettime.c: Ditto. * libc/sys/linux/linuxthreads/ptclock_settime.c: Ditto. * libc/sys/linux/linuxthreads/ptfork.c: Ditto. * libc/sys/linux/linuxthreads/pthread.c: Ditto. * libc/sys/linux/linuxthreads/ptlongjmp.c: Ditto. * libc/sys/linux/linuxthreads/queue.h: Ditto. * libc/sys/linux/linuxthreads/reent.c: Ditto. * libc/sys/linux/linuxthreads/reqsyscalls.c: Ditto. * libc/sys/linux/linuxthreads/restart.h: Ditto. * libc/sys/linux/linuxthreads/rwlock.c: Ditto. * libc/sys/linux/linuxthreads/semaphore.c: Ditto. * libc/sys/linux/linuxthreads/semaphore.h: Ditto. * libc/sys/linux/linuxthreads/shlib-compat.h: Ditto. * libc/sys/linux/linuxthreads/signals.c: Ditto. * libc/sys/linux/linuxthreads/specific.c: Ditto. * libc/sys/linux/linuxthreads/spinlock.c: Ditto. * libc/sys/linux/linuxthreads/spinlock.h: Ditto. * libc/sys/linux/linuxthreads/sysctl.c: Ditto. * libc/sys/linux/linuxthreads/td_init.c: Ditto. * libc/sys/linux/linuxthreads/td_log.c: Ditto. * libc/sys/linux/linuxthreads/td_symbol_list.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_clear_event.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_delete.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_enable_stats.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_event_addr.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_event_getmsg.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_get_nthreads.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_get_ph.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_get_stats.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_map_id2thr.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_map_lwp2thr.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_new.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_reset_stats.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_set_event.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_setconcurrency.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_thr_iter.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_tsd_iter.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_clear_event.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_dbresume.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_dbsuspend.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_event_enable.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_event_getmsg.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_get_info.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_getfpregs.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_getgregs.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_getxregs.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_getxregsize.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_set_event.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_setfpregs.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_setgregs.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_setprio.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_setsigpending.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_setxregs.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_sigsetmask.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_tsd.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_validate.c: Ditto. * libc/sys/linux/linuxthreads/testrtsig.h: Ditto. * libc/sys/linux/linuxthreads/thread_db.h: Ditto. * libc/sys/linux/linuxthreads/thread_dbP.h: Ditto. * libc/sys/linux/linuxthreads/timer_create.c: Ditto. * libc/sys/linux/linuxthreads/timer_delete.c: Ditto. * libc/sys/linux/linuxthreads/timer_getoverr.c: Ditto. * libc/sys/linux/linuxthreads/timer_gettime.c: Ditto. * libc/sys/linux/linuxthreads/timer_routines.c: Ditto. * libc/sys/linux/linuxthreads/timer_settime.c: Ditto. * libc/sys/linux/linuxthreads/tst-cancel.c: Ditto. * libc/sys/linux/linuxthreads/tst-context.c: Ditto. * libc/sys/linux/linuxthreads/tststack.c: Ditto. * libc/sys/linux/linuxthreads/unload.c: Ditto. * libc/sys/linux/linuxthreads/weaks.c: Ditto. * libc/sys/linux/linuxthreads/wrapsyscall.c: Ditto. * libc/sys/linux/linuxthreads/bits/initspin.h: Ditto. * libc/sys/linux/linuxthreads/bits/libc-lock.h: Ditto. * libc/sys/linux/linuxthreads/bits/libc-tsd.h: Ditto. * libc/sys/linux/linuxthreads/bits/local_lim.h: Ditto. * libc/sys/linux/linuxthreads/bits/posix_opt.h: Ditto. * libc/sys/linux/linuxthreads/bits/pthreadtypes.h: Ditto. * libc/sys/linux/linuxthreads/bits/sigthread.h: Ditto. * libc/sys/linux/linuxthreads/machine/Makefile.am: Ditto. * libc/sys/linux/linuxthreads/machine/Makefile.in: Ditto. * libc/sys/linux/linuxthreads/machine/aclocal.m4: Ditto. * libc/sys/linux/linuxthreads/machine/configure: Ditto. * libc/sys/linux/linuxthreads/machine/configure.in: Ditto. * libc/sys/linux/linuxthreads/machine/generic/generic-sysd: Ditto.ep.h * libc/sys/linux/linuxthreads/machine/i386/Makefile.am: Ditto. * libc/sys/linux/linuxthreads/machine/i386/Makefile.in: Ditto. * libc/sys/linux/linuxthreads/machine/i386/aclocal.m4: Ditto. * libc/sys/linux/linuxthreads/machine/i386/bp-asm.h: Ditto. * libc/sys/linux/linuxthreads/machine/i386/clone.S: Ditto. * libc/sys/linux/linuxthreads/machine/i386/configure: Ditto. * libc/sys/linux/linuxthreads/machine/i386/configure.in: Ditto. * libc/sys/linux/linuxthreads/machine/i386/i386-sysdep.S: Ditto. * libc/sys/linux/linuxthreads/machine/i386/i386-sysdep.h: Ditto. * libc/sys/linux/linuxthreads/machine/i386/pspinlock.c: Ditto. * libc/sys/linux/linuxthreads/machine/i386/pt-machine.h: Ditto. * libc/sys/linux/linuxthreads/machine/i386/sigcontextinfo.h: Ditto. * libc/sys/linux/linuxthreads/machine/i386/stackinfo.h: Ditto. * libc/sys/linux/linuxthreads/machine/i386/sysdep.S: Ditto. * libc/sys/linux/linuxthreads/machine/i386/sysdep.h: Ditto. * libc/sys/linux/linuxthreads/machine/i386/useldt.h: Ditto. * libc/sys/linux/machine/i386/dl-machine.h: Ditto. * libc/sys/linux/net/Makefile.am: Ditto. * libc/sys/linux/net/Makefile.in: Ditto. * libc/sys/linux/net/addr2ascii.3: Ditto. * libc/sys/linux/net/addr2ascii.c: Ditto. * libc/sys/linux/net/ascii2addr.c: Ditto. * libc/sys/linux/net/base64.c: Ditto. * libc/sys/linux/net/bindresvport.c: Ditto. * libc/sys/linux/net/byteorder.3: Ditto. * libc/sys/linux/net/ether_addr.c: Ditto. * libc/sys/linux/net/ethers.3: Ditto. * libc/sys/linux/net/getaddrinfo.3: Ditto. * libc/sys/linux/net/getaddrinfo.c: Ditto. * libc/sys/linux/net/gethostbydns.c: Ditto. * libc/sys/linux/net/gethostbyht.c: Ditto. * libc/sys/linux/net/gethostbyname.3: Ditto. * libc/sys/linux/net/gethostbynis.c: Ditto. * libc/sys/linux/net/gethostnamadr.c: Ditto. * libc/sys/linux/net/getifaddrs.3: Ditto. * libc/sys/linux/net/getifaddrs.c: Ditto. * libc/sys/linux/net/getipnodebyname.3: Ditto. * libc/sys/linux/net/getnameinfo.3: Ditto. * libc/sys/linux/net/getnameinfo.c: Ditto. * libc/sys/linux/net/getnetbydns.c: Ditto. * libc/sys/linux/net/getnetbyht.c: Ditto. * libc/sys/linux/net/getnetbynis.c: Ditto. * libc/sys/linux/net/getnetent.3: Ditto. * libc/sys/linux/net/getnetnamadr.c: Ditto. * libc/sys/linux/net/getproto.c: Ditto. * libc/sys/linux/net/getprotoent.3: Ditto. * libc/sys/linux/net/getprotoent.c: Ditto. * libc/sys/linux/net/getprotoname.c: Ditto. * libc/sys/linux/net/getservbyname.c: Ditto. * libc/sys/linux/net/getservbyport.c: Ditto. * libc/sys/linux/net/getservent.3: Ditto. * libc/sys/linux/net/getservent.c: Ditto. * libc/sys/linux/net/herror.c: Ditto. * libc/sys/linux/net/hesiod.3: Ditto. * libc/sys/linux/net/hesiod.c: Ditto. * libc/sys/linux/net/if_indextoname.3: Ditto. * libc/sys/linux/net/ifname.c: Ditto. * libc/sys/linux/net/inet.3: Ditto. * libc/sys/linux/net/inet6_option_s: Ditto.pace.3 * libc/sys/linux/net/inet6_rthdr_space.3: Ditto. * libc/sys/linux/net/inet_addr.c: Ditto. * libc/sys/linux/net/inet_lnaof.c: Ditto. * libc/sys/linux/net/inet_makeaddr.c: Ditto. * libc/sys/linux/net/inet_net.3: Ditto. * libc/sys/linux/net/inet_net_ntop.c: Ditto. * libc/sys/linux/net/inet_net_pton.c: Ditto. * libc/sys/linux/net/inet_neta.c: Ditto. * libc/sys/linux/net/inet_netof.c: Ditto. * libc/sys/linux/net/inet_network.c: Ditto. * libc/sys/linux/net/inet_ntoa.c: Ditto. * libc/sys/linux/net/inet_ntop.c: Ditto. * libc/sys/linux/net/inet_pton.c: Ditto. * libc/sys/linux/net/innetgr-stub.c: Ditto. * libc/sys/linux/net/ip6opt.c: Ditto. * libc/sys/linux/net/iso_addr.3: Ditto. * libc/sys/linux/net/iso_addr.c: Ditto. * libc/sys/linux/net/issetugid-stub.c: Ditto. * libc/sys/linux/net/linkaddr.3: Ditto. * libc/sys/linux/net/linkaddr.c: Ditto. * libc/sys/linux/net/map_v4v6.c: Ditto. * libc/sys/linux/net/name6.c: Ditto. * libc/sys/linux/net/namespace.h: Ditto. * libc/sys/linux/net/ns.3: Ditto. * libc/sys/linux/net/ns_addr.c: Ditto. * libc/sys/linux/net/ns_name.c: Ditto. * libc/sys/linux/net/ns_netint.c: Ditto. * libc/sys/linux/net/ns_ntoa.c: Ditto. * libc/sys/linux/net/ns_parse.c: Ditto. * libc/sys/linux/net/ns_print.c: Ditto. * libc/sys/linux/net/ns_ttl.c: Ditto. * libc/sys/linux/net/nsap_addr.c: Ditto. * libc/sys/linux/net/nsdispatch.3: Ditto. * libc/sys/linux/net/nsdispatch.c: Ditto. * libc/sys/linux/net/nslexer.c: Ditto. * libc/sys/linux/net/nslexer.l: Ditto. * libc/sys/linux/net/nsparser.c: Ditto. * libc/sys/linux/net/nsparser.h: Ditto. * libc/sys/linux/net/nsparser.y: Ditto. * libc/sys/linux/net/rcmd.3: Ditto. * libc/sys/linux/net/rcmd.c: Ditto. * libc/sys/linux/net/rcmdsh.3: Ditto. * libc/sys/linux/net/rcmdsh.c: Ditto. * libc/sys/linux/net/recv.c: Ditto. * libc/sys/linux/net/res_comp.c: Ditto. * libc/sys/linux/net/res_config.h: Ditto. * libc/sys/linux/net/res_data.c: Ditto. * libc/sys/linux/net/res_debug.c: Ditto. * libc/sys/linux/net/res_init.c: Ditto. * libc/sys/linux/net/res_mkquery.c: Ditto. * libc/sys/linux/net/res_mkupdate.c: Ditto. * libc/sys/linux/net/res_query.c: Ditto. * libc/sys/linux/net/res_send.c: Ditto. * libc/sys/linux/net/res_update.c: Ditto. * libc/sys/linux/net/resolver.3: Ditto. * libc/sys/linux/net/rthdr.c: Ditto. * libc/sys/linux/net/send.c: Ditto. * libc/sys/linux/net/un-namespace.h: Ditto. * libc/sys/linux/net/vars.c: Ditto. * libc/sys/linux/stdlib/COPYRIGHT: Ditto. * libc/sys/linux/stdlib/Makefile.am: Ditto. * libc/sys/linux/stdlib/Makefile.in: Ditto. * libc/sys/linux/stdlib/cclass.h: Ditto. * libc/sys/linux/stdlib/cname.h: Ditto. * libc/sys/linux/stdlib/collate.c: Ditto. * libc/sys/linux/stdlib/collate.h: Ditto. * libc/sys/linux/stdlib/collcmp.c: Ditto. * libc/sys/linux/stdlib/engine.c: Ditto. * libc/sys/linux/stdlib/fnmatch.3: Ditto. * libc/sys/linux/stdlib/fnmatch.c: Ditto. * libc/sys/linux/stdlib/glob.3: Ditto. * libc/sys/linux/stdlib/glob.c: Ditto. * libc/sys/linux/stdlib/reallocf.c: Ditto. * libc/sys/linux/stdlib/regcomp.c: Ditto. * libc/sys/linux/stdlib/regerror.c: Ditto. * libc/sys/linux/stdlib/regex.3: Ditto. * libc/sys/linux/stdlib/regex2.h: Ditto. * libc/sys/linux/stdlib/regexec.c: Ditto. * libc/sys/linux/stdlib/regfree.c: Ditto. * libc/sys/linux/stdlib/utils.h: Ditto. * libc/sys/linux/stdlib/wordexp.c: Ditto. * libc/sys/linux/stdlib/wordfree.c: Ditto. * libc/sys/linux/sys/dlfcn.h: Ditto. * libc/sys/linux/sys/elfclass.h: Ditto. * libc/sys/linux/sys/event.h: Ditto. * libc/sys/linux/sys/ioccom.h: Ditto. * libc/sys/linux/sys/libc-tsd.h: Ditto. * libc/sys/linux/sys/link.h: Ditto. * libc/sys/linux/sys/lock.h: Ditto. * libc/sys/linux/sys/param.h: Ditto. * libc/sys/linux/sys/socket.h: Ditto. * libc/sys/linux/sys/sockio.h: Ditto.
564 lines
14 KiB
C
564 lines
14 KiB
C
/* Convert using charmaps and possibly iconv().
|
|
Copyright (C) 2001 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <error.h>
|
|
#include <fcntl.h>
|
|
#include <iconv.h>
|
|
#include <libintl.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include "iconv_prog.h"
|
|
|
|
|
|
/* Prototypes for a few program-wide used functions. */
|
|
extern void *xmalloc (size_t __n);
|
|
extern void *xcalloc (size_t __n, size_t __s);
|
|
|
|
|
|
struct convtable
|
|
{
|
|
int term[256 / 8];
|
|
union
|
|
{
|
|
struct convtable *sub;
|
|
struct charseq *out;
|
|
} val[256];
|
|
};
|
|
|
|
|
|
static inline struct convtable *
|
|
allocate_table (void)
|
|
{
|
|
return (struct convtable *) xcalloc (1, sizeof (struct convtable));
|
|
}
|
|
|
|
|
|
static inline int
|
|
is_term (struct convtable *tbl, unsigned int idx)
|
|
{
|
|
return tbl->term[idx / 8] & (1 << (idx % 8));
|
|
}
|
|
|
|
|
|
static inline void
|
|
clear_term (struct convtable *tbl, unsigned int idx)
|
|
{
|
|
tbl->term[idx / 8] &= ~(1 << (idx % 8));
|
|
}
|
|
|
|
|
|
static inline void
|
|
set_term (struct convtable *tbl, unsigned int idx)
|
|
{
|
|
tbl->term[idx / 8] |= 1 << (idx % 8);
|
|
}
|
|
|
|
|
|
/* Generate the conversion table. */
|
|
static struct convtable *use_from_charmap (struct charmap_t *from_charmap,
|
|
const char *to_code);
|
|
static struct convtable *use_to_charmap (const char *from_code,
|
|
struct charmap_t *to_charmap);
|
|
static struct convtable *use_both_charmaps (struct charmap_t *from_charmap,
|
|
struct charmap_t *to_charmap);
|
|
|
|
/* Prototypes for the functions doing the actual work. */
|
|
static int process_block (struct convtable *tbl, char *addr, size_t len,
|
|
FILE *output);
|
|
static int process_fd (struct convtable *tbl, int fd, FILE *output);
|
|
static int process_file (struct convtable *tbl, FILE *input, FILE *output);
|
|
|
|
|
|
int
|
|
charmap_conversion (const char *from_code, struct charmap_t *from_charmap,
|
|
const char *to_code, struct charmap_t *to_charmap,
|
|
int argc, int remaining, char *argv[], FILE *output)
|
|
{
|
|
struct convtable *cvtbl;
|
|
int status = EXIT_SUCCESS;
|
|
|
|
/* We have three different cases to handle:
|
|
|
|
- both, from_charmap and to_charmap, are available. This means we
|
|
can assume that the symbolic names match and use them to create
|
|
the mapping.
|
|
|
|
- only from_charmap is available. In this case we can only hope that
|
|
the symbolic names used are of the <Uxxxx> form in which case we
|
|
can use a UCS4->"to_code" iconv() conversion for the second step.
|
|
|
|
- only to_charmap is available. This is similar, only that we would
|
|
use iconv() for the "to_code"->UCS4 conversion.
|
|
|
|
We first create a table which maps input bytes into output bytes.
|
|
Once this is done we can handle all three of the cases above
|
|
equally. */
|
|
if (from_charmap != NULL)
|
|
{
|
|
if (to_charmap == NULL)
|
|
cvtbl = use_from_charmap (from_charmap, to_code);
|
|
else
|
|
cvtbl = use_both_charmaps (from_charmap, to_charmap);
|
|
}
|
|
else
|
|
{
|
|
assert (to_charmap != NULL);
|
|
cvtbl = use_to_charmap (from_code, to_charmap);
|
|
}
|
|
|
|
/* If we couldn't generate a table stop now. */
|
|
if (cvtbl == NULL)
|
|
return EXIT_FAILURE;
|
|
|
|
/* We can now start the conversion. */
|
|
if (remaining == argc)
|
|
{
|
|
if (process_file (cvtbl, stdin, output) != 0)
|
|
status = EXIT_FAILURE;
|
|
}
|
|
else
|
|
do
|
|
{
|
|
struct stat st;
|
|
char *addr;
|
|
int fd;
|
|
|
|
if (verbose)
|
|
printf ("%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]);
|
|
|
|
if (process_block (cvtbl, addr, st.st_size, output) < 0)
|
|
{
|
|
/* Something went wrong. */
|
|
status = EXIT_FAILURE;
|
|
|
|
/* We don't need the input data anymore. */
|
|
munmap ((void *) addr, st.st_size);
|
|
|
|
/* 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;
|
|
}
|
|
|
|
/* We don't need the input data anymore. */
|
|
munmap ((void *) addr, st.st_size);
|
|
}
|
|
else
|
|
#endif /* _POSIX_MAPPED_FILES */
|
|
{
|
|
/* Read the file in pieces. */
|
|
if (process_fd (cvtbl, fd, output) != 0)
|
|
{
|
|
/* Something went wrong. */
|
|
status = EXIT_FAILURE;
|
|
|
|
/* We don't need the input file anymore. */
|
|
close (fd);
|
|
|
|
/* 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;
|
|
}
|
|
|
|
/* Now close the file. */
|
|
close (fd);
|
|
}
|
|
}
|
|
while (++remaining < argc);
|
|
|
|
/* All done. */
|
|
return status;
|
|
}
|
|
|
|
|
|
static void
|
|
add_bytes (struct convtable *tbl, struct charseq *in, struct charseq *out)
|
|
{
|
|
int n = 0;
|
|
unsigned int byte;
|
|
|
|
assert (in->nbytes > 0);
|
|
|
|
byte = ((unsigned char *) in->bytes)[n];
|
|
while (n + 1 < in->nbytes)
|
|
{
|
|
if (is_term (tbl, byte) || tbl->val[byte].sub == NULL)
|
|
{
|
|
/* Note that we simply ignore a definition for a byte sequence
|
|
which is also the prefix for a longer one. */
|
|
clear_term (tbl, byte);
|
|
tbl->val[byte].sub =
|
|
(struct convtable *) xcalloc (1, sizeof (struct convtable));
|
|
}
|
|
|
|
tbl = tbl->val[byte].sub;
|
|
|
|
byte = ((unsigned char *) in->bytes)[++n];
|
|
}
|
|
|
|
/* Only add the new sequence if there is none yet and the byte sequence
|
|
is not part of an even longer one. */
|
|
if (! is_term (tbl, byte) && tbl->val[byte].sub == NULL)
|
|
{
|
|
set_term (tbl, byte);
|
|
tbl->val[byte].out = out;
|
|
}
|
|
}
|
|
|
|
|
|
static struct convtable *
|
|
use_from_charmap (struct charmap_t *from_charmap, const char *to_code)
|
|
{
|
|
/* We iterate over all entries in the from_charmap and for those which
|
|
have a known UCS4 representation we use an iconv() call to determine
|
|
the mapping to the to_code charset. */
|
|
struct convtable *rettbl;
|
|
iconv_t cd;
|
|
void *ptr = NULL;
|
|
const void *key;
|
|
size_t keylen;
|
|
void *data;
|
|
|
|
cd = iconv_open (to_code, "WCHAR_T");
|
|
if (cd == (iconv_t) -1)
|
|
/* We cannot do anything. */
|
|
return NULL;
|
|
|
|
rettbl = allocate_table ();
|
|
|
|
while (iterate_table (&from_charmap->char_table, &ptr, &key, &keylen, &data)
|
|
>= 0)
|
|
{
|
|
struct charseq *in = (struct charseq *) data;
|
|
|
|
if (in->ucs4 != UNINITIALIZED_CHAR_VALUE)
|
|
{
|
|
/* There is a chance. Try the iconv module. */
|
|
wchar_t inbuf[1] = { in->ucs4 };
|
|
unsigned char outbuf[64];
|
|
char *inptr = (char *) inbuf;
|
|
size_t inlen = sizeof (inbuf);
|
|
char *outptr = (char *) outbuf;
|
|
size_t outlen = sizeof (outbuf);
|
|
|
|
(void) iconv (cd, &inptr, &inlen, &outptr, &outlen);
|
|
|
|
if (outptr != (char *) outbuf)
|
|
{
|
|
/* We got some output. Good, use it. */
|
|
struct charseq *newp;
|
|
|
|
outlen = sizeof (outbuf) - outlen;
|
|
assert ((char *) outbuf + outlen == outptr);
|
|
|
|
newp = (struct charseq *) xmalloc (sizeof (struct charseq)
|
|
+ outlen);
|
|
newp->name = in->name;
|
|
newp->ucs4 = in->ucs4;
|
|
newp->nbytes = outlen;
|
|
memcpy (newp->bytes, outbuf, outlen);
|
|
|
|
add_bytes (rettbl, in, newp);
|
|
}
|
|
|
|
/* Clear any possible state left behind. */
|
|
(void) iconv (cd, NULL, NULL, NULL, NULL);
|
|
}
|
|
}
|
|
|
|
iconv_close (cd);
|
|
|
|
return rettbl;
|
|
}
|
|
|
|
|
|
static struct convtable *
|
|
use_to_charmap (const char *from_code, struct charmap_t *to_charmap)
|
|
{
|
|
/* We iterate over all entries in the to_charmap and for those which
|
|
have a known UCS4 representation we use an iconv() call to determine
|
|
the mapping to the from_code charset. */
|
|
struct convtable *rettbl;
|
|
iconv_t cd;
|
|
void *ptr = NULL;
|
|
const void *key;
|
|
size_t keylen;
|
|
void *data;
|
|
|
|
/* Note that the conversion we use here is the reverse direction. Without
|
|
exhaustive search we cannot figure out which input yields the UCS4
|
|
character we are looking for. Therefore we determine it the other
|
|
way round. */
|
|
cd = iconv_open (from_code, "WCHAR_T");
|
|
if (cd == (iconv_t) -1)
|
|
/* We cannot do anything. */
|
|
return NULL;
|
|
|
|
rettbl = allocate_table ();
|
|
|
|
while (iterate_table (&to_charmap->char_table, &ptr, &key, &keylen, &data)
|
|
>= 0)
|
|
{
|
|
struct charseq *out = (struct charseq *) data;
|
|
|
|
if (out->ucs4 != UNINITIALIZED_CHAR_VALUE)
|
|
{
|
|
/* There is a chance. Try the iconv module. */
|
|
wchar_t inbuf[1] = { out->ucs4 };
|
|
unsigned char outbuf[64];
|
|
char *inptr = (char *) inbuf;
|
|
size_t inlen = sizeof (inbuf);
|
|
char *outptr = (char *) outbuf;
|
|
size_t outlen = sizeof (outbuf);
|
|
|
|
(void) iconv (cd, &inptr, &inlen, &outptr, &outlen);
|
|
|
|
if (outptr != (char *) outbuf)
|
|
{
|
|
/* We got some output. Good, use it. */
|
|
struct charseq *newp;
|
|
|
|
outlen = sizeof (outbuf) - outlen;
|
|
assert ((char *) outbuf + outlen == outptr);
|
|
|
|
newp = (struct charseq *) xmalloc (sizeof (struct charseq)
|
|
+ outlen);
|
|
newp->name = out->name;
|
|
newp->ucs4 = out->ucs4;
|
|
newp->nbytes = outlen;
|
|
memcpy (newp->bytes, outbuf, outlen);
|
|
|
|
add_bytes (rettbl, newp, out);
|
|
}
|
|
|
|
/* Clear any possible state left behind. */
|
|
(void) iconv (cd, NULL, NULL, NULL, NULL);
|
|
}
|
|
}
|
|
|
|
iconv_close (cd);
|
|
|
|
return rettbl;
|
|
}
|
|
|
|
|
|
static struct convtable *
|
|
use_both_charmaps (struct charmap_t *from_charmap,
|
|
struct charmap_t *to_charmap)
|
|
{
|
|
/* In this case we iterate over all the entries in the from_charmap,
|
|
determine the internal name, and find an appropriate entry in the
|
|
to_charmap (if it exists). */
|
|
struct convtable *rettbl = allocate_table ();
|
|
void *ptr = NULL;
|
|
const void *key;
|
|
size_t keylen;
|
|
void *data;
|
|
|
|
while (iterate_table (&from_charmap->char_table, &ptr, &key, &keylen, &data)
|
|
>= 0)
|
|
{
|
|
struct charseq *in = (struct charseq *) data;
|
|
struct charseq *out = charmap_find_value (to_charmap, key, keylen);
|
|
|
|
if (out != NULL)
|
|
add_bytes (rettbl, in, out);
|
|
}
|
|
|
|
return rettbl;
|
|
}
|
|
|
|
|
|
static int
|
|
process_block (struct convtable *tbl, char *addr, size_t len, FILE *output)
|
|
{
|
|
size_t n = 0;
|
|
|
|
while (n < len)
|
|
{
|
|
struct convtable *cur = tbl;
|
|
unsigned char *curp = (unsigned char *) addr;
|
|
unsigned int byte = *curp;
|
|
int cnt;
|
|
struct charseq *out;
|
|
|
|
while (! is_term (cur, byte))
|
|
if (cur->val[byte].sub == NULL)
|
|
{
|
|
/* This is a invalid sequence. Skip the first byte if we are
|
|
ignoring errors. Otherwise punt. */
|
|
if (! omit_invalid)
|
|
{
|
|
error (0, 0, _("illegal input sequence at position %Zd"), n);
|
|
return -1;
|
|
}
|
|
|
|
n -= curp - (unsigned char *) addr;
|
|
|
|
byte = *(curp = (unsigned char *) ++addr);
|
|
if (++n >= len)
|
|
/* All converted. */
|
|
return 0;
|
|
|
|
cur = tbl;
|
|
}
|
|
else
|
|
{
|
|
cur = cur->val[byte].sub;
|
|
|
|
if (++n >= len)
|
|
{
|
|
error (0, 0, _("\
|
|
incomplete character or shift sequence at end of buffer"));
|
|
return -1;
|
|
}
|
|
|
|
byte = *++curp;
|
|
}
|
|
|
|
/* We found a final byte. Write the output bytes. */
|
|
out = cur->val[byte].out;
|
|
for (cnt = 0; cnt < out->nbytes; ++cnt)
|
|
fputc_unlocked (out->bytes[cnt], output);
|
|
|
|
addr = (char *) curp + 1;
|
|
++n;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
process_fd (struct convtable *tbl, 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;
|
|
|
|
/* Increase the buffer. */
|
|
maxlen += 32768;
|
|
inbuf = realloc (inbuf, maxlen);
|
|
if (inbuf == NULL)
|
|
error (0, errno, _("unable to allocate buffer for input"));
|
|
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 (tbl, inbuf, actlen, output);
|
|
}
|
|
|
|
|
|
static int
|
|
process_file (struct convtable *tbl, 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 (tbl, fileno (input), output);
|
|
}
|