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.
804 lines
22 KiB
C
804 lines
22 KiB
C
/* Provide access to the collection of available transformation modules.
|
|
Copyright (C) 1997,98,99,2000,2001 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
|
|
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 <limits.h>
|
|
#include <search.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/param.h>
|
|
#include <dirent.h>
|
|
|
|
#include <dlfcn.h>
|
|
#include <gconv_int.h>
|
|
#include <gconv_charset.h>
|
|
|
|
|
|
/* Simple data structure for alias mapping. We have two names, `from'
|
|
and `to'. */
|
|
void *__gconv_alias_db;
|
|
|
|
/* Array with available modules. */
|
|
struct gconv_module *__gconv_modules_db;
|
|
|
|
/* We modify global data. */
|
|
__LOCK_INIT(static, lock);
|
|
|
|
|
|
/* Function for searching alias. */
|
|
int
|
|
__gconv_alias_compare (const void *p1, const void *p2)
|
|
{
|
|
const struct gconv_alias *s1 = (const struct gconv_alias *) p1;
|
|
const struct gconv_alias *s2 = (const struct gconv_alias *) p2;
|
|
return strcmp (s1->fromname, s2->fromname);
|
|
}
|
|
|
|
|
|
/* To search for a derivation we create a list of intermediate steps.
|
|
Each element contains a pointer to the element which precedes it
|
|
in the derivation order. */
|
|
struct derivation_step
|
|
{
|
|
const char *result_set;
|
|
size_t result_set_len;
|
|
int cost_lo;
|
|
int cost_hi;
|
|
struct gconv_module *code;
|
|
struct derivation_step *last;
|
|
struct derivation_step *next;
|
|
};
|
|
|
|
#define NEW_STEP(result, hi, lo, module, last_mod) \
|
|
({ struct derivation_step *newp = alloca (sizeof (struct derivation_step)); \
|
|
newp->result_set = result; \
|
|
newp->result_set_len = strlen (result); \
|
|
newp->cost_hi = hi; \
|
|
newp->cost_lo = lo; \
|
|
newp->code = module; \
|
|
newp->last = last_mod; \
|
|
newp->next = NULL; \
|
|
newp; })
|
|
|
|
|
|
/* If a specific transformation is used more than once we should not need
|
|
to start looking for it again. Instead cache each successful result. */
|
|
struct known_derivation
|
|
{
|
|
const char *from;
|
|
const char *to;
|
|
struct __gconv_step *steps;
|
|
size_t nsteps;
|
|
};
|
|
|
|
/* Compare function for database of found derivations. */
|
|
static int
|
|
derivation_compare (const void *p1, const void *p2)
|
|
{
|
|
const struct known_derivation *s1 = (const struct known_derivation *) p1;
|
|
const struct known_derivation *s2 = (const struct known_derivation *) p2;
|
|
int result;
|
|
|
|
result = strcmp (s1->from, s2->from);
|
|
if (result == 0)
|
|
result = strcmp (s1->to, s2->to);
|
|
return result;
|
|
}
|
|
|
|
/* The search tree for known derivations. */
|
|
static void *known_derivations;
|
|
|
|
/* Look up whether given transformation was already requested before. */
|
|
static int
|
|
internal_function
|
|
derivation_lookup (const char *fromset, const char *toset,
|
|
struct __gconv_step **handle, size_t *nsteps)
|
|
{
|
|
struct known_derivation key = { fromset, toset, NULL, 0 };
|
|
struct known_derivation **result;
|
|
|
|
result = tfind (&key, &known_derivations, derivation_compare);
|
|
|
|
if (result == NULL)
|
|
return __GCONV_NOCONV;
|
|
|
|
*handle = (*result)->steps;
|
|
*nsteps = (*result)->nsteps;
|
|
|
|
/* Please note that we return GCONV_OK even if the last search for
|
|
this transformation was unsuccessful. */
|
|
return __GCONV_OK;
|
|
}
|
|
|
|
/* Add new derivation to list of known ones. */
|
|
static void
|
|
internal_function
|
|
add_derivation (const char *fromset, const char *toset,
|
|
struct __gconv_step *handle, size_t nsteps)
|
|
{
|
|
struct known_derivation *new_deriv;
|
|
size_t fromset_len = strlen (fromset) + 1;
|
|
size_t toset_len = strlen (toset) + 1;
|
|
|
|
new_deriv = (struct known_derivation *)
|
|
malloc (sizeof (struct known_derivation) + fromset_len + toset_len);
|
|
if (new_deriv != NULL)
|
|
{
|
|
char *tmp;
|
|
new_deriv->from = (char *) (new_deriv + 1);
|
|
tmp = memcpy (new_deriv + 1, fromset, fromset_len);
|
|
tmp += fromset_len;
|
|
|
|
new_deriv->to = memcpy (tmp,
|
|
toset, toset_len);
|
|
|
|
new_deriv->steps = handle;
|
|
new_deriv->nsteps = nsteps;
|
|
|
|
if (tsearch (new_deriv, &known_derivations, derivation_compare)
|
|
== NULL)
|
|
/* There is some kind of memory allocation problem. */
|
|
free (new_deriv);
|
|
}
|
|
/* Please note that we don't complain if the allocation failed. This
|
|
is not tragically but in case we use the memory debugging facilities
|
|
not all memory will be freed. */
|
|
}
|
|
|
|
static void
|
|
free_derivation (void *p)
|
|
{
|
|
struct known_derivation *deriv = (struct known_derivation *) p;
|
|
size_t cnt;
|
|
|
|
for (cnt = 0; cnt < deriv->nsteps; ++cnt)
|
|
if (deriv->steps[cnt].__counter > 0
|
|
&& deriv->steps[cnt].__end_fct != NULL)
|
|
deriv->steps[cnt].__end_fct (&deriv->steps[cnt]);
|
|
|
|
/* Free the name strings. */
|
|
free ((char *) deriv->steps[0].__from_name);
|
|
free ((char *) deriv->steps[deriv->nsteps - 1].__to_name);
|
|
|
|
free ((struct __gconv_step *) deriv->steps);
|
|
free (deriv);
|
|
}
|
|
|
|
|
|
/* Decrement the reference count for a single step in a steps array. */
|
|
void
|
|
internal_function
|
|
__gconv_release_step (struct __gconv_step *step)
|
|
{
|
|
if (--step->__counter == 0)
|
|
{
|
|
/* Call the destructor. */
|
|
if (step->__end_fct != NULL)
|
|
step->__end_fct (step);
|
|
|
|
#ifndef STATIC_GCONV
|
|
/* Skip builtin modules; they are not reference counted. */
|
|
if (step->__shlib_handle != NULL)
|
|
{
|
|
/* Release the loaded module. */
|
|
__gconv_release_shlib (step->__shlib_handle);
|
|
step->__shlib_handle = NULL;
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
|
|
static int
|
|
internal_function
|
|
gen_steps (struct derivation_step *best, const char *toset,
|
|
const char *fromset, struct __gconv_step **handle, size_t *nsteps)
|
|
{
|
|
size_t step_cnt = 0;
|
|
struct __gconv_step *result;
|
|
struct derivation_step *current;
|
|
int status = __GCONV_NOMEM;
|
|
|
|
/* First determine number of steps. */
|
|
for (current = best; current->last != NULL; current = current->last)
|
|
++step_cnt;
|
|
|
|
result = (struct __gconv_step *) malloc (sizeof (struct __gconv_step)
|
|
* step_cnt);
|
|
if (result != NULL)
|
|
{
|
|
int failed = 0;
|
|
|
|
status = __GCONV_OK;
|
|
*nsteps = step_cnt;
|
|
current = best;
|
|
while (step_cnt-- > 0)
|
|
{
|
|
result[step_cnt].__from_name = (step_cnt == 0
|
|
? strdup (fromset)
|
|
: (char *)current->last->result_set);
|
|
result[step_cnt].__to_name = (step_cnt + 1 == *nsteps
|
|
? strdup (current->result_set)
|
|
: result[step_cnt + 1].__from_name);
|
|
|
|
result[step_cnt].__counter = 1;
|
|
result[step_cnt].__data = NULL;
|
|
|
|
#ifndef STATIC_GCONV
|
|
if (current->code->module_name[0] == '/')
|
|
{
|
|
/* Load the module, return handle for it. */
|
|
struct __gconv_loaded_object *shlib_handle =
|
|
__gconv_find_shlib (current->code->module_name);
|
|
|
|
if (shlib_handle == NULL)
|
|
{
|
|
failed = 1;
|
|
break;
|
|
}
|
|
|
|
result[step_cnt].__shlib_handle = shlib_handle;
|
|
result[step_cnt].__modname = shlib_handle->name;
|
|
result[step_cnt].__fct = shlib_handle->fct;
|
|
result[step_cnt].__init_fct = shlib_handle->init_fct;
|
|
result[step_cnt].__end_fct = shlib_handle->end_fct;
|
|
|
|
/* Call the init function. */
|
|
if (result[step_cnt].__init_fct != NULL)
|
|
{
|
|
status = result[step_cnt].__init_fct (&result[step_cnt]);
|
|
|
|
if (__builtin_expect (status, __GCONV_OK) != __GCONV_OK)
|
|
{
|
|
failed = 1;
|
|
/* Make sure we unload this modules. */
|
|
--step_cnt;
|
|
result[step_cnt].__end_fct = NULL;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
#endif
|
|
/* It's a builtin transformation. */
|
|
__gconv_get_builtin_trans (current->code->module_name,
|
|
&result[step_cnt]);
|
|
|
|
current = current->last;
|
|
}
|
|
|
|
if (__builtin_expect (failed, 0) != 0)
|
|
{
|
|
/* Something went wrong while initializing the modules. */
|
|
while (++step_cnt < *nsteps)
|
|
__gconv_release_step (&result[step_cnt]);
|
|
free (result);
|
|
*nsteps = 0;
|
|
*handle = NULL;
|
|
if (status == __GCONV_OK)
|
|
status = __GCONV_NOCONV;
|
|
}
|
|
else
|
|
*handle = result;
|
|
}
|
|
else
|
|
{
|
|
*nsteps = 0;
|
|
*handle = NULL;
|
|
}
|
|
|
|
return status;
|
|
}
|
|
|
|
|
|
#ifndef STATIC_GCONV
|
|
static int
|
|
internal_function
|
|
increment_counter (struct __gconv_step *steps, size_t nsteps)
|
|
{
|
|
/* Increment the user counter. */
|
|
size_t cnt = nsteps;
|
|
int result = __GCONV_OK;
|
|
|
|
while (cnt-- > 0)
|
|
{
|
|
struct __gconv_step *step = &steps[cnt];
|
|
|
|
if (step->__counter++ == 0)
|
|
{
|
|
/* Skip builtin modules. */
|
|
if (step->__modname != NULL)
|
|
{
|
|
/* Reopen a previously used module. */
|
|
step->__shlib_handle = __gconv_find_shlib (step->__modname);
|
|
if (step->__shlib_handle == NULL)
|
|
{
|
|
/* Oops, this is the second time we use this module
|
|
(after unloading) and this time loading failed!? */
|
|
--step->__counter;
|
|
while (++cnt < nsteps)
|
|
__gconv_release_step (&steps[cnt]);
|
|
result = __GCONV_NOCONV;
|
|
break;
|
|
}
|
|
|
|
/* The function addresses defined by the module may
|
|
have changed. */
|
|
step->__fct = step->__shlib_handle->fct;
|
|
step->__init_fct = step->__shlib_handle->init_fct;
|
|
step->__end_fct = step->__shlib_handle->end_fct;
|
|
}
|
|
|
|
if (step->__init_fct != NULL)
|
|
step->__init_fct (step);
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
|
|
/* The main function: find a possible derivation from the `fromset' (either
|
|
the given name or the alias) to the `toset' (again with alias). */
|
|
static int
|
|
internal_function
|
|
find_derivation (const char *toset, const char *toset_expand,
|
|
const char *fromset, const char *fromset_expand,
|
|
struct __gconv_step **handle, size_t *nsteps)
|
|
{
|
|
struct derivation_step *first, *current, **lastp, *solution = NULL;
|
|
int best_cost_hi = INT_MAX;
|
|
int best_cost_lo = INT_MAX;
|
|
int result;
|
|
|
|
/* Look whether an earlier call to `find_derivation' has already
|
|
computed a possible derivation. If so, return it immediately. */
|
|
result = derivation_lookup (fromset_expand ?: fromset, toset_expand ?: toset,
|
|
handle, nsteps);
|
|
if (result == __GCONV_OK)
|
|
{
|
|
#ifndef STATIC_GCONV
|
|
result = increment_counter (*handle, *nsteps);
|
|
#endif
|
|
return result;
|
|
}
|
|
|
|
/* The task is to find a sequence of transformations, backed by the
|
|
existing modules - whether builtin or dynamically loadable -,
|
|
starting at `fromset' (or `fromset_expand') and ending at `toset'
|
|
(or `toset_expand'), and with minimal cost.
|
|
|
|
For computer scientists, this is a shortest path search in the
|
|
graph where the nodes are all possible charsets and the edges are
|
|
the transformations listed in __gconv_modules_db.
|
|
|
|
For now we use a simple algorithm with quadratic runtime behaviour.
|
|
A breadth-first search, starting at `fromset' and `fromset_expand'.
|
|
The list starting at `first' contains all nodes that have been
|
|
visited up to now, in the order in which they have been visited --
|
|
excluding the goal nodes `toset' and `toset_expand' which get
|
|
managed in the list starting at `solution'.
|
|
`current' walks through the list starting at `first' and looks
|
|
which nodes are reachable from the current node, adding them to
|
|
the end of the list [`first' or `solution' respectively] (if
|
|
they are visited the first time) or updating them in place (if
|
|
they have have already been visited).
|
|
In each node of either list, cost_lo and cost_hi contain the
|
|
minimum cost over any paths found up to now, starting at `fromset'
|
|
or `fromset_expand', ending at that node. best_cost_lo and
|
|
best_cost_hi represent the minimum over the elements of the
|
|
`solution' list. */
|
|
|
|
if (fromset_expand != NULL)
|
|
{
|
|
first = NEW_STEP (fromset_expand, 0, 0, NULL, NULL);
|
|
first->next = NEW_STEP (fromset, 0, 0, NULL, NULL);
|
|
lastp = &first->next->next;
|
|
}
|
|
else
|
|
{
|
|
first = NEW_STEP (fromset, 0, 0, NULL, NULL);
|
|
lastp = &first->next;
|
|
}
|
|
|
|
for (current = first; current != NULL; current = current->next)
|
|
{
|
|
/* Now match all the available module specifications against the
|
|
current charset name. If any of them matches check whether
|
|
we already have a derivation for this charset. If yes, use the
|
|
one with the lower costs. Otherwise add the new charset at the
|
|
end.
|
|
|
|
The module database is organized in a tree form which allows
|
|
searching for prefixes. So we search for the first entry with a
|
|
matching prefix and any other matching entry can be found from
|
|
this place. */
|
|
struct gconv_module *node;
|
|
|
|
/* Maybe it is not necessary anymore to look for a solution for
|
|
this entry since the cost is already as high (or higher) as
|
|
the cost for the best solution so far. */
|
|
if (current->cost_hi > best_cost_hi
|
|
|| (current->cost_hi == best_cost_hi
|
|
&& current->cost_lo >= best_cost_lo))
|
|
continue;
|
|
|
|
node = __gconv_modules_db;
|
|
while (node != NULL)
|
|
{
|
|
int cmpres = strcmp (current->result_set, node->from_string);
|
|
if (cmpres == 0)
|
|
{
|
|
/* Walk through the list of modules with this prefix and
|
|
try to match the name. */
|
|
struct gconv_module *runp;
|
|
|
|
/* Check all the modules with this prefix. */
|
|
runp = node;
|
|
do
|
|
{
|
|
const char *result_set = (strcmp (runp->to_string, "-") == 0
|
|
? (toset_expand ?: toset)
|
|
: runp->to_string);
|
|
int cost_hi = runp->cost_hi + current->cost_hi;
|
|
int cost_lo = runp->cost_lo + current->cost_lo;
|
|
struct derivation_step *step;
|
|
|
|
/* We managed to find a derivation. First see whether
|
|
we have reached one of the goal nodes. */
|
|
if (strcmp (result_set, toset) == 0
|
|
|| (toset_expand != NULL
|
|
&& strcmp (result_set, toset_expand) == 0))
|
|
{
|
|
/* Append to the `solution' list if there
|
|
is no entry with this name. */
|
|
for (step = solution; step != NULL; step = step->next)
|
|
if (strcmp (result_set, step->result_set) == 0)
|
|
break;
|
|
|
|
if (step == NULL)
|
|
{
|
|
step = NEW_STEP (result_set,
|
|
cost_hi, cost_lo,
|
|
runp, current);
|
|
step->next = solution;
|
|
solution = step;
|
|
}
|
|
else if (step->cost_hi > cost_hi
|
|
|| (step->cost_hi == cost_hi
|
|
&& step->cost_lo > cost_lo))
|
|
{
|
|
/* A better path was found for the node,
|
|
on the `solution' list. */
|
|
step->code = runp;
|
|
step->last = current;
|
|
step->cost_hi = cost_hi;
|
|
step->cost_lo = cost_lo;
|
|
}
|
|
|
|
/* Update best_cost accordingly. */
|
|
if (cost_hi < best_cost_hi
|
|
|| (cost_hi == best_cost_hi
|
|
&& cost_lo < best_cost_lo))
|
|
{
|
|
best_cost_hi = cost_hi;
|
|
best_cost_lo = cost_lo;
|
|
}
|
|
}
|
|
else if (cost_hi < best_cost_hi
|
|
|| (cost_hi == best_cost_hi
|
|
&& cost_lo < best_cost_lo))
|
|
{
|
|
/* Append at the end of the `first' list if there
|
|
is no entry with this name. */
|
|
for (step = first; step != NULL; step = step->next)
|
|
if (strcmp (result_set, step->result_set) == 0)
|
|
break;
|
|
|
|
if (step == NULL)
|
|
{
|
|
*lastp = NEW_STEP (result_set,
|
|
cost_hi, cost_lo,
|
|
runp, current);
|
|
lastp = &(*lastp)->next;
|
|
}
|
|
else if (step->cost_hi > cost_hi
|
|
|| (step->cost_hi == cost_hi
|
|
&& step->cost_lo > cost_lo))
|
|
{
|
|
/* A better path was found for the node,
|
|
on the `first' list. */
|
|
step->code = runp;
|
|
step->last = current;
|
|
|
|
/* Update the cost for all steps. */
|
|
for (step = first; step != NULL;
|
|
step = step->next)
|
|
/* But don't update the start nodes. */
|
|
if (step->code != NULL)
|
|
{
|
|
struct derivation_step *back;
|
|
int hi, lo;
|
|
|
|
hi = step->code->cost_hi;
|
|
lo = step->code->cost_lo;
|
|
|
|
for (back = step->last; back->code != NULL;
|
|
back = back->last)
|
|
{
|
|
hi += back->code->cost_hi;
|
|
lo += back->code->cost_lo;
|
|
}
|
|
|
|
step->cost_hi = hi;
|
|
step->cost_lo = lo;
|
|
}
|
|
|
|
/* Likewise for the nodes on the solution list.
|
|
Also update best_cost accordingly. */
|
|
for (step = solution; step != NULL;
|
|
step = step->next)
|
|
{
|
|
step->cost_hi = (step->code->cost_hi
|
|
+ step->last->cost_hi);
|
|
step->cost_lo = (step->code->cost_lo
|
|
+ step->last->cost_lo);
|
|
|
|
if (step->cost_hi < best_cost_hi
|
|
|| (step->cost_hi == best_cost_hi
|
|
&& step->cost_lo < best_cost_lo))
|
|
{
|
|
best_cost_hi = step->cost_hi;
|
|
best_cost_lo = step->cost_lo;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
runp = runp->same;
|
|
}
|
|
while (runp != NULL);
|
|
|
|
break;
|
|
}
|
|
else if (cmpres < 0)
|
|
node = node->left;
|
|
else
|
|
node = node->right;
|
|
}
|
|
}
|
|
|
|
if (solution != NULL)
|
|
{
|
|
/* We really found a way to do the transformation. */
|
|
|
|
/* Choose the best solution. This is easy because we know that
|
|
the solution list has at most length 2 (one for every possible
|
|
goal node). */
|
|
if (solution->next != NULL)
|
|
{
|
|
struct derivation_step *solution2 = solution->next;
|
|
|
|
if (solution2->cost_hi < solution->cost_hi
|
|
|| (solution2->cost_hi == solution->cost_hi
|
|
&& solution2->cost_lo < solution->cost_lo))
|
|
solution = solution2;
|
|
}
|
|
|
|
/* Now build a data structure describing the transformation steps. */
|
|
result = gen_steps (solution, toset_expand ?: toset,
|
|
fromset_expand ?: fromset, handle, nsteps);
|
|
}
|
|
else
|
|
{
|
|
/* We haven't found a transformation. Clear the result values. */
|
|
*handle = NULL;
|
|
*nsteps = 0;
|
|
}
|
|
|
|
/* Add result in any case to list of known derivations. */
|
|
add_derivation (fromset_expand ?: fromset, toset_expand ?: toset,
|
|
*handle, *nsteps);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/* Control of initialization. */
|
|
__libc_once_define (static, once);
|
|
|
|
|
|
static const char *
|
|
do_lookup_alias (const char *name)
|
|
{
|
|
struct gconv_alias key;
|
|
struct gconv_alias **found;
|
|
|
|
key.fromname = (char *) name;
|
|
found = tfind (&key, &__gconv_alias_db, __gconv_alias_compare);
|
|
return found != NULL ? (*found)->toname : NULL;
|
|
}
|
|
|
|
|
|
int
|
|
internal_function
|
|
__gconv_compare_alias (const char *name1, const char *name2)
|
|
{
|
|
int result;
|
|
|
|
/* Ensure that the configuration data is read. */
|
|
__libc_once (once, __gconv_read_conf);
|
|
|
|
if (__gconv_compare_alias_cache (name1, name2, &result) != 0)
|
|
result = strcmp (do_lookup_alias (name1) ?: name1,
|
|
do_lookup_alias (name2) ?: name2);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
int
|
|
internal_function
|
|
__gconv_find_transform (const char *toset, const char *fromset,
|
|
struct __gconv_step **handle, size_t *nsteps,
|
|
int flags)
|
|
{
|
|
const char *fromset_expand;
|
|
const char *toset_expand;
|
|
int result;
|
|
|
|
/* Ensure that the configuration data is read. */
|
|
__libc_once (once, __gconv_read_conf);
|
|
|
|
/* Acquire the lock. */
|
|
#ifdef HAVE_DD_LOCK
|
|
__lock_acquire(lock);
|
|
#endif
|
|
|
|
result = __gconv_lookup_cache (toset, fromset, handle, nsteps, flags);
|
|
if (result != __GCONV_NODB)
|
|
{
|
|
/* We have a cache and could resolve the request, successful or not. */
|
|
#ifdef HAVE_DD_LOCK
|
|
__lock_release(lock);
|
|
#endif
|
|
|
|
return result;
|
|
}
|
|
|
|
/* If we don't have a module database return with an error. */
|
|
if (__gconv_modules_db == NULL)
|
|
{
|
|
#ifdef HAVE_DD_LOCK
|
|
__lock_release(lock);
|
|
#endif
|
|
|
|
return __GCONV_NOCONV;
|
|
}
|
|
|
|
/* See whether the names are aliases. */
|
|
fromset_expand = do_lookup_alias (fromset);
|
|
toset_expand = do_lookup_alias (toset);
|
|
|
|
if (__builtin_expect (flags & GCONV_AVOID_NOCONV, 0)
|
|
/* We are not supposed to create a pseudo transformation (means
|
|
copying) when the input and output character set are the same. */
|
|
&& (strcmp (toset, fromset) == 0
|
|
|| (toset_expand != NULL && strcmp (toset_expand, fromset) == 0)
|
|
|| (fromset_expand != NULL
|
|
&& (strcmp (toset, fromset_expand) == 0
|
|
|| (toset_expand != NULL
|
|
&& strcmp (toset_expand, fromset_expand) == 0)))))
|
|
{
|
|
/* Both character sets are the same. */
|
|
#ifdef HAVE_DD_LOCK
|
|
__lock_release(lock);
|
|
#endif
|
|
|
|
return __GCONV_NOCONV;
|
|
}
|
|
|
|
result = find_derivation (toset, toset_expand, fromset, fromset_expand,
|
|
handle, nsteps);
|
|
|
|
/* Release the lock. */
|
|
#ifdef HAVE_DD_LOCK
|
|
__lock_release(lock);
|
|
#endif
|
|
|
|
|
|
/* The following code is necessary since `find_derivation' will return
|
|
GCONV_OK even when no derivation was found but the same request
|
|
was processed before. I.e., negative results will also be cached. */
|
|
return (result == __GCONV_OK
|
|
? (*handle == NULL ? __GCONV_NOCONV : __GCONV_OK)
|
|
: result);
|
|
}
|
|
|
|
|
|
/* Release the entries of the modules list. */
|
|
int
|
|
internal_function
|
|
__gconv_close_transform (struct __gconv_step *steps, size_t nsteps)
|
|
{
|
|
int result = __GCONV_OK;
|
|
size_t cnt;
|
|
|
|
/* Acquire the lock. */
|
|
#ifdef HAVE_DD_LOCK
|
|
__lock_acquire(lock);
|
|
#endif
|
|
|
|
|
|
#ifndef STATIC_GCONV
|
|
cnt = nsteps;
|
|
while (cnt-- > 0)
|
|
__gconv_release_step (&steps[cnt]);
|
|
#endif
|
|
|
|
/* If we use the cache we free a bit more since we don't keep any
|
|
transformation records around, they are cheap enough to
|
|
recreate. */
|
|
__gconv_release_cache (steps, nsteps);
|
|
|
|
/* Release the lock. */
|
|
#ifdef HAVE_DD_LOCK
|
|
__lock_release(lock);
|
|
#endif
|
|
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/* Free the modules mentioned. */
|
|
static void
|
|
internal_function
|
|
free_modules_db (struct gconv_module *node)
|
|
{
|
|
if (node->left != NULL)
|
|
free_modules_db (node->left);
|
|
if (node->right != NULL)
|
|
free_modules_db (node->right);
|
|
do
|
|
{
|
|
struct gconv_module *act = node;
|
|
node = node->same;
|
|
if (act->module_name[0] == '/')
|
|
free (act);
|
|
}
|
|
while (node != NULL);
|
|
}
|
|
|
|
|
|
/* Free all resources if necessary. */
|
|
static void __attribute__ ((unused))
|
|
free_mem (void)
|
|
{
|
|
if (__gconv_alias_db != NULL)
|
|
tdestroy (__gconv_alias_db, free);
|
|
|
|
if (__gconv_modules_db != NULL)
|
|
free_modules_db (__gconv_modules_db);
|
|
|
|
if (known_derivations != NULL)
|
|
tdestroy (known_derivations, free_derivation);
|
|
}
|
|
|
|
text_set_element (__libc_subfreeres, free_mem);
|