mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-18 04:19:21 +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.
1141 lines
29 KiB
C
1141 lines
29 KiB
C
/*-
|
|
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
|
|
* Copyright (c) 1992, 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Henry Spencer.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)engine.c 8.5 (Berkeley) 3/20/94
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.12 2002/03/22 21:52:47 obrien Exp $");
|
|
|
|
/*
|
|
* The matching engine and friends. This file is #included by regexec.c
|
|
* after suitable #defines of a variety of macros used herein, so that
|
|
* different state representations can be used without duplicating masses
|
|
* of code.
|
|
*/
|
|
|
|
#ifdef SNAMES
|
|
#define matcher smatcher
|
|
#define fast sfast
|
|
#define slow sslow
|
|
#define dissect sdissect
|
|
#define backref sbackref
|
|
#define step sstep
|
|
#define print sprint
|
|
#define at sat
|
|
#define match smat
|
|
#endif
|
|
#ifdef LNAMES
|
|
#define matcher lmatcher
|
|
#define fast lfast
|
|
#define slow lslow
|
|
#define dissect ldissect
|
|
#define backref lbackref
|
|
#define step lstep
|
|
#define print lprint
|
|
#define at lat
|
|
#define match lmat
|
|
#endif
|
|
|
|
/* another structure passed up and down to avoid zillions of parameters */
|
|
struct match {
|
|
struct re_guts *g;
|
|
int eflags;
|
|
regmatch_t *pmatch; /* [nsub+1] (0 element unused) */
|
|
char *offp; /* offsets work from here */
|
|
char *beginp; /* start of string -- virtual NUL precedes */
|
|
char *endp; /* end of string -- virtual NUL here */
|
|
char *coldp; /* can be no match starting before here */
|
|
char **lastpos; /* [nplus+1] */
|
|
STATEVARS;
|
|
states st; /* current states */
|
|
states fresh; /* states for a fresh start */
|
|
states tmp; /* temporary */
|
|
states empty; /* empty set of states */
|
|
};
|
|
|
|
/* ========= begin header generated by ./mkh ========= */
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* === engine.c === */
|
|
static int matcher(struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags);
|
|
static char *dissect(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
|
|
static char *backref(struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev);
|
|
static char *fast(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
|
|
static char *slow(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
|
|
static states step(struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft);
|
|
#define BOL (OUT+1)
|
|
#define EOL (BOL+1)
|
|
#define BOLEOL (BOL+2)
|
|
#define NOTHING (BOL+3)
|
|
#define BOW (BOL+4)
|
|
#define EOW (BOL+5)
|
|
#define CODEMAX (BOL+5) /* highest code used */
|
|
#define NONCHAR(c) ((c) > CHAR_MAX)
|
|
#define NNONCHAR (CODEMAX-CHAR_MAX)
|
|
#ifdef REDEBUG
|
|
static void print(struct match *m, char *caption, states st, int ch, FILE *d);
|
|
#endif
|
|
#ifdef REDEBUG
|
|
static void at(struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst);
|
|
#endif
|
|
#ifdef REDEBUG
|
|
static char *pchar(int ch);
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
/* ========= end header generated by ./mkh ========= */
|
|
|
|
#ifdef REDEBUG
|
|
#define SP(t, s, c) print(m, t, s, c, stdout)
|
|
#define AT(t, p1, p2, s1, s2) at(m, t, p1, p2, s1, s2)
|
|
#define NOTE(str) { if (m->eflags®_TRACE) printf("=%s\n", (str)); }
|
|
#else
|
|
#define SP(t, s, c) /* nothing */
|
|
#define AT(t, p1, p2, s1, s2) /* nothing */
|
|
#define NOTE(s) /* nothing */
|
|
#endif
|
|
|
|
/*
|
|
- matcher - the actual matching engine
|
|
== static int matcher(struct re_guts *g, char *string, \
|
|
== size_t nmatch, regmatch_t pmatch[], int eflags);
|
|
*/
|
|
static int /* 0 success, REG_NOMATCH failure */
|
|
matcher(g, string, nmatch, pmatch, eflags)
|
|
struct re_guts *g;
|
|
char *string;
|
|
size_t nmatch;
|
|
regmatch_t pmatch[];
|
|
int eflags;
|
|
{
|
|
char *endp;
|
|
int i;
|
|
struct match mv;
|
|
struct match *m = &mv;
|
|
char *dp;
|
|
const sopno gf = g->firststate+1; /* +1 for OEND */
|
|
const sopno gl = g->laststate;
|
|
char *start;
|
|
char *stop;
|
|
/* Boyer-Moore algorithms variables */
|
|
char *pp;
|
|
int cj, mj;
|
|
char *mustfirst;
|
|
char *mustlast;
|
|
int *matchjump;
|
|
int *charjump;
|
|
|
|
/* simplify the situation where possible */
|
|
if (g->cflags®_NOSUB)
|
|
nmatch = 0;
|
|
if (eflags®_STARTEND) {
|
|
start = string + pmatch[0].rm_so;
|
|
stop = string + pmatch[0].rm_eo;
|
|
} else {
|
|
start = string;
|
|
stop = start + strlen(start);
|
|
}
|
|
if (stop < start)
|
|
return(REG_INVARG);
|
|
|
|
/* prescreening; this does wonders for this rather slow code */
|
|
if (g->must != NULL) {
|
|
if (g->charjump != NULL && g->matchjump != NULL) {
|
|
mustfirst = g->must;
|
|
mustlast = g->must + g->mlen - 1;
|
|
charjump = g->charjump;
|
|
matchjump = g->matchjump;
|
|
pp = mustlast;
|
|
for (dp = start+g->mlen-1; dp < stop;) {
|
|
/* Fast skip non-matches */
|
|
while (dp < stop && charjump[*dp])
|
|
dp += charjump[*dp];
|
|
|
|
if (dp >= stop)
|
|
break;
|
|
|
|
/* Greedy matcher */
|
|
/* We depend on not being used for
|
|
* for strings of length 1
|
|
*/
|
|
while (*--dp == *--pp && pp != mustfirst);
|
|
|
|
if (*dp == *pp)
|
|
break;
|
|
|
|
/* Jump to next possible match */
|
|
mj = matchjump[pp - mustfirst];
|
|
cj = charjump[*dp];
|
|
dp += (cj < mj ? mj : cj);
|
|
pp = mustlast;
|
|
}
|
|
if (pp != mustfirst)
|
|
return(REG_NOMATCH);
|
|
} else {
|
|
for (dp = start; dp < stop; dp++)
|
|
if (*dp == g->must[0] &&
|
|
stop - dp >= g->mlen &&
|
|
memcmp(dp, g->must, (size_t)g->mlen) == 0)
|
|
break;
|
|
if (dp == stop) /* we didn't find g->must */
|
|
return(REG_NOMATCH);
|
|
}
|
|
}
|
|
|
|
/* match struct setup */
|
|
m->g = g;
|
|
m->eflags = eflags;
|
|
m->pmatch = NULL;
|
|
m->lastpos = NULL;
|
|
m->offp = string;
|
|
m->beginp = start;
|
|
m->endp = stop;
|
|
STATESETUP(m, 4);
|
|
SETUP(m->st);
|
|
SETUP(m->fresh);
|
|
SETUP(m->tmp);
|
|
SETUP(m->empty);
|
|
CLEAR(m->empty);
|
|
|
|
/* Adjust start according to moffset, to speed things up */
|
|
if (g->moffset > -1)
|
|
start = ((dp - g->moffset) < start) ? start : dp - g->moffset;
|
|
|
|
/* this loop does only one repetition except for backrefs */
|
|
for (;;) {
|
|
endp = fast(m, start, stop, gf, gl);
|
|
if (endp == NULL) { /* a miss */
|
|
STATETEARDOWN(m);
|
|
return(REG_NOMATCH);
|
|
}
|
|
if (nmatch == 0 && !g->backrefs)
|
|
break; /* no further info needed */
|
|
|
|
/* where? */
|
|
assert(m->coldp != NULL);
|
|
for (;;) {
|
|
NOTE("finding start");
|
|
endp = slow(m, m->coldp, stop, gf, gl);
|
|
if (endp != NULL)
|
|
break;
|
|
assert(m->coldp < m->endp);
|
|
m->coldp++;
|
|
}
|
|
if (nmatch == 1 && !g->backrefs)
|
|
break; /* no further info needed */
|
|
|
|
/* oh my, he wants the subexpressions... */
|
|
if (m->pmatch == NULL)
|
|
m->pmatch = (regmatch_t *)malloc((m->g->nsub + 1) *
|
|
sizeof(regmatch_t));
|
|
if (m->pmatch == NULL) {
|
|
STATETEARDOWN(m);
|
|
return(REG_ESPACE);
|
|
}
|
|
for (i = 1; i <= m->g->nsub; i++)
|
|
m->pmatch[i].rm_so = m->pmatch[i].rm_eo = -1;
|
|
if (!g->backrefs && !(m->eflags®_BACKR)) {
|
|
NOTE("dissecting");
|
|
dp = dissect(m, m->coldp, endp, gf, gl);
|
|
} else {
|
|
if (g->nplus > 0 && m->lastpos == NULL)
|
|
m->lastpos = (char **)malloc((g->nplus+1) *
|
|
sizeof(char *));
|
|
if (g->nplus > 0 && m->lastpos == NULL) {
|
|
free(m->pmatch);
|
|
STATETEARDOWN(m);
|
|
return(REG_ESPACE);
|
|
}
|
|
NOTE("backref dissect");
|
|
dp = backref(m, m->coldp, endp, gf, gl, (sopno)0);
|
|
}
|
|
if (dp != NULL)
|
|
break;
|
|
|
|
/* uh-oh... we couldn't find a subexpression-level match */
|
|
assert(g->backrefs); /* must be back references doing it */
|
|
assert(g->nplus == 0 || m->lastpos != NULL);
|
|
for (;;) {
|
|
if (dp != NULL || endp <= m->coldp)
|
|
break; /* defeat */
|
|
NOTE("backoff");
|
|
endp = slow(m, m->coldp, endp-1, gf, gl);
|
|
if (endp == NULL)
|
|
break; /* defeat */
|
|
/* try it on a shorter possibility */
|
|
#ifndef NDEBUG
|
|
for (i = 1; i <= m->g->nsub; i++) {
|
|
assert(m->pmatch[i].rm_so == -1);
|
|
assert(m->pmatch[i].rm_eo == -1);
|
|
}
|
|
#endif
|
|
NOTE("backoff dissect");
|
|
dp = backref(m, m->coldp, endp, gf, gl, (sopno)0);
|
|
}
|
|
assert(dp == NULL || dp == endp);
|
|
if (dp != NULL) /* found a shorter one */
|
|
break;
|
|
|
|
/* despite initial appearances, there is no match here */
|
|
NOTE("false alarm");
|
|
start = m->coldp + 1; /* recycle starting later */
|
|
assert(start <= stop);
|
|
}
|
|
|
|
/* fill in the details if requested */
|
|
if (nmatch > 0) {
|
|
pmatch[0].rm_so = m->coldp - m->offp;
|
|
pmatch[0].rm_eo = endp - m->offp;
|
|
}
|
|
if (nmatch > 1) {
|
|
assert(m->pmatch != NULL);
|
|
for (i = 1; i < nmatch; i++)
|
|
if (i <= m->g->nsub)
|
|
pmatch[i] = m->pmatch[i];
|
|
else {
|
|
pmatch[i].rm_so = -1;
|
|
pmatch[i].rm_eo = -1;
|
|
}
|
|
}
|
|
|
|
if (m->pmatch != NULL)
|
|
free((char *)m->pmatch);
|
|
if (m->lastpos != NULL)
|
|
free((char *)m->lastpos);
|
|
STATETEARDOWN(m);
|
|
return(0);
|
|
}
|
|
|
|
/*
|
|
- dissect - figure out what matched what, no back references
|
|
== static char *dissect(struct match *m, char *start, \
|
|
== char *stop, sopno startst, sopno stopst);
|
|
*/
|
|
static char * /* == stop (success) always */
|
|
dissect(m, start, stop, startst, stopst)
|
|
struct match *m;
|
|
char *start;
|
|
char *stop;
|
|
sopno startst;
|
|
sopno stopst;
|
|
{
|
|
int i;
|
|
sopno ss; /* start sop of current subRE */
|
|
sopno es; /* end sop of current subRE */
|
|
char *sp; /* start of string matched by it */
|
|
char *stp; /* string matched by it cannot pass here */
|
|
char *rest; /* start of rest of string */
|
|
char *tail; /* string unmatched by rest of RE */
|
|
sopno ssub; /* start sop of subsubRE */
|
|
sopno esub; /* end sop of subsubRE */
|
|
char *ssp; /* start of string matched by subsubRE */
|
|
char *sep; /* end of string matched by subsubRE */
|
|
char *oldssp; /* previous ssp */
|
|
char *dp;
|
|
|
|
AT("diss", start, stop, startst, stopst);
|
|
sp = start;
|
|
for (ss = startst; ss < stopst; ss = es) {
|
|
/* identify end of subRE */
|
|
es = ss;
|
|
switch (OP(m->g->strip[es])) {
|
|
case OPLUS_:
|
|
case OQUEST_:
|
|
es += OPND(m->g->strip[es]);
|
|
break;
|
|
case OCH_:
|
|
while (OP(m->g->strip[es]) != O_CH)
|
|
es += OPND(m->g->strip[es]);
|
|
break;
|
|
}
|
|
es++;
|
|
|
|
/* figure out what it matched */
|
|
switch (OP(m->g->strip[ss])) {
|
|
case OEND:
|
|
assert(nope);
|
|
break;
|
|
case OCHAR:
|
|
sp++;
|
|
break;
|
|
case OBOL:
|
|
case OEOL:
|
|
case OBOW:
|
|
case OEOW:
|
|
break;
|
|
case OANY:
|
|
case OANYOF:
|
|
sp++;
|
|
break;
|
|
case OBACK_:
|
|
case O_BACK:
|
|
assert(nope);
|
|
break;
|
|
/* cases where length of match is hard to find */
|
|
case OQUEST_:
|
|
stp = stop;
|
|
for (;;) {
|
|
/* how long could this one be? */
|
|
rest = slow(m, sp, stp, ss, es);
|
|
assert(rest != NULL); /* it did match */
|
|
/* could the rest match the rest? */
|
|
tail = slow(m, rest, stop, es, stopst);
|
|
if (tail == stop)
|
|
break; /* yes! */
|
|
/* no -- try a shorter match for this one */
|
|
stp = rest - 1;
|
|
assert(stp >= sp); /* it did work */
|
|
}
|
|
ssub = ss + 1;
|
|
esub = es - 1;
|
|
/* did innards match? */
|
|
if (slow(m, sp, rest, ssub, esub) != NULL) {
|
|
dp = dissect(m, sp, rest, ssub, esub);
|
|
assert(dp == rest);
|
|
} else /* no */
|
|
assert(sp == rest);
|
|
sp = rest;
|
|
break;
|
|
case OPLUS_:
|
|
stp = stop;
|
|
for (;;) {
|
|
/* how long could this one be? */
|
|
rest = slow(m, sp, stp, ss, es);
|
|
assert(rest != NULL); /* it did match */
|
|
/* could the rest match the rest? */
|
|
tail = slow(m, rest, stop, es, stopst);
|
|
if (tail == stop)
|
|
break; /* yes! */
|
|
/* no -- try a shorter match for this one */
|
|
stp = rest - 1;
|
|
assert(stp >= sp); /* it did work */
|
|
}
|
|
ssub = ss + 1;
|
|
esub = es - 1;
|
|
ssp = sp;
|
|
oldssp = ssp;
|
|
for (;;) { /* find last match of innards */
|
|
sep = slow(m, ssp, rest, ssub, esub);
|
|
if (sep == NULL || sep == ssp)
|
|
break; /* failed or matched null */
|
|
oldssp = ssp; /* on to next try */
|
|
ssp = sep;
|
|
}
|
|
if (sep == NULL) {
|
|
/* last successful match */
|
|
sep = ssp;
|
|
ssp = oldssp;
|
|
}
|
|
assert(sep == rest); /* must exhaust substring */
|
|
assert(slow(m, ssp, sep, ssub, esub) == rest);
|
|
dp = dissect(m, ssp, sep, ssub, esub);
|
|
assert(dp == sep);
|
|
sp = rest;
|
|
break;
|
|
case OCH_:
|
|
stp = stop;
|
|
for (;;) {
|
|
/* how long could this one be? */
|
|
rest = slow(m, sp, stp, ss, es);
|
|
assert(rest != NULL); /* it did match */
|
|
/* could the rest match the rest? */
|
|
tail = slow(m, rest, stop, es, stopst);
|
|
if (tail == stop)
|
|
break; /* yes! */
|
|
/* no -- try a shorter match for this one */
|
|
stp = rest - 1;
|
|
assert(stp >= sp); /* it did work */
|
|
}
|
|
ssub = ss + 1;
|
|
esub = ss + OPND(m->g->strip[ss]) - 1;
|
|
assert(OP(m->g->strip[esub]) == OOR1);
|
|
for (;;) { /* find first matching branch */
|
|
if (slow(m, sp, rest, ssub, esub) == rest)
|
|
break; /* it matched all of it */
|
|
/* that one missed, try next one */
|
|
assert(OP(m->g->strip[esub]) == OOR1);
|
|
esub++;
|
|
assert(OP(m->g->strip[esub]) == OOR2);
|
|
ssub = esub + 1;
|
|
esub += OPND(m->g->strip[esub]);
|
|
if (OP(m->g->strip[esub]) == OOR2)
|
|
esub--;
|
|
else
|
|
assert(OP(m->g->strip[esub]) == O_CH);
|
|
}
|
|
dp = dissect(m, sp, rest, ssub, esub);
|
|
assert(dp == rest);
|
|
sp = rest;
|
|
break;
|
|
case O_PLUS:
|
|
case O_QUEST:
|
|
case OOR1:
|
|
case OOR2:
|
|
case O_CH:
|
|
assert(nope);
|
|
break;
|
|
case OLPAREN:
|
|
i = OPND(m->g->strip[ss]);
|
|
assert(0 < i && i <= m->g->nsub);
|
|
m->pmatch[i].rm_so = sp - m->offp;
|
|
break;
|
|
case ORPAREN:
|
|
i = OPND(m->g->strip[ss]);
|
|
assert(0 < i && i <= m->g->nsub);
|
|
m->pmatch[i].rm_eo = sp - m->offp;
|
|
break;
|
|
default: /* uh oh */
|
|
assert(nope);
|
|
break;
|
|
}
|
|
}
|
|
|
|
assert(sp == stop);
|
|
return(sp);
|
|
}
|
|
|
|
/*
|
|
- backref - figure out what matched what, figuring in back references
|
|
== static char *backref(struct match *m, char *start, \
|
|
== char *stop, sopno startst, sopno stopst, sopno lev);
|
|
*/
|
|
static char * /* == stop (success) or NULL (failure) */
|
|
backref(m, start, stop, startst, stopst, lev)
|
|
struct match *m;
|
|
char *start;
|
|
char *stop;
|
|
sopno startst;
|
|
sopno stopst;
|
|
sopno lev; /* PLUS nesting level */
|
|
{
|
|
int i;
|
|
sopno ss; /* start sop of current subRE */
|
|
char *sp; /* start of string matched by it */
|
|
sopno ssub; /* start sop of subsubRE */
|
|
sopno esub; /* end sop of subsubRE */
|
|
char *ssp; /* start of string matched by subsubRE */
|
|
char *dp;
|
|
size_t len;
|
|
int hard;
|
|
sop s;
|
|
regoff_t offsave;
|
|
cset *cs;
|
|
|
|
AT("back", start, stop, startst, stopst);
|
|
sp = start;
|
|
|
|
/* get as far as we can with easy stuff */
|
|
hard = 0;
|
|
for (ss = startst; !hard && ss < stopst; ss++)
|
|
switch (OP(s = m->g->strip[ss])) {
|
|
case OCHAR:
|
|
if (sp == stop || *sp++ != (char)OPND(s))
|
|
return(NULL);
|
|
break;
|
|
case OANY:
|
|
if (sp == stop)
|
|
return(NULL);
|
|
sp++;
|
|
break;
|
|
case OANYOF:
|
|
cs = &m->g->sets[OPND(s)];
|
|
if (sp == stop || !CHIN(cs, *sp++))
|
|
return(NULL);
|
|
break;
|
|
case OBOL:
|
|
if ( (sp == m->beginp && !(m->eflags®_NOTBOL)) ||
|
|
(sp < m->endp && *(sp-1) == '\n' &&
|
|
(m->g->cflags®_NEWLINE)) )
|
|
{ /* yes */ }
|
|
else
|
|
return(NULL);
|
|
break;
|
|
case OEOL:
|
|
if ( (sp == m->endp && !(m->eflags®_NOTEOL)) ||
|
|
(sp < m->endp && *sp == '\n' &&
|
|
(m->g->cflags®_NEWLINE)) )
|
|
{ /* yes */ }
|
|
else
|
|
return(NULL);
|
|
break;
|
|
case OBOW:
|
|
if (( (sp == m->beginp && !(m->eflags®_NOTBOL)) ||
|
|
(sp < m->endp && *(sp-1) == '\n' &&
|
|
(m->g->cflags®_NEWLINE)) ||
|
|
(sp > m->beginp &&
|
|
!ISWORD(*(sp-1))) ) &&
|
|
(sp < m->endp && ISWORD(*sp)) )
|
|
{ /* yes */ }
|
|
else
|
|
return(NULL);
|
|
break;
|
|
case OEOW:
|
|
if (( (sp == m->endp && !(m->eflags®_NOTEOL)) ||
|
|
(sp < m->endp && *sp == '\n' &&
|
|
(m->g->cflags®_NEWLINE)) ||
|
|
(sp < m->endp && !ISWORD(*sp)) ) &&
|
|
(sp > m->beginp && ISWORD(*(sp-1))) )
|
|
{ /* yes */ }
|
|
else
|
|
return(NULL);
|
|
break;
|
|
case O_QUEST:
|
|
break;
|
|
case OOR1: /* matches null but needs to skip */
|
|
ss++;
|
|
s = m->g->strip[ss];
|
|
do {
|
|
assert(OP(s) == OOR2);
|
|
ss += OPND(s);
|
|
} while (OP(s = m->g->strip[ss]) != O_CH);
|
|
/* note that the ss++ gets us past the O_CH */
|
|
break;
|
|
default: /* have to make a choice */
|
|
hard = 1;
|
|
break;
|
|
}
|
|
if (!hard) { /* that was it! */
|
|
if (sp != stop)
|
|
return(NULL);
|
|
return(sp);
|
|
}
|
|
ss--; /* adjust for the for's final increment */
|
|
|
|
/* the hard stuff */
|
|
AT("hard", sp, stop, ss, stopst);
|
|
s = m->g->strip[ss];
|
|
switch (OP(s)) {
|
|
case OBACK_: /* the vilest depths */
|
|
i = OPND(s);
|
|
assert(0 < i && i <= m->g->nsub);
|
|
if (m->pmatch[i].rm_eo == -1)
|
|
return(NULL);
|
|
assert(m->pmatch[i].rm_so != -1);
|
|
len = m->pmatch[i].rm_eo - m->pmatch[i].rm_so;
|
|
assert(stop - m->beginp >= len);
|
|
if (sp > stop - len)
|
|
return(NULL); /* not enough left to match */
|
|
ssp = m->offp + m->pmatch[i].rm_so;
|
|
if (memcmp(sp, ssp, len) != 0)
|
|
return(NULL);
|
|
while (m->g->strip[ss] != SOP(O_BACK, i))
|
|
ss++;
|
|
return(backref(m, sp+len, stop, ss+1, stopst, lev));
|
|
break;
|
|
case OQUEST_: /* to null or not */
|
|
dp = backref(m, sp, stop, ss+1, stopst, lev);
|
|
if (dp != NULL)
|
|
return(dp); /* not */
|
|
return(backref(m, sp, stop, ss+OPND(s)+1, stopst, lev));
|
|
break;
|
|
case OPLUS_:
|
|
assert(m->lastpos != NULL);
|
|
assert(lev+1 <= m->g->nplus);
|
|
m->lastpos[lev+1] = sp;
|
|
return(backref(m, sp, stop, ss+1, stopst, lev+1));
|
|
break;
|
|
case O_PLUS:
|
|
if (sp == m->lastpos[lev]) /* last pass matched null */
|
|
return(backref(m, sp, stop, ss+1, stopst, lev-1));
|
|
/* try another pass */
|
|
m->lastpos[lev] = sp;
|
|
dp = backref(m, sp, stop, ss-OPND(s)+1, stopst, lev);
|
|
if (dp == NULL)
|
|
return(backref(m, sp, stop, ss+1, stopst, lev-1));
|
|
else
|
|
return(dp);
|
|
break;
|
|
case OCH_: /* find the right one, if any */
|
|
ssub = ss + 1;
|
|
esub = ss + OPND(s) - 1;
|
|
assert(OP(m->g->strip[esub]) == OOR1);
|
|
for (;;) { /* find first matching branch */
|
|
dp = backref(m, sp, stop, ssub, esub, lev);
|
|
if (dp != NULL)
|
|
return(dp);
|
|
/* that one missed, try next one */
|
|
if (OP(m->g->strip[esub]) == O_CH)
|
|
return(NULL); /* there is none */
|
|
esub++;
|
|
assert(OP(m->g->strip[esub]) == OOR2);
|
|
ssub = esub + 1;
|
|
esub += OPND(m->g->strip[esub]);
|
|
if (OP(m->g->strip[esub]) == OOR2)
|
|
esub--;
|
|
else
|
|
assert(OP(m->g->strip[esub]) == O_CH);
|
|
}
|
|
break;
|
|
case OLPAREN: /* must undo assignment if rest fails */
|
|
i = OPND(s);
|
|
assert(0 < i && i <= m->g->nsub);
|
|
offsave = m->pmatch[i].rm_so;
|
|
m->pmatch[i].rm_so = sp - m->offp;
|
|
dp = backref(m, sp, stop, ss+1, stopst, lev);
|
|
if (dp != NULL)
|
|
return(dp);
|
|
m->pmatch[i].rm_so = offsave;
|
|
return(NULL);
|
|
break;
|
|
case ORPAREN: /* must undo assignment if rest fails */
|
|
i = OPND(s);
|
|
assert(0 < i && i <= m->g->nsub);
|
|
offsave = m->pmatch[i].rm_eo;
|
|
m->pmatch[i].rm_eo = sp - m->offp;
|
|
dp = backref(m, sp, stop, ss+1, stopst, lev);
|
|
if (dp != NULL)
|
|
return(dp);
|
|
m->pmatch[i].rm_eo = offsave;
|
|
return(NULL);
|
|
break;
|
|
default: /* uh oh */
|
|
assert(nope);
|
|
break;
|
|
}
|
|
|
|
/* "can't happen" */
|
|
assert(nope);
|
|
/* NOTREACHED */
|
|
return "shut up gcc";
|
|
}
|
|
|
|
/*
|
|
- fast - step through the string at top speed
|
|
== static char *fast(struct match *m, char *start, \
|
|
== char *stop, sopno startst, sopno stopst);
|
|
*/
|
|
static char * /* where tentative match ended, or NULL */
|
|
fast(m, start, stop, startst, stopst)
|
|
struct match *m;
|
|
char *start;
|
|
char *stop;
|
|
sopno startst;
|
|
sopno stopst;
|
|
{
|
|
states st = m->st;
|
|
states fresh = m->fresh;
|
|
states tmp = m->tmp;
|
|
char *p = start;
|
|
int c = (start == m->beginp) ? OUT : *(start-1);
|
|
int lastc; /* previous c */
|
|
int flagch;
|
|
int i;
|
|
char *coldp; /* last p after which no match was underway */
|
|
|
|
CLEAR(st);
|
|
SET1(st, startst);
|
|
st = step(m->g, startst, stopst, st, NOTHING, st);
|
|
ASSIGN(fresh, st);
|
|
SP("start", st, *p);
|
|
coldp = NULL;
|
|
for (;;) {
|
|
/* next character */
|
|
lastc = c;
|
|
c = (p == m->endp) ? OUT : *p;
|
|
if (EQ(st, fresh))
|
|
coldp = p;
|
|
|
|
/* is there an EOL and/or BOL between lastc and c? */
|
|
flagch = '\0';
|
|
i = 0;
|
|
if ( (lastc == '\n' && m->g->cflags®_NEWLINE) ||
|
|
(lastc == OUT && !(m->eflags®_NOTBOL)) ) {
|
|
flagch = BOL;
|
|
i = m->g->nbol;
|
|
}
|
|
if ( (c == '\n' && m->g->cflags®_NEWLINE) ||
|
|
(c == OUT && !(m->eflags®_NOTEOL)) ) {
|
|
flagch = (flagch == BOL) ? BOLEOL : EOL;
|
|
i += m->g->neol;
|
|
}
|
|
if (i != 0) {
|
|
for (; i > 0; i--)
|
|
st = step(m->g, startst, stopst, st, flagch, st);
|
|
SP("boleol", st, c);
|
|
}
|
|
|
|
/* how about a word boundary? */
|
|
if ( (flagch == BOL || (lastc != OUT && !ISWORD(lastc))) &&
|
|
(c != OUT && ISWORD(c)) ) {
|
|
flagch = BOW;
|
|
}
|
|
if ( (lastc != OUT && ISWORD(lastc)) &&
|
|
(flagch == EOL || (c != OUT && !ISWORD(c))) ) {
|
|
flagch = EOW;
|
|
}
|
|
if (flagch == BOW || flagch == EOW) {
|
|
st = step(m->g, startst, stopst, st, flagch, st);
|
|
SP("boweow", st, c);
|
|
}
|
|
|
|
/* are we done? */
|
|
if (ISSET(st, stopst) || p == stop)
|
|
break; /* NOTE BREAK OUT */
|
|
|
|
/* no, we must deal with this character */
|
|
ASSIGN(tmp, st);
|
|
ASSIGN(st, fresh);
|
|
assert(c != OUT);
|
|
st = step(m->g, startst, stopst, tmp, c, st);
|
|
SP("aft", st, c);
|
|
assert(EQ(step(m->g, startst, stopst, st, NOTHING, st), st));
|
|
p++;
|
|
}
|
|
|
|
assert(coldp != NULL);
|
|
m->coldp = coldp;
|
|
if (ISSET(st, stopst))
|
|
return(p+1);
|
|
else
|
|
return(NULL);
|
|
}
|
|
|
|
/*
|
|
- slow - step through the string more deliberately
|
|
== static char *slow(struct match *m, char *start, \
|
|
== char *stop, sopno startst, sopno stopst);
|
|
*/
|
|
static char * /* where it ended */
|
|
slow(m, start, stop, startst, stopst)
|
|
struct match *m;
|
|
char *start;
|
|
char *stop;
|
|
sopno startst;
|
|
sopno stopst;
|
|
{
|
|
states st = m->st;
|
|
states empty = m->empty;
|
|
states tmp = m->tmp;
|
|
char *p = start;
|
|
int c = (start == m->beginp) ? OUT : *(start-1);
|
|
int lastc; /* previous c */
|
|
int flagch;
|
|
int i;
|
|
char *matchp; /* last p at which a match ended */
|
|
|
|
AT("slow", start, stop, startst, stopst);
|
|
CLEAR(st);
|
|
SET1(st, startst);
|
|
SP("sstart", st, *p);
|
|
st = step(m->g, startst, stopst, st, NOTHING, st);
|
|
matchp = NULL;
|
|
for (;;) {
|
|
/* next character */
|
|
lastc = c;
|
|
c = (p == m->endp) ? OUT : *p;
|
|
|
|
/* is there an EOL and/or BOL between lastc and c? */
|
|
flagch = '\0';
|
|
i = 0;
|
|
if ( (lastc == '\n' && m->g->cflags®_NEWLINE) ||
|
|
(lastc == OUT && !(m->eflags®_NOTBOL)) ) {
|
|
flagch = BOL;
|
|
i = m->g->nbol;
|
|
}
|
|
if ( (c == '\n' && m->g->cflags®_NEWLINE) ||
|
|
(c == OUT && !(m->eflags®_NOTEOL)) ) {
|
|
flagch = (flagch == BOL) ? BOLEOL : EOL;
|
|
i += m->g->neol;
|
|
}
|
|
if (i != 0) {
|
|
for (; i > 0; i--)
|
|
st = step(m->g, startst, stopst, st, flagch, st);
|
|
SP("sboleol", st, c);
|
|
}
|
|
|
|
/* how about a word boundary? */
|
|
if ( (flagch == BOL || (lastc != OUT && !ISWORD(lastc))) &&
|
|
(c != OUT && ISWORD(c)) ) {
|
|
flagch = BOW;
|
|
}
|
|
if ( (lastc != OUT && ISWORD(lastc)) &&
|
|
(flagch == EOL || (c != OUT && !ISWORD(c))) ) {
|
|
flagch = EOW;
|
|
}
|
|
if (flagch == BOW || flagch == EOW) {
|
|
st = step(m->g, startst, stopst, st, flagch, st);
|
|
SP("sboweow", st, c);
|
|
}
|
|
|
|
/* are we done? */
|
|
if (ISSET(st, stopst))
|
|
matchp = p;
|
|
if (EQ(st, empty) || p == stop)
|
|
break; /* NOTE BREAK OUT */
|
|
|
|
/* no, we must deal with this character */
|
|
ASSIGN(tmp, st);
|
|
ASSIGN(st, empty);
|
|
assert(c != OUT);
|
|
st = step(m->g, startst, stopst, tmp, c, st);
|
|
SP("saft", st, c);
|
|
assert(EQ(step(m->g, startst, stopst, st, NOTHING, st), st));
|
|
p++;
|
|
}
|
|
|
|
return(matchp);
|
|
}
|
|
|
|
|
|
/*
|
|
- step - map set of states reachable before char to set reachable after
|
|
== static states step(struct re_guts *g, sopno start, sopno stop, \
|
|
== states bef, int ch, states aft);
|
|
== #define BOL (OUT+1)
|
|
== #define EOL (BOL+1)
|
|
== #define BOLEOL (BOL+2)
|
|
== #define NOTHING (BOL+3)
|
|
== #define BOW (BOL+4)
|
|
== #define EOW (BOL+5)
|
|
== #define CODEMAX (BOL+5) // highest code used
|
|
== #define NONCHAR(c) ((c) > CHAR_MAX)
|
|
== #define NNONCHAR (CODEMAX-CHAR_MAX)
|
|
*/
|
|
static states
|
|
step(g, start, stop, bef, ch, aft)
|
|
struct re_guts *g;
|
|
sopno start; /* start state within strip */
|
|
sopno stop; /* state after stop state within strip */
|
|
states bef; /* states reachable before */
|
|
int ch; /* character or NONCHAR code */
|
|
states aft; /* states already known reachable after */
|
|
{
|
|
cset *cs;
|
|
sop s;
|
|
sopno pc;
|
|
onestate here; /* note, macros know this name */
|
|
sopno look;
|
|
int i;
|
|
|
|
for (pc = start, INIT(here, pc); pc != stop; pc++, INC(here)) {
|
|
s = g->strip[pc];
|
|
switch (OP(s)) {
|
|
case OEND:
|
|
assert(pc == stop-1);
|
|
break;
|
|
case OCHAR:
|
|
/* only characters can match */
|
|
assert(!NONCHAR(ch) || ch != (char)OPND(s));
|
|
if (ch == (char)OPND(s))
|
|
FWD(aft, bef, 1);
|
|
break;
|
|
case OBOL:
|
|
if (ch == BOL || ch == BOLEOL)
|
|
FWD(aft, bef, 1);
|
|
break;
|
|
case OEOL:
|
|
if (ch == EOL || ch == BOLEOL)
|
|
FWD(aft, bef, 1);
|
|
break;
|
|
case OBOW:
|
|
if (ch == BOW)
|
|
FWD(aft, bef, 1);
|
|
break;
|
|
case OEOW:
|
|
if (ch == EOW)
|
|
FWD(aft, bef, 1);
|
|
break;
|
|
case OANY:
|
|
if (!NONCHAR(ch))
|
|
FWD(aft, bef, 1);
|
|
break;
|
|
case OANYOF:
|
|
cs = &g->sets[OPND(s)];
|
|
if (!NONCHAR(ch) && CHIN(cs, ch))
|
|
FWD(aft, bef, 1);
|
|
break;
|
|
case OBACK_: /* ignored here */
|
|
case O_BACK:
|
|
FWD(aft, aft, 1);
|
|
break;
|
|
case OPLUS_: /* forward, this is just an empty */
|
|
FWD(aft, aft, 1);
|
|
break;
|
|
case O_PLUS: /* both forward and back */
|
|
FWD(aft, aft, 1);
|
|
i = ISSETBACK(aft, OPND(s));
|
|
BACK(aft, aft, OPND(s));
|
|
if (!i && ISSETBACK(aft, OPND(s))) {
|
|
/* oho, must reconsider loop body */
|
|
pc -= OPND(s) + 1;
|
|
INIT(here, pc);
|
|
}
|
|
break;
|
|
case OQUEST_: /* two branches, both forward */
|
|
FWD(aft, aft, 1);
|
|
FWD(aft, aft, OPND(s));
|
|
break;
|
|
case O_QUEST: /* just an empty */
|
|
FWD(aft, aft, 1);
|
|
break;
|
|
case OLPAREN: /* not significant here */
|
|
case ORPAREN:
|
|
FWD(aft, aft, 1);
|
|
break;
|
|
case OCH_: /* mark the first two branches */
|
|
FWD(aft, aft, 1);
|
|
assert(OP(g->strip[pc+OPND(s)]) == OOR2);
|
|
FWD(aft, aft, OPND(s));
|
|
break;
|
|
case OOR1: /* done a branch, find the O_CH */
|
|
if (ISSTATEIN(aft, here)) {
|
|
for (look = 1;
|
|
OP(s = g->strip[pc+look]) != O_CH;
|
|
look += OPND(s))
|
|
assert(OP(s) == OOR2);
|
|
FWD(aft, aft, look);
|
|
}
|
|
break;
|
|
case OOR2: /* propagate OCH_'s marking */
|
|
FWD(aft, aft, 1);
|
|
if (OP(g->strip[pc+OPND(s)]) != O_CH) {
|
|
assert(OP(g->strip[pc+OPND(s)]) == OOR2);
|
|
FWD(aft, aft, OPND(s));
|
|
}
|
|
break;
|
|
case O_CH: /* just empty */
|
|
FWD(aft, aft, 1);
|
|
break;
|
|
default: /* ooooops... */
|
|
assert(nope);
|
|
break;
|
|
}
|
|
}
|
|
|
|
return(aft);
|
|
}
|
|
|
|
#ifdef REDEBUG
|
|
/*
|
|
- print - print a set of states
|
|
== #ifdef REDEBUG
|
|
== static void print(struct match *m, char *caption, states st, \
|
|
== int ch, FILE *d);
|
|
== #endif
|
|
*/
|
|
static void
|
|
print(m, caption, st, ch, d)
|
|
struct match *m;
|
|
char *caption;
|
|
states st;
|
|
int ch;
|
|
FILE *d;
|
|
{
|
|
struct re_guts *g = m->g;
|
|
int i;
|
|
int first = 1;
|
|
|
|
if (!(m->eflags®_TRACE))
|
|
return;
|
|
|
|
fprintf(d, "%s", caption);
|
|
if (ch != '\0')
|
|
fprintf(d, " %s", pchar(ch));
|
|
for (i = 0; i < g->nstates; i++)
|
|
if (ISSET(st, i)) {
|
|
fprintf(d, "%s%d", (first) ? "\t" : ", ", i);
|
|
first = 0;
|
|
}
|
|
fprintf(d, "\n");
|
|
}
|
|
|
|
/*
|
|
- at - print current situation
|
|
== #ifdef REDEBUG
|
|
== static void at(struct match *m, char *title, char *start, char *stop, \
|
|
== sopno startst, sopno stopst);
|
|
== #endif
|
|
*/
|
|
static void
|
|
at(m, title, start, stop, startst, stopst)
|
|
struct match *m;
|
|
char *title;
|
|
char *start;
|
|
char *stop;
|
|
sopno startst;
|
|
sopno stopst;
|
|
{
|
|
if (!(m->eflags®_TRACE))
|
|
return;
|
|
|
|
printf("%s %s-", title, pchar(*start));
|
|
printf("%s ", pchar(*stop));
|
|
printf("%ld-%ld\n", (long)startst, (long)stopst);
|
|
}
|
|
|
|
#ifndef PCHARDONE
|
|
#define PCHARDONE /* never again */
|
|
/*
|
|
- pchar - make a character printable
|
|
== #ifdef REDEBUG
|
|
== static char *pchar(int ch);
|
|
== #endif
|
|
*
|
|
* Is this identical to regchar() over in debug.c? Well, yes. But a
|
|
* duplicate here avoids having a debugging-capable regexec.o tied to
|
|
* a matching debug.o, and this is convenient. It all disappears in
|
|
* the non-debug compilation anyway, so it doesn't matter much.
|
|
*/
|
|
static char * /* -> representation */
|
|
pchar(ch)
|
|
int ch;
|
|
{
|
|
static char pbuf[10];
|
|
|
|
if (isprint((uch)ch) || ch == ' ')
|
|
sprintf(pbuf, "%c", ch);
|
|
else
|
|
sprintf(pbuf, "\\%o", ch);
|
|
return(pbuf);
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
#undef matcher
|
|
#undef fast
|
|
#undef slow
|
|
#undef dissect
|
|
#undef backref
|
|
#undef step
|
|
#undef print
|
|
#undef at
|
|
#undef match
|