mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-16 03:19:54 +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.
745 lines
17 KiB
C
745 lines
17 KiB
C
/*
|
|
* Copyright (c) 1996, 1998 by Internet Software Consortium.
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
|
|
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
|
|
* CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
|
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
|
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
|
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#define MIN(a,b) ((a) < (b) ? (a) : (b))
|
|
|
|
#include <sys/cdefs.h>
|
|
#include <sys/types.h>
|
|
|
|
/* Import. */
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
|
|
#include <netinet/in.h>
|
|
#include <arpa/nameser.h>
|
|
#include <arpa/inet.h>
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <resolv.h>
|
|
#include <string.h>
|
|
#include <ctype.h>
|
|
|
|
#define SPRINTF(x) ((size_t)sprintf x)
|
|
|
|
/* Forward. */
|
|
|
|
static size_t prune_origin(const char *name, const char *origin);
|
|
static int charstr(const u_char *rdata, const u_char *edata,
|
|
char **buf, size_t *buflen);
|
|
static int addname(const u_char *msg, size_t msglen,
|
|
const u_char **p, const char *origin,
|
|
char **buf, size_t *buflen);
|
|
static void addlen(size_t len, char **buf, size_t *buflen);
|
|
static int addstr(const char *src, size_t len,
|
|
char **buf, size_t *buflen);
|
|
static int addtab(size_t len, size_t target, int spaced,
|
|
char **buf, size_t *buflen);
|
|
|
|
/* Macros. */
|
|
|
|
#define T(x) \
|
|
do { \
|
|
if ((x) < 0) \
|
|
return (-1); \
|
|
} while (0)
|
|
|
|
/* Public. */
|
|
|
|
/*
|
|
* int
|
|
* ns_sprintrr(handle, rr, name_ctx, origin, buf, buflen)
|
|
* Convert an RR to presentation format.
|
|
* return:
|
|
* Number of characters written to buf, or -1 (check errno).
|
|
*/
|
|
int
|
|
ns_sprintrr(const ns_msg *handle, const ns_rr *rr,
|
|
const char *name_ctx, const char *origin,
|
|
char *buf, size_t buflen)
|
|
{
|
|
int n;
|
|
|
|
n = ns_sprintrrf(ns_msg_base(*handle), ns_msg_size(*handle),
|
|
ns_rr_name(*rr), ns_rr_class(*rr), ns_rr_type(*rr),
|
|
ns_rr_ttl(*rr), ns_rr_rdata(*rr), ns_rr_rdlen(*rr),
|
|
name_ctx, origin, buf, buflen);
|
|
return (n);
|
|
}
|
|
|
|
/*
|
|
* int
|
|
* ns_sprintrrf(msg, msglen, name, class, type, ttl, rdata, rdlen,
|
|
* name_ctx, origin, buf, buflen)
|
|
* Convert the fields of an RR into presentation format.
|
|
* return:
|
|
* Number of characters written to buf, or -1 (check errno).
|
|
*/
|
|
int
|
|
ns_sprintrrf(const u_char *msg, size_t msglen,
|
|
const char *name, ns_class class, ns_type type,
|
|
u_long ttl, const u_char *rdata, size_t rdlen,
|
|
const char *name_ctx, const char *origin,
|
|
char *buf, size_t buflen)
|
|
{
|
|
const char *obuf = buf;
|
|
const u_char *edata = rdata + rdlen;
|
|
int spaced = 0;
|
|
|
|
const char *comment;
|
|
char tmp[100];
|
|
int len, x;
|
|
|
|
/*
|
|
* Owner.
|
|
*/
|
|
if (name_ctx != NULL && strcasecmp(name_ctx, name) == 0) {
|
|
T(addstr("\t\t\t", 3, &buf, &buflen));
|
|
} else {
|
|
len = prune_origin(name, origin);
|
|
if (len == 0) {
|
|
T(addstr("@\t\t\t", 4, &buf, &buflen));
|
|
} else {
|
|
T(addstr(name, len, &buf, &buflen));
|
|
/* Origin not used and no trailing dot? */
|
|
if ((!origin || !origin[0] || name[len] == '\0') &&
|
|
name[len - 1] != '.') {
|
|
T(addstr(".", 1, &buf, &buflen));
|
|
len++;
|
|
}
|
|
T(spaced = addtab(len, 24, spaced, &buf, &buflen));
|
|
}
|
|
}
|
|
|
|
/*
|
|
* TTL, Class, Type.
|
|
*/
|
|
T(x = ns_format_ttl(ttl, buf, buflen));
|
|
addlen(x, &buf, &buflen);
|
|
len = SPRINTF((tmp, " %s %s", p_class(class), p_type(type)));
|
|
T(addstr(tmp, len, &buf, &buflen));
|
|
T(spaced = addtab(x + len, 16, spaced, &buf, &buflen));
|
|
|
|
/*
|
|
* RData.
|
|
*/
|
|
switch (type) {
|
|
case ns_t_a:
|
|
if (rdlen != NS_INADDRSZ)
|
|
goto formerr;
|
|
(void) inet_ntop(AF_INET, rdata, buf, buflen);
|
|
addlen(strlen(buf), &buf, &buflen);
|
|
break;
|
|
|
|
case ns_t_cname:
|
|
case ns_t_mb:
|
|
case ns_t_mg:
|
|
case ns_t_mr:
|
|
case ns_t_ns:
|
|
case ns_t_ptr:
|
|
T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
|
|
break;
|
|
|
|
case ns_t_hinfo:
|
|
case ns_t_isdn:
|
|
/* First word. */
|
|
T(len = charstr(rdata, edata, &buf, &buflen));
|
|
if (len == 0)
|
|
goto formerr;
|
|
rdata += len;
|
|
T(addstr(" ", 1, &buf, &buflen));
|
|
|
|
/* Second word. */
|
|
T(len = charstr(rdata, edata, &buf, &buflen));
|
|
if (len == 0)
|
|
goto formerr;
|
|
rdata += len;
|
|
break;
|
|
|
|
case ns_t_soa: {
|
|
u_long t;
|
|
|
|
/* Server name. */
|
|
T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
|
|
T(addstr(" ", 1, &buf, &buflen));
|
|
|
|
/* Administrator name. */
|
|
T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
|
|
T(addstr(" (\n", 3, &buf, &buflen));
|
|
spaced = 0;
|
|
|
|
if ((edata - rdata) != 5*NS_INT32SZ)
|
|
goto formerr;
|
|
|
|
/* Serial number. */
|
|
t = ns_get32(rdata); rdata += NS_INT32SZ;
|
|
T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
|
|
len = SPRINTF((tmp, "%lu", t));
|
|
T(addstr(tmp, len, &buf, &buflen));
|
|
T(spaced = addtab(len, 16, spaced, &buf, &buflen));
|
|
T(addstr("; serial\n", 9, &buf, &buflen));
|
|
spaced = 0;
|
|
|
|
/* Refresh interval. */
|
|
t = ns_get32(rdata); rdata += NS_INT32SZ;
|
|
T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
|
|
T(len = ns_format_ttl(t, buf, buflen));
|
|
addlen(len, &buf, &buflen);
|
|
T(spaced = addtab(len, 16, spaced, &buf, &buflen));
|
|
T(addstr("; refresh\n", 10, &buf, &buflen));
|
|
spaced = 0;
|
|
|
|
/* Retry interval. */
|
|
t = ns_get32(rdata); rdata += NS_INT32SZ;
|
|
T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
|
|
T(len = ns_format_ttl(t, buf, buflen));
|
|
addlen(len, &buf, &buflen);
|
|
T(spaced = addtab(len, 16, spaced, &buf, &buflen));
|
|
T(addstr("; retry\n", 8, &buf, &buflen));
|
|
spaced = 0;
|
|
|
|
/* Expiry. */
|
|
t = ns_get32(rdata); rdata += NS_INT32SZ;
|
|
T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
|
|
T(len = ns_format_ttl(t, buf, buflen));
|
|
addlen(len, &buf, &buflen);
|
|
T(spaced = addtab(len, 16, spaced, &buf, &buflen));
|
|
T(addstr("; expiry\n", 9, &buf, &buflen));
|
|
spaced = 0;
|
|
|
|
/* Minimum TTL. */
|
|
t = ns_get32(rdata); rdata += NS_INT32SZ;
|
|
T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
|
|
T(len = ns_format_ttl(t, buf, buflen));
|
|
addlen(len, &buf, &buflen);
|
|
T(addstr(" )", 2, &buf, &buflen));
|
|
T(spaced = addtab(len, 16, spaced, &buf, &buflen));
|
|
T(addstr("; minimum\n", 10, &buf, &buflen));
|
|
|
|
break;
|
|
}
|
|
|
|
case ns_t_mx:
|
|
case ns_t_afsdb:
|
|
case ns_t_rt: {
|
|
u_int t;
|
|
|
|
if (rdlen < NS_INT16SZ)
|
|
goto formerr;
|
|
|
|
/* Priority. */
|
|
t = ns_get16(rdata);
|
|
rdata += NS_INT16SZ;
|
|
len = SPRINTF((tmp, "%u ", t));
|
|
T(addstr(tmp, len, &buf, &buflen));
|
|
|
|
/* Target. */
|
|
T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
|
|
|
|
break;
|
|
}
|
|
|
|
case ns_t_px: {
|
|
u_int t;
|
|
|
|
if (rdlen < NS_INT16SZ)
|
|
goto formerr;
|
|
|
|
/* Priority. */
|
|
t = ns_get16(rdata);
|
|
rdata += NS_INT16SZ;
|
|
len = SPRINTF((tmp, "%u ", t));
|
|
T(addstr(tmp, len, &buf, &buflen));
|
|
|
|
/* Name1. */
|
|
T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
|
|
T(addstr(" ", 1, &buf, &buflen));
|
|
|
|
/* Name2. */
|
|
T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
|
|
|
|
break;
|
|
}
|
|
|
|
case ns_t_x25:
|
|
T(len = charstr(rdata, edata, &buf, &buflen));
|
|
if (len == 0)
|
|
goto formerr;
|
|
rdata += len;
|
|
break;
|
|
|
|
case ns_t_txt:
|
|
while (rdata < edata) {
|
|
T(len = charstr(rdata, edata, &buf, &buflen));
|
|
if (len == 0)
|
|
goto formerr;
|
|
rdata += len;
|
|
if (rdata < edata)
|
|
T(addstr(" ", 1, &buf, &buflen));
|
|
}
|
|
break;
|
|
|
|
case ns_t_nsap: {
|
|
char t[255*3];
|
|
|
|
(void) inet_nsap_ntoa(rdlen, rdata, t);
|
|
T(addstr(t, strlen(t), &buf, &buflen));
|
|
break;
|
|
}
|
|
|
|
case ns_t_aaaa:
|
|
if (rdlen != NS_IN6ADDRSZ)
|
|
goto formerr;
|
|
(void) inet_ntop(AF_INET6, rdata, buf, buflen);
|
|
addlen(strlen(buf), &buf, &buflen);
|
|
break;
|
|
|
|
case ns_t_loc: {
|
|
char t[255];
|
|
|
|
/* XXX protocol format checking? */
|
|
(void) loc_ntoa(rdata, t);
|
|
T(addstr(t, strlen(t), &buf, &buflen));
|
|
break;
|
|
}
|
|
|
|
case ns_t_naptr: {
|
|
u_int order, preference;
|
|
char t[50];
|
|
|
|
if (rdlen < 2*NS_INT16SZ)
|
|
goto formerr;
|
|
|
|
/* Order, Precedence. */
|
|
order = ns_get16(rdata); rdata += NS_INT16SZ;
|
|
preference = ns_get16(rdata); rdata += NS_INT16SZ;
|
|
len = SPRINTF((t, "%u %u ", order, preference));
|
|
T(addstr(t, len, &buf, &buflen));
|
|
|
|
/* Flags. */
|
|
T(len = charstr(rdata, edata, &buf, &buflen));
|
|
if (len == 0)
|
|
goto formerr;
|
|
rdata += len;
|
|
T(addstr(" ", 1, &buf, &buflen));
|
|
|
|
/* Service. */
|
|
T(len = charstr(rdata, edata, &buf, &buflen));
|
|
if (len == 0)
|
|
goto formerr;
|
|
rdata += len;
|
|
T(addstr(" ", 1, &buf, &buflen));
|
|
|
|
/* Regexp. */
|
|
T(len = charstr(rdata, edata, &buf, &buflen));
|
|
if (len < 0)
|
|
return (-1);
|
|
if (len == 0)
|
|
goto formerr;
|
|
rdata += len;
|
|
T(addstr(" ", 1, &buf, &buflen));
|
|
|
|
/* Server. */
|
|
T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
|
|
break;
|
|
}
|
|
|
|
case ns_t_srv: {
|
|
u_int priority, weight, port;
|
|
char t[50];
|
|
|
|
if (rdlen < NS_INT16SZ*3)
|
|
goto formerr;
|
|
|
|
/* Priority, Weight, Port. */
|
|
priority = ns_get16(rdata); rdata += NS_INT16SZ;
|
|
weight = ns_get16(rdata); rdata += NS_INT16SZ;
|
|
port = ns_get16(rdata); rdata += NS_INT16SZ;
|
|
len = SPRINTF((t, "%u %u %u ", priority, weight, port));
|
|
T(addstr(t, len, &buf, &buflen));
|
|
|
|
/* Server. */
|
|
T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
|
|
break;
|
|
}
|
|
|
|
case ns_t_minfo:
|
|
case ns_t_rp:
|
|
/* Name1. */
|
|
T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
|
|
T(addstr(" ", 1, &buf, &buflen));
|
|
|
|
/* Name2. */
|
|
T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
|
|
|
|
break;
|
|
|
|
case ns_t_wks: {
|
|
int n, lcnt;
|
|
|
|
if (rdlen < NS_INT32SZ + 1)
|
|
goto formerr;
|
|
|
|
/* Address. */
|
|
(void) inet_ntop(AF_INET, rdata, buf, buflen);
|
|
addlen(strlen(buf), &buf, &buflen);
|
|
rdata += NS_INADDRSZ;
|
|
|
|
/* Protocol. */
|
|
len = SPRINTF((tmp, " %u ( ", *rdata));
|
|
T(addstr(tmp, len, &buf, &buflen));
|
|
rdata += NS_INT8SZ;
|
|
|
|
/* Bit map. */
|
|
n = 0;
|
|
lcnt = 0;
|
|
while (rdata < edata) {
|
|
u_int c = *rdata++;
|
|
do {
|
|
if (c & 0200) {
|
|
if (lcnt == 0) {
|
|
T(addstr("\n\t\t\t\t", 5,
|
|
&buf, &buflen));
|
|
lcnt = 10;
|
|
spaced = 0;
|
|
}
|
|
len = SPRINTF((tmp, "%d ", n));
|
|
T(addstr(tmp, len, &buf, &buflen));
|
|
lcnt--;
|
|
}
|
|
c <<= 1;
|
|
} while (++n & 07);
|
|
}
|
|
T(addstr(")", 1, &buf, &buflen));
|
|
|
|
break;
|
|
}
|
|
|
|
case ns_t_key: {
|
|
char base64_key[NS_MD5RSA_MAX_BASE64];
|
|
u_int keyflags, protocol, algorithm;
|
|
const char *leader;
|
|
int n;
|
|
|
|
if (rdlen < NS_INT16SZ + NS_INT8SZ + NS_INT8SZ)
|
|
goto formerr;
|
|
|
|
/* Key flags, Protocol, Algorithm. */
|
|
keyflags = ns_get16(rdata); rdata += NS_INT16SZ;
|
|
protocol = *rdata++;
|
|
algorithm = *rdata++;
|
|
len = SPRINTF((tmp, "0x%04x %u %u",
|
|
keyflags, protocol, algorithm));
|
|
T(addstr(tmp, len, &buf, &buflen));
|
|
|
|
/* Public key data. */
|
|
len = b64_ntop(rdata, edata - rdata,
|
|
base64_key, sizeof base64_key);
|
|
if (len < 0)
|
|
goto formerr;
|
|
if (len > 15) {
|
|
T(addstr(" (", 2, &buf, &buflen));
|
|
leader = "\n\t\t";
|
|
spaced = 0;
|
|
} else
|
|
leader = " ";
|
|
for (n = 0; n < len; n += 48) {
|
|
T(addstr(leader, strlen(leader), &buf, &buflen));
|
|
T(addstr(base64_key + n, MIN(len - n, 48),
|
|
&buf, &buflen));
|
|
}
|
|
if (len > 15)
|
|
T(addstr(" )", 2, &buf, &buflen));
|
|
|
|
break;
|
|
}
|
|
|
|
case ns_t_sig: {
|
|
char base64_key[NS_MD5RSA_MAX_BASE64];
|
|
u_int type, algorithm, labels, footprint;
|
|
const char *leader;
|
|
u_long t;
|
|
int n;
|
|
|
|
if (rdlen < 22)
|
|
goto formerr;
|
|
|
|
/* Type covered, Algorithm, Label count, Original TTL. */
|
|
type = ns_get16(rdata); rdata += NS_INT16SZ;
|
|
algorithm = *rdata++;
|
|
labels = *rdata++;
|
|
t = ns_get32(rdata); rdata += NS_INT32SZ;
|
|
len = SPRINTF((tmp, " %s %d %lu ",
|
|
p_type(type), algorithm, t));
|
|
T(addstr(tmp, len, &buf, &buflen));
|
|
if (labels != (u_int)dn_count_labels(name))
|
|
goto formerr;
|
|
|
|
/* Signature expiry. */
|
|
t = ns_get32(rdata); rdata += NS_INT32SZ;
|
|
len = SPRINTF((tmp, "%s ", p_secstodate(t)));
|
|
T(addstr(tmp, len, &buf, &buflen));
|
|
|
|
/* Time signed. */
|
|
t = ns_get32(rdata); rdata += NS_INT32SZ;
|
|
len = SPRINTF((tmp, "%s ", p_secstodate(t)));
|
|
T(addstr(tmp, len, &buf, &buflen));
|
|
|
|
/* Signature Footprint. */
|
|
footprint = ns_get16(rdata); rdata += NS_INT16SZ;
|
|
len = SPRINTF((tmp, "%u ", footprint));
|
|
T(addstr(tmp, len, &buf, &buflen));
|
|
|
|
/* Signer's name. */
|
|
T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
|
|
|
|
/* Signature. */
|
|
len = b64_ntop(rdata, edata - rdata,
|
|
base64_key, sizeof base64_key);
|
|
if (len > 15) {
|
|
T(addstr(" (", 2, &buf, &buflen));
|
|
leader = "\n\t\t";
|
|
spaced = 0;
|
|
} else
|
|
leader = " ";
|
|
if (len < 0)
|
|
goto formerr;
|
|
for (n = 0; n < len; n += 48) {
|
|
T(addstr(leader, strlen(leader), &buf, &buflen));
|
|
T(addstr(base64_key + n, MIN(len - n, 48),
|
|
&buf, &buflen));
|
|
}
|
|
if (len > 15)
|
|
T(addstr(" )", 2, &buf, &buflen));
|
|
|
|
break;
|
|
}
|
|
|
|
case ns_t_nxt: {
|
|
int n, c;
|
|
|
|
/* Next domain name. */
|
|
T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
|
|
|
|
/* Type bit map. */
|
|
n = edata - rdata;
|
|
for (c = 0; c < n*8; c++)
|
|
if (NS_NXT_BIT_ISSET(c, rdata)) {
|
|
len = SPRINTF((tmp, " %s", p_type(c)));
|
|
T(addstr(tmp, len, &buf, &buflen));
|
|
}
|
|
break;
|
|
}
|
|
|
|
default:
|
|
comment = "unknown RR type";
|
|
goto hexify;
|
|
}
|
|
return (buf - obuf);
|
|
formerr:
|
|
comment = "RR format error";
|
|
hexify: {
|
|
int n, m;
|
|
char *p;
|
|
|
|
len = SPRINTF((tmp, "\\#(\t\t; %s", comment));
|
|
T(addstr(tmp, len, &buf, &buflen));
|
|
while (rdata < edata) {
|
|
p = tmp;
|
|
p += SPRINTF((p, "\n\t"));
|
|
spaced = 0;
|
|
n = MIN(16, edata - rdata);
|
|
for (m = 0; m < n; m++)
|
|
p += SPRINTF((p, "%02x ", rdata[m]));
|
|
T(addstr(tmp, p - tmp, &buf, &buflen));
|
|
if (n < 16) {
|
|
T(addstr(")", 1, &buf, &buflen));
|
|
T(addtab(p - tmp + 1, 48, spaced, &buf, &buflen));
|
|
}
|
|
p = tmp;
|
|
p += SPRINTF((p, "; "));
|
|
for (m = 0; m < n; m++)
|
|
*p++ = (isascii(rdata[m]) && isprint(rdata[m]))
|
|
? rdata[m]
|
|
: '.';
|
|
T(addstr(tmp, p - tmp, &buf, &buflen));
|
|
rdata += n;
|
|
}
|
|
return (buf - obuf);
|
|
}
|
|
}
|
|
|
|
/* Private. */
|
|
|
|
/*
|
|
* size_t
|
|
* prune_origin(name, origin)
|
|
* Find out if the name is at or under the current origin.
|
|
* return:
|
|
* Number of characters in name before start of origin,
|
|
* or length of name if origin does not match.
|
|
* notes:
|
|
* This function should share code with samedomain().
|
|
*/
|
|
static size_t
|
|
prune_origin(const char *name, const char *origin) {
|
|
const char *oname = name;
|
|
|
|
while (*name != '\0') {
|
|
if (origin != NULL && strcasecmp(name, origin) == 0)
|
|
return (name - oname - (name > oname));
|
|
while (*name != '\0') {
|
|
if (*name == '\\') {
|
|
name++;
|
|
/* XXX need to handle \nnn form. */
|
|
if (*name == '\0')
|
|
break;
|
|
} else if (*name == '.') {
|
|
name++;
|
|
break;
|
|
}
|
|
name++;
|
|
}
|
|
}
|
|
return (name - oname);
|
|
}
|
|
|
|
/*
|
|
* int
|
|
* charstr(rdata, edata, buf, buflen)
|
|
* Format a <character-string> into the presentation buffer.
|
|
* return:
|
|
* Number of rdata octets consumed
|
|
* 0 for protocol format error
|
|
* -1 for output buffer error
|
|
* side effects:
|
|
* buffer is advanced on success.
|
|
*/
|
|
static int
|
|
charstr(const u_char *rdata, const u_char *edata, char **buf, size_t *buflen) {
|
|
const u_char *odata = rdata;
|
|
size_t save_buflen = *buflen;
|
|
char *save_buf = *buf;
|
|
|
|
if (addstr("\"", 1, buf, buflen) < 0)
|
|
goto enospc;
|
|
if (rdata < edata) {
|
|
int n = *rdata;
|
|
|
|
if (rdata + 1 + n <= edata) {
|
|
rdata++;
|
|
while (n-- > 0) {
|
|
if (strchr("\n\"\\", *rdata) != NULL)
|
|
if (addstr("\\", 1, buf, buflen) < 0)
|
|
goto enospc;
|
|
if (addstr((const char *)rdata, 1,
|
|
buf, buflen) < 0)
|
|
goto enospc;
|
|
rdata++;
|
|
}
|
|
}
|
|
}
|
|
if (addstr("\"", 1, buf, buflen) < 0)
|
|
goto enospc;
|
|
return (rdata - odata);
|
|
enospc:
|
|
errno = ENOSPC;
|
|
*buf = save_buf;
|
|
*buflen = save_buflen;
|
|
return (-1);
|
|
}
|
|
|
|
static int
|
|
addname(const u_char *msg, size_t msglen,
|
|
const u_char **pp, const char *origin,
|
|
char **buf, size_t *buflen)
|
|
{
|
|
size_t newlen, save_buflen = *buflen;
|
|
char *save_buf = *buf;
|
|
int n;
|
|
|
|
n = dn_expand(msg, msg + msglen, *pp, *buf, *buflen);
|
|
if (n < 0)
|
|
goto enospc; /* Guess. */
|
|
newlen = prune_origin(*buf, origin);
|
|
if ((origin == NULL || origin[0] == '\0' || (*buf)[newlen] == '\0') &&
|
|
(newlen == 0 || (*buf)[newlen - 1] != '.')) {
|
|
/* No trailing dot. */
|
|
if (newlen + 2 > *buflen)
|
|
goto enospc; /* No room for ".\0". */
|
|
(*buf)[newlen++] = '.';
|
|
(*buf)[newlen] = '\0';
|
|
}
|
|
if (newlen == 0) {
|
|
/* Use "@" instead of name. */
|
|
if (newlen + 2 > *buflen)
|
|
goto enospc; /* No room for "@\0". */
|
|
(*buf)[newlen++] = '@';
|
|
(*buf)[newlen] = '\0';
|
|
}
|
|
*pp += n;
|
|
addlen(newlen, buf, buflen);
|
|
**buf = '\0';
|
|
return (newlen);
|
|
enospc:
|
|
errno = ENOSPC;
|
|
*buf = save_buf;
|
|
*buflen = save_buflen;
|
|
return (-1);
|
|
}
|
|
|
|
static void
|
|
addlen(size_t len, char **buf, size_t *buflen) {
|
|
assert(len <= *buflen);
|
|
*buf += len;
|
|
*buflen -= len;
|
|
}
|
|
|
|
static int
|
|
addstr(const char *src, size_t len, char **buf, size_t *buflen) {
|
|
if (len > *buflen) {
|
|
errno = ENOSPC;
|
|
return (-1);
|
|
}
|
|
memcpy(*buf, src, len);
|
|
addlen(len, buf, buflen);
|
|
**buf = '\0';
|
|
return (0);
|
|
}
|
|
|
|
static int
|
|
addtab(size_t len, size_t target, int spaced, char **buf, size_t *buflen) {
|
|
size_t save_buflen = *buflen;
|
|
char *save_buf = *buf;
|
|
int t;
|
|
|
|
if (spaced || len >= target - 1) {
|
|
T(addstr(" ", 2, buf, buflen));
|
|
spaced = 1;
|
|
} else {
|
|
for (t = (target - len - 1) / 8; t >= 0; t--)
|
|
if (addstr("\t", 1, buf, buflen) < 0) {
|
|
*buflen = save_buflen;
|
|
*buf = save_buf;
|
|
return (-1);
|
|
}
|
|
spaced = 0;
|
|
}
|
|
return (spaced);
|
|
}
|