diff --git a/.indent.pro b/.indent.pro index 04a5d0b8a..e2b4ff3cf 100644 --- a/.indent.pro +++ b/.indent.pro @@ -17,6 +17,7 @@ --declaration-indentation5 -T size_t -T aClass +-T TS -T aClient -T aServer -T anUser diff --git a/Changes b/Changes index c4aad1514..f1fc0e8c0 100644 --- a/Changes +++ b/Changes @@ -532,3 +532,42 @@ - Added ^MrMike^'s command list, this one will be updated - Removed ID_CVS, hopefully fixing some bastard stuff - Fixed a last minute SJOIN bug +[ last fixes ] +- Re-added res_comp.c and win32.c and res_mkquery.c, which was damaged by + the ID_CVS remove +- Fixed a SHOWCONNECTINFO bug +- Fixed a MODE_STRIPWORDS bug +- Fixed a PART bug +- Fixed a STRIPBADWORDS bug +- Fixed a BotMOTD bug +- Added Dianora's /userhost +- Recoded /links using NS +- Recoded /map a bit using NS, and added usercounts to Server struct +- Some crazy time_t -> TS stuff, will save us some time in 2038 +- Fixed the "/mode #blah +Cplkf 1 moo 5:5" ( mode/#blah [+pClkf 1moo 5:5] + problem +- Hopefully fixed the +x problem +- Fixed a bug with mkpasswd on OpenBSD +- Added desynch +e warning, and updated ./update enough ... +- Updated update to work better, and that you can use lynx instead of wget +- Added #undef SHUN_NOTICES, to add notices for users who are shunned +- Fixed bug with U:Lines should be able to privmsg/notice and recieve + badwords :P, does not work in channels +- Removed the old GLINE system, TKL is now standard. +- Added INV_TRACK define, we want people testing this. +- Fixed the -1 usercount bug, found by codemastr, fixed by Stskeeps +- Fixed a +h bug reported by Dukemaster +- Added IRIX support (does it work?) +- Fixed crypter so it actually functions (Makefile now sets mode 700) and + it encrypts X and N lines too. +- Fixed empty mode sends in register_user, reported by Bagge +- Added some portability stuff +- Fixed some empty-line/missing parameter stuff in dccdeny, vhost, + and dynconf, chrestrict +- Made vhost strip too long vhosts +- Removed INV_TRACK +- Fixed a typo in /vhost +- Fixed some problems/typos/notlookingsogood (TM) bugs, in the tkl code +- Fixed ban merging/similar bug in SJOIN +- Made /kick for opers only be possible for netadmin/techadmin +- Fixed /server so it doesnt support SERVER name :info anymore.. diff --git a/Config b/Config index 064ab3c10..e14e12c4b 100755 --- a/Config +++ b/Config @@ -64,6 +64,7 @@ DIR=`pwd` DEFOPT="-O -g" DEFCFLAGS="$DEFOPT" DEFLIBS="none" +MKPASSWDLIBS="-lcrypt" OSNAME="an unrecgonized operating system" # IRCNET="" @@ -191,6 +192,7 @@ case "$OS" in *OpenBSD*2*) DEFCFLAGS="$DEFOPT" DEFLIBS="none" + MKPASSWDLIBS="" OSNAME="OpenBSD 2.x" CRYPT_OPER_PASSWORD="" CRYPT_LINK_PASSWORD="" @@ -245,6 +247,11 @@ case "$OS" in DEFLIBS="-lsocket -lnsl -lresolv" OSNAME="Solaris 2.x (or SunOS 5.x)" ;; + *IRIX*) + DEFCFLAGS="$DEFOPT -D_USE_BSD" + DEFLIBS="-lbsd" + OSNAME="IRIX" + ;; *Linux*) cat > $TMP << __EOF__ #include @@ -382,6 +389,14 @@ sed -e "s@^XCFLAGS=\(.*\)@XCFLAGS=$XCFLAGS@" Makefile > Makefile.tmp cp Makefile.tmp Makefile $RM -f Makefile.tmp # + +# Fix mkpasswd Makefile +# +$RM -f crypt/Makefile.tmp +sed -e "s@^LIBS=\(.*\)@LIBS=$MKPASSWDLIBS@" crypt/Makefile > crypt/Makefile.tmp +cp crypt/Makefile.tmp crypt/Makefile +$RM -f crypt/Makefile.tmp + cat <<__EOF__ If you need to use any extra libraries when compiling the server, diff --git a/INSTALL b/INSTALL index 0760bd67d..c891c59bf 100644 --- a/INSTALL +++ b/INSTALL @@ -60,8 +60,8 @@ recap: The UnrealIRCD server comes tarred and gziped. To uncompress it and expand it, use the following commands at the Unix prompt: -gzip -d Unreal3.0.tar.gz -tar -xvf Unreal3.0.tar +gzip -d Unreal3.1.tar.gz +tar -xvf Unreal3.1.tar This will create a new directory called Unreal3.0 and unpack the source into it. diff --git a/badwords.channel.conf b/badwords.channel.conf index 9975a64e7..88da9a6e4 100644 --- a/badwords.channel.conf +++ b/badwords.channel.conf @@ -49,6 +49,5 @@ gay dickhead sonuvabitch *fuck* -ass boobs tits diff --git a/badwords.message.conf b/badwords.message.conf index 9975a64e7..88da9a6e4 100644 --- a/badwords.message.conf +++ b/badwords.message.conf @@ -49,6 +49,5 @@ gay dickhead sonuvabitch *fuck* -ass boobs tits diff --git a/crypt/Makefile b/crypt/Makefile index 7bc4b1b24..2752cdee0 100644 --- a/crypt/Makefile +++ b/crypt/Makefile @@ -23,15 +23,17 @@ # IRCDCONF = ../ircd.conf +LIBS=-lcrypt all: mkpasswd crypt: install mkpasswd: mkpasswd.c - cc -lcrypt -O mkpasswd.c -o mkpasswd + cc ${LIBS} -O mkpasswd.c -o mkpasswd install: - crypter ${IRCDCONF} + chmod 700 crypter + ./crypter ${IRCDCONF} @echo 'done.' clean: diff --git a/crypt/crypter b/crypt/crypter index 0d6b3769f..8db19c8be 100644 --- a/crypt/crypter +++ b/crypt/crypter @@ -32,6 +32,8 @@ $tmpfile = "/tmp/ircd.conf.tmp"; # $ircdconf = @ARGV[0]; +$ircdout = "IRCDOUT"; + print "crypting ",$ircdconf,"\n"; @saltset = ('a' .. 'z', 'A' .. 'Z', '0' .. '9', '.', '/'); @@ -40,13 +42,33 @@ open ($ircdout, ">/tmp/ircd.conf.tmp") || die "open $!"; while ($text = <>) { #if its not an "O" line we can ignore it - $text =~ /^o/i || print ($ircdout $text) && next; +if ($text =~ /^o/i) { chop($text); @oline = split(':', $text); $salt = $saltset[rand(time)%64].$saltset[(rand(time)>>6)%64]; $oline[2] = crypt(@oline[2], $salt); print ($ircdout join(':',@oline)."\n"); } +elsif ($text =~ /^n/i) { + chop($text); + @nline = split(':', $text); + $salt = $saltset[rand(time)%64].$saltset[(rand(time)>>6)%64]; + $nline[2] = crypt(@nline[2], $salt); + print ($ircdout join(':',@nline)."\n"); +} +elsif ($text =~ /^x/i) { + chop($text); + @xline = split(':', $text); + $salt1 = $saltset[rand(time)%64].$saltset[(rand(time)>>6)%64]; + $salt2 = $saltset[rand(time)%64].$saltset[(rand(time)>>6)%64]; + $xline[1] = crypt(@xline[1], $salt1); + $xline[2] = crypt(@xline[2], $salt2); + print ($ircdout join(':',@xline)."\n"); +} +else { + print $ircdout "$text"; +} +} close ($ircdout); close ($ircdin); print "/bin/cp ",$tmpfile," ",$ircdconf,"\n"; diff --git a/devel/aln.doc b/devel/aln.doc new file mode 100644 index 000000000..77193a736 --- /dev/null +++ b/devel/aln.doc @@ -0,0 +1,26 @@ + +ALN, Alphanumeric System +(C) Stskeeps 2000 + +ALN is a quick hack to short down usage of bandwidth-using servernames +in prefixes, NICK commands, etc etc. It replaces the name with a +1 or 2 byte prefix in a system, look at src/aln.c for the prefix +types/values. It will be an PROTOCTL, and used in NICK messages and so on, +and introduce a new prefix server<->server called |server. The value of the +server is calculated by a hash value, the scache system, so that the server +can lookup with a new scache function, scache_find_by_hash(int i). The +question of it will conflict in similar-hash server names, is a wonder to me +:P, we will find out, but scache will fail at same time then. + + +Examples: +& Medb 4 957458466 ~Medb bservice.org D2 0 +iwrx * +:BotService Bot - bservice.org - Owner: terri{J} + +where D2 is the hash value of oxygen.phrozen.org (/stats s on a +#define DEVELOP server). irc.flirt.org has hash 96 (ALN code AX) for +instance. + +@D2 GLOBOPS :message +will be a message from server with hash D2, found find-by-hash(256) + diff --git a/devel/new.plines b/devel/new.plines new file mode 100644 index 000000000..022041db3 --- /dev/null +++ b/devel/new.plines @@ -0,0 +1,48 @@ +From cmunk@draconic.fyremoon.net Wed Apr 5 18:09:55 2000 +Date: Wed, 5 Apr 2000 18:07:55 +0100 (BST) +From: "The Nightwalker (Stskeeps)" +To: unreal-dev@lists.sourceforge.net +Subject: [Unreal-dev] P:Lines + + +Some stuff i got ideas about.. stripping the IP and port from the M:Line +and enforcing the main port to be in a M:line + +M:irc.fyremoon.net:*:Forever is gonna start tonight:* + +P:ip:flags:password1,password2,password3:port + | | | \- port to bind to + | | | + | | \- Commaseperated lists of accepted passwords + | | * if none + | | + | \--- C = Allow clients + | S = Allow servers + | R = ONLY allow our remote admin connections + | (may only be on a P:line of its own) + | J = Clients that connect here are counted as Java(Confroomhack) + | * = CS + | + \--- IP to bind to, * = INADDR_ANY (all interfaces) + +Will make P:Lines more efficent + +--------------------------------------------------------------------- +Carsten V. Munk - The Nightwalker, known on IRC as Stskeeps or techie + * ICQ: 16465977 - E-Mail: stskeeps@tspre.org + * Author of UnrealIRCd (http://unreal.tspre.org) + * Technical Admin @ irc.roxnet.org, server admin of irc.fyremoon.net +"To understand a program you must become both the machine and the program." +---------------------------------------------------------------------- + +-----BEGIN GEEK CODE BLOCK----- +Version: 3.1 +GCS/CC d- s: a--- C+++ UL P L++ E-- W++ N+ o-- K- w--- O- M V-- PS+ PE- Y+ +PGP t+ 5 X R- tv- b+ DI++ D++ G e-- h! r z** +------END GEEK CODE BLOCK------ + + +_______________________________________________ +Unreal-dev mailing list +Unreal-dev@lists.sourceforge.net +http://lists.sourceforge.net/mailman/listinfo/unreal-dev diff --git a/extras/regex/Makefile.in b/extras/regex/Makefile.in new file mode 100644 index 000000000..7ee39ffaa --- /dev/null +++ b/extras/regex/Makefile.in @@ -0,0 +1,98 @@ +# Makefile for regex. +# +# Copyright (C) 1992, 1993 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +version = 0.12 + +# You can define CPPFLAGS on the command line. Aside from system-specific +# flags, you can define: +# -DREGEX_MALLOC to use malloc/realloc/free instead of alloca. +# -DDEBUG to enable the compiled pattern disassembler and execution +# tracing; code runs substantially slower. +# -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to +# the corresponding C procedures). If not -DDEBUG, the macros +# are used. +CPPFLAGS = + +# Likewise, you can override CFLAGS to optimize, use -Wall, etc. +CFLAGS = -g + +# Ditto for LDFLAGS and LOADLIBES. +LDFLAGS = +LOADLIBES = + +srcdir = @srcdir@ +VPATH = @srcdir@ + +CC = @CC@ +DEFS = @DEFS@ + +SHELL = /bin/sh + +subdirs = moo + +default all:: regex.o +.PHONY: default all + +regex.o: regex.c regex.h + $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) -c $< + +clean mostlyclean:: + rm -f *.o + +distclean:: clean + rm -f Makefile config.status + +extraclean:: distclean + rm -f patch* *~* *\#* *.orig *.rej *.bak core a.out + +configure: configure.in + autoconf + +config.status: configure + sh configure --no-create + +Makefile: Makefile.in config.status + sh config.status + +makeargs = $(MFLAGS) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' CC='$(CC)' \ +DEFS='$(DEFS)' LDFLAGS='$(LDFLAGS)' LOADLIBES='$(LOADLIBES)' + +default all install \ +mostlyclean clean distclean extraclean realclean \ +TAGS check:: + for d in $(subdirs); do (cd $$d; $(MAKE) $(makeargs) $@); done +.PHONY: install mostlyclean clean distclean extraclean realclean TAGS check + +# Prevent GNU make 3 from overflowing arg limit on system V. +.NOEXPORT: + +distfiles = AUTHORS ChangeLog COPYING INSTALL NEWS README \ + *.in configure regex.c regex.h +distdir = regex-$(version) +distargs = version=$(version) distdir=../$(distdir)/$$d +dist: TAGS configure + @echo "Version numbers in: Makefile.in, ChangeLog, NEWS," + @echo " regex.c, regex.h," + @echo " and doc/xregex.texi (if modified)." + rm -rf $(distdir) + mkdir $(distdir) + ln $(distfiles) $(distdir) + for d in $(subdirs); do (cd $$d; $(MAKE) $(distargs) dist); done + tar czhf $(distdir).tar.Z $(distdir) + rm -rf $(distdir) +.PHONY: dist diff --git a/extras/regex/README b/extras/regex/README new file mode 100644 index 000000000..918e1a03b --- /dev/null +++ b/extras/regex/README @@ -0,0 +1,60 @@ +This directory contains the GNU regex library. It is compliant with +POSIX.2, except for internationalization features. + +See the file NEWS for a list of major changes in the current release. + +See the file INSTALL for compilation instructions. (The only thing +installed is the documentation; regex.c is compiled into regex.o, but +not installed anywhere.) + +The subdirectory `doc' contains a (programmers') manual for the library. +It's probably out-of-date. Improvements are welcome. + +The subdirectory `test' contains the various tests we've written. + +We know this code is not as fast as it might be. If you have specific +suggestions, profiling results, or other such useful information to +report, please do. + +Emacs 18 is not going use this revised regex (but Emacs 19 will). If +you want to try it with Emacs 18, apply the patch at the end of this +file first. + +Mail bug reports to bug-gnu-utils@prep.ai.mit.edu. + +Please include an actual regular expression that fails (and the syntax +used to compile it); without that, there's no way to reproduce the bug, +so there's no way we can fix it. Even if you include a patch, also +include the regular expression in error; otherwise, we can't know for +sure what you're trying to fix. + +Here is the patch to make this version of regex work with Emacs 18. + +*** ORIG/search.c Tue Jan 8 13:04:55 1991 +--- search.c Sun Jan 5 10:57:00 1992 +*************** +*** 25,26 **** +--- 25,28 ---- + #include "commands.h" ++ ++ #include + #include "regex.h" +*************** +*** 477,479 **** + /* really needed. */ +! && *(searchbuf.buffer) == (char) exactn /* first item is "exact match" */ + && searchbuf.buffer[1] + 2 == searchbuf.used) /*first is ONLY item */ +--- 479,482 ---- + /* really needed. */ +! /* first item is "exact match" */ +! && *(searchbuf.buffer) == (char) RE_EXACTN_VALUE + && searchbuf.buffer[1] + 2 == searchbuf.used) /*first is ONLY item */ +*************** +*** 1273,1275 **** + searchbuf.allocated = 100; +! searchbuf.buffer = (char *) malloc (searchbuf.allocated); + searchbuf.fastmap = search_fastmap; +--- 1276,1278 ---- + searchbuf.allocated = 100; +! searchbuf.buffer = (unsigned char *) malloc (searchbuf.allocated); + searchbuf.fastmap = search_fastmap; diff --git a/extras/regex/configure b/extras/regex/configure new file mode 100755 index 000000000..5f92cd5d1 --- /dev/null +++ b/extras/regex/configure @@ -0,0 +1,462 @@ +#!/bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated automatically using autoconf. +# Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +# Usage: configure [--srcdir=DIR] [--host=HOST] [--gas] [--nfp] [--no-create] +# [--prefix=PREFIX] [--exec-prefix=PREFIX] [--with-PACKAGE] [TARGET] +# Ignores all args except --srcdir, --prefix, --exec-prefix, --no-create, and +# --with-PACKAGE unless this script has special code to handle it. + + +for arg +do + # Handle --exec-prefix with a space before the argument. + if test x$next_exec_prefix = xyes; then exec_prefix=$arg; next_exec_prefix= + # Handle --host with a space before the argument. + elif test x$next_host = xyes; then next_host= + # Handle --prefix with a space before the argument. + elif test x$next_prefix = xyes; then prefix=$arg; next_prefix= + # Handle --srcdir with a space before the argument. + elif test x$next_srcdir = xyes; then srcdir=$arg; next_srcdir= + else + case $arg in + # For backward compatibility, also recognize exact --exec_prefix. + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* | --exec=* | --exe=* | --ex=* | --e=*) + exec_prefix=`echo $arg | sed 's/[-a-z_]*=//'` ;; + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- | --exec | --exe | --ex | --e) + next_exec_prefix=yes ;; + + -gas | --gas | --ga | --g) ;; + + -host=* | --host=* | --hos=* | --ho=* | --h=*) ;; + -host | --host | --hos | --ho | --h) + next_host=yes ;; + + -nfp | --nfp | --nf) ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre | --no-cr | --no-c | --no- | --no) + no_create=1 ;; + + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=`echo $arg | sed 's/[-a-z_]*=//'` ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + next_prefix=yes ;; + + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=* | --s=*) + srcdir=`echo $arg | sed 's/[-a-z_]*=//'` ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr | --s) + next_srcdir=yes ;; + + -with-* | --with-*) + package=`echo $arg|sed 's/-*with-//'` + # Delete all the valid chars; see if any are left. + if test -n "`echo $package|sed 's/[-a-zA-Z0-9_]*//g'`"; then + echo "configure: $package: invalid package name" >&2; exit 1 + fi + eval "with_`echo $package|sed s/-/_/g`=1" ;; + + *) ;; + esac + fi +done + +trap 'rm -f conftest* core; exit 1' 1 3 15 + +rm -f conftest* +compile='${CC-cc} $CFLAGS $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1' + +# A filename unique to this package, relative to the directory that +# configure is in, which we can look for to find out if srcdir is correct. +unique_file=regex.c + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + srcdirdefaulted=yes + # Try the directory containing this script, then `..'. + prog=$0 + confdir=`echo $prog|sed 's%/[^/][^/]*$%%'` + test "X$confdir" = "X$prog" && confdir=. + srcdir=$confdir + if test ! -r $srcdir/$unique_file; then + srcdir=.. + fi +fi +if test ! -r $srcdir/$unique_file; then + if test x$srcdirdefaulted = xyes; then + echo "configure: Can not find sources in \`${confdir}' or \`..'." 1>&2 + else + echo "configure: Can not find sources in \`${srcdir}'." 1>&2 + fi + exit 1 +fi +# Preserve a srcdir of `.' to avoid automounter screwups with pwd. +# But we can't avoid them for `..', to make subdirectories work. +case $srcdir in + .|/*|~*) ;; + *) srcdir=`cd $srcdir; pwd` ;; # Make relative path absolute. +esac + + +if test -z "$CC"; then + echo checking for gcc + saveifs="$IFS"; IFS="${IFS}:" + for dir in $PATH; do + test -z "$dir" && dir=. + if test -f $dir/gcc; then + CC="gcc" + break + fi + done + IFS="$saveifs" +fi +test -z "$CC" && CC="cc" + +# Find out if we are using GNU C, under whatever name. +cat > conftest.c < conftest.out 2>&1 +if egrep yes conftest.out >/dev/null 2>&1; then + GCC=1 # For later tests. +fi +rm -f conftest* + +# Make sure to not get the incompatible SysV /etc/install and +# /usr/sbin/install, which might be in PATH before a BSD-like install, +# or the SunOS /usr/etc/install directory, or the AIX /bin/install, +# or the AFS install, which mishandles nonexistent args. (Sigh.) +if test -z "$INSTALL"; then + echo checking for install + saveifs="$IFS"; IFS="${IFS}:" + for dir in $PATH; do + test -z "$dir" && dir=. + case $dir in + /etc|/usr/sbin|/usr/etc|/usr/afsws/bin) ;; + *) + if test -f $dir/install; then + if grep dspmsg $dir/install >/dev/null 2>&1; then + : # AIX + else + INSTALL="$dir/install -c" + INSTALL_PROGRAM='$(INSTALL)' + INSTALL_DATA='$(INSTALL) -m 644' + break + fi + fi + ;; + esac + done + IFS="$saveifs" +fi +INSTALL=${INSTALL-cp} +INSTALL_PROGRAM=${INSTALL_PROGRAM-'$(INSTALL)'} +INSTALL_DATA=${INSTALL_DATA-'$(INSTALL)'} + + +echo checking for AIX +echo checking how to run the C preprocessor +if test -z "$CPP"; then + CPP='${CC-cc} -E' + cat > conftest.c < +EOF +err=`eval "$CPP $DEFS conftest.c 2>&1 >/dev/null"` +if test -z "$err"; then + : +else + CPP=/lib/cpp +fi +rm -f conftest* +fi + +cat > conftest.c < conftest.out 2>&1" +if egrep "yes" conftest.out >/dev/null 2>&1; then + DEFS="$DEFS -D_ALL_SOURCE=1" +fi +rm -f conftest* + + +echo checking for DYNIX/ptx libseq +cat > conftest.c < conftest.out 2>&1" +if egrep "yes" conftest.out >/dev/null 2>&1; then + SEQUENT=1 +fi +rm -f conftest* + +test -n "$SEQUENT" && test -f /usr/lib/libseq.a && + LIBS="$LIBS -lseq" + +echo checking for POSIXized ISC +if test -d /etc/conf/kconfig.d && + grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 +then + ISC=1 # If later tests want to check for ISC. + DEFS="$DEFS -D_POSIX_SOURCE=1" + if test -n "$GCC"; then + CC="$CC -posix" + else + CC="$CC -Xp" + fi +fi + +echo checking for minix/config.h +cat > conftest.c < +EOF +err=`eval "$CPP $DEFS conftest.c 2>&1 >/dev/null"` +if test -z "$err"; then + MINIX=1 +fi +rm -f conftest* + +# The Minix shell can't assign to the same variable on the same line! +if test -n "$MINIX"; then + DEFS="$DEFS -D_POSIX_SOURCE=1" + DEFS="$DEFS -D_POSIX_1_SOURCE=2" + DEFS="$DEFS -D_MINIX=1" +fi + + +echo checking for ANSI C header files +cat > conftest.c < +#include +#include +#include +EOF +err=`eval "$CPP $DEFS conftest.c 2>&1 >/dev/null"` +if test -z "$err"; then + # SunOS string.h does not declare mem*, contrary to ANSI. +echo '#include ' > conftest.c +eval "$CPP $DEFS conftest.c > conftest.out 2>&1" +if egrep "memchr" conftest.out >/dev/null 2>&1; then + # SGI's /bin/cc from Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +cat > conftest.c < +#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#define XOR(e,f) (((e) && !(f)) || (!(e) && (f))) +int main () { int i; for (i = 0; i < 256; i++) +if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +exit (0); } + +EOF +eval $compile +if test -s conftest && (./conftest; exit) 2>/dev/null; then + DEFS="$DEFS -DSTDC_HEADERS=1" +fi +rm -f conftest* +fi +rm -f conftest* + +fi +rm -f conftest* + +for hdr in string.h +do +trhdr=HAVE_`echo $hdr | tr '[a-z]./' '[A-Z]__'` +echo checking for ${hdr} +cat > conftest.c < +EOF +err=`eval "$CPP $DEFS conftest.c 2>&1 >/dev/null"` +if test -z "$err"; then + DEFS="$DEFS -D${trhdr}=1" +fi +rm -f conftest* +done + + +# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works +# for constant arguments. Useless! +echo checking for working alloca.h +cat > conftest.c < +main() { exit(0); } +t() { char *p = alloca(2 * sizeof(int)); } +EOF +if eval $compile; then + DEFS="$DEFS -DHAVE_ALLOCA_H=1" +fi +rm -f conftest* + +decl="#ifdef __GNUC__ +#define alloca __builtin_alloca +#else +#if HAVE_ALLOCA_H +#include +#else +#ifdef _AIX + #pragma alloca +#else +char *alloca (); +#endif +#endif +#endif +" +echo checking for alloca +cat > conftest.c < conftest.c < config.status </dev/null`: +# +# $0 $* + +for arg +do + case "\$arg" in + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + exec /bin/sh $0 $* ;; + *) echo "Usage: config.status --recheck" 2>&1; exit 1 ;; + esac +done + +trap 'rm -f Makefile; exit 1' 1 3 15 +CC='$CC' +INSTALL='$INSTALL' +INSTALL_PROGRAM='$INSTALL_PROGRAM' +INSTALL_DATA='$INSTALL_DATA' +CPP='$CPP' +ALLOCA='$ALLOCA' +LIBS='$LIBS' +srcdir='$srcdir' +DEFS='$DEFS' +prefix='$prefix' +exec_prefix='$exec_prefix' +prsub='$prsub' +EOF +cat >> config.status <<\EOF + +top_srcdir=$srcdir +for file in .. Makefile; do if [ "x$file" != "x.." ]; then + srcdir=$top_srcdir + # Remove last slash and all that follows it. Not all systems have dirname. + dir=`echo $file|sed 's%/[^/][^/]*$%%'` + if test "$dir" != "$file"; then + test "$top_srcdir" != . && srcdir=$top_srcdir/$dir + test ! -d $dir && mkdir $dir + fi + echo creating $file + rm -f $file + echo "# Generated automatically from `echo $file|sed 's|.*/||'`.in by configure." > $file + sed -e " +$prsub +s%@CC@%$CC%g +s%@INSTALL@%$INSTALL%g +s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@CPP@%$CPP%g +s%@ALLOCA@%$ALLOCA%g +s%@LIBS@%$LIBS%g +s%@srcdir@%$srcdir%g +s%@DEFS@%$DEFS% +" $top_srcdir/${file}.in >> $file +fi; done + +exit 0 +EOF +chmod +x config.status +test -n "$no_create" || ./config.status + diff --git a/extras/regex/configure.in b/extras/regex/configure.in new file mode 100644 index 000000000..f0fc78025 --- /dev/null +++ b/extras/regex/configure.in @@ -0,0 +1,23 @@ +dnl Process this file with autoconf to produce a configure script. +AC_INIT(regex.c) + +AC_PROG_CC +AC_PROG_INSTALL + +dnl I'm not sure if AC_AIX and AC_DYNIX_SEQ are really necessary. The +dnl Autoconf documentation isn't specific about which BSD functions they +dnl provide. +AC_AIX +AC_DYNIX_SEQ +AC_ISC_POSIX +AC_MINIX + +AC_STDC_HEADERS +AC_HAVE_HEADERS(string.h) + +AC_ALLOCA +AC_CONST + +AC_PREFIX(gcc) + +AC_OUTPUT(Makefile doc/Makefile test/Makefile) diff --git a/extras/regex/moo/Makefile b/extras/regex/moo/Makefile new file mode 100644 index 000000000..ea7d56183 --- /dev/null +++ b/extras/regex/moo/Makefile @@ -0,0 +1,4 @@ +clean: +default: +all: + echo "." diff --git a/extras/regex/regex.c b/extras/regex/regex.c new file mode 100644 index 000000000..8169880d7 --- /dev/null +++ b/extras/regex/regex.c @@ -0,0 +1,4948 @@ +/* Extended regular expression matching and search library, + version 0.12. + (Implements POSIX draft P10003.2/D11.2, except for + internationalization features.) + + Copyright (C) 1993 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +/* AIX requires this to be the first thing in the file. */ +#if defined (_AIX) && !defined (REGEX_MALLOC) + #pragma alloca +#endif + +#define _GNU_SOURCE + +/* We need this for `regex.h', and perhaps for the Emacs include files. */ +#include + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +/* The `emacs' switch turns on certain matching commands + that make sense only in Emacs. */ +#ifdef emacs + +#include "lisp.h" +#include "buffer.h" +#include "syntax.h" + +/* Emacs uses `NULL' as a predicate. */ +#undef NULL + +#else /* not emacs */ + +/* We used to test for `BSTRING' here, but only GCC and Emacs define + `BSTRING', as far as I know, and neither of them use this code. */ +#if HAVE_STRING_H || STDC_HEADERS +#include +#ifndef bcmp +#define bcmp(s1, s2, n) memcmp ((s1), (s2), (n)) +#endif +#ifndef bcopy +#define bcopy(s, d, n) memcpy ((d), (s), (n)) +#endif +#ifndef bzero +#define bzero(s, n) memset ((s), 0, (n)) +#endif +#else +#include +#endif + +#ifdef STDC_HEADERS +#include +#else +char *malloc (); +char *realloc (); +#endif + + +/* Define the syntax stuff for \<, \>, etc. */ + +/* This must be nonzero for the wordchar and notwordchar pattern + commands in re_match_2. */ +#ifndef Sword +#define Sword 1 +#endif + +#ifdef SYNTAX_TABLE + +extern char *re_syntax_table; + +#else /* not SYNTAX_TABLE */ + +/* How many characters in the character set. */ +#define CHAR_SET_SIZE 256 + +static char re_syntax_table[CHAR_SET_SIZE]; + +static void +init_syntax_once () +{ + register int c; + static int done = 0; + + if (done) + return; + + bzero (re_syntax_table, sizeof re_syntax_table); + + for (c = 'a'; c <= 'z'; c++) + re_syntax_table[c] = Sword; + + for (c = 'A'; c <= 'Z'; c++) + re_syntax_table[c] = Sword; + + for (c = '0'; c <= '9'; c++) + re_syntax_table[c] = Sword; + + re_syntax_table['_'] = Sword; + + done = 1; +} + +#endif /* not SYNTAX_TABLE */ + +#define SYNTAX(c) re_syntax_table[c] + +#endif /* not emacs */ + +/* Get the interface, including the syntax bits. */ +#include "regex.h" + +/* isalpha etc. are used for the character classes. */ +#include + +#ifndef isascii +#define isascii(c) 1 +#endif + +#ifdef isblank +#define ISBLANK(c) (isascii (c) && isblank (c)) +#else +#define ISBLANK(c) ((c) == ' ' || (c) == '\t') +#endif +#ifdef isgraph +#define ISGRAPH(c) (isascii (c) && isgraph (c)) +#else +#define ISGRAPH(c) (isascii (c) && isprint (c) && !isspace (c)) +#endif + +#define ISPRINT(c) (isascii (c) && isprint (c)) +#define ISDIGIT(c) (isascii (c) && isdigit (c)) +#define ISALNUM(c) (isascii (c) && isalnum (c)) +#define ISALPHA(c) (isascii (c) && isalpha (c)) +#define ISCNTRL(c) (isascii (c) && iscntrl (c)) +#define ISLOWER(c) (isascii (c) && islower (c)) +#define ISPUNCT(c) (isascii (c) && ispunct (c)) +#define ISSPACE(c) (isascii (c) && isspace (c)) +#define ISUPPER(c) (isascii (c) && isupper (c)) +#define ISXDIGIT(c) (isascii (c) && isxdigit (c)) + +#ifndef NULL +#define NULL 0 +#endif + +/* We remove any previous definition of `SIGN_EXTEND_CHAR', + since ours (we hope) works properly with all combinations of + machines, compilers, `char' and `unsigned char' argument types. + (Per Bothner suggested the basic approach.) */ +#undef SIGN_EXTEND_CHAR +#if __STDC__ +#define SIGN_EXTEND_CHAR(c) ((signed char) (c)) +#else /* not __STDC__ */ +/* As in Harbison and Steele. */ +#define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128) +#endif + +/* Should we use malloc or alloca? If REGEX_MALLOC is not defined, we + use `alloca' instead of `malloc'. This is because using malloc in + re_search* or re_match* could cause memory leaks when C-g is used in + Emacs; also, malloc is slower and causes storage fragmentation. On + the other hand, malloc is more portable, and easier to debug. + + Because we sometimes use alloca, some routines have to be macros, + not functions -- `alloca'-allocated space disappears at the end of the + function it is called in. */ + +#ifdef REGEX_MALLOC + +#define REGEX_ALLOCATE malloc +#define REGEX_REALLOCATE(source, osize, nsize) realloc (source, nsize) + +#else /* not REGEX_MALLOC */ + +/* Emacs already defines alloca, sometimes. */ +#ifndef alloca + +/* Make alloca work the best possible way. */ +#ifdef __GNUC__ +#define alloca __builtin_alloca +#else /* not __GNUC__ */ +#if HAVE_ALLOCA_H +#include +#else /* not __GNUC__ or HAVE_ALLOCA_H */ +#ifndef _AIX /* Already did AIX, up at the top. */ +char *alloca (); +#endif /* not _AIX */ +#endif /* not HAVE_ALLOCA_H */ +#endif /* not __GNUC__ */ + +#endif /* not alloca */ + +#define REGEX_ALLOCATE alloca + +/* Assumes a `char *destination' variable. */ +#define REGEX_REALLOCATE(source, osize, nsize) \ + (destination = (char *) alloca (nsize), \ + bcopy (source, destination, osize), \ + destination) + +#endif /* not REGEX_MALLOC */ + + +/* True if `size1' is non-NULL and PTR is pointing anywhere inside + `string1' or just past its end. This works if PTR is NULL, which is + a good thing. */ +#define FIRST_STRING_P(ptr) \ + (size1 && string1 <= (ptr) && (ptr) <= string1 + size1) + +/* (Re)Allocate N items of type T using malloc, or fail. */ +#define TALLOC(n, t) ((t *) malloc ((n) * sizeof (t))) +#define RETALLOC(addr, n, t) ((addr) = (t *) realloc (addr, (n) * sizeof (t))) +#define REGEX_TALLOC(n, t) ((t *) REGEX_ALLOCATE ((n) * sizeof (t))) + +#define BYTEWIDTH 8 /* In bits. */ + +#define STREQ(s1, s2) ((strcmp (s1, s2) == 0)) + +#define MAX(a, b) ((a) > (b) ? (a) : (b)) +#define MIN(a, b) ((a) < (b) ? (a) : (b)) + +typedef char boolean; +#define false 0 +#define true 1 + +/* These are the command codes that appear in compiled regular + expressions. Some opcodes are followed by argument bytes. A + command code can specify any interpretation whatsoever for its + arguments. Zero bytes may appear in the compiled regular expression. + + The value of `exactn' is needed in search.c (search_buffer) in Emacs. + So regex.h defines a symbol `RE_EXACTN_VALUE' to be 1; the value of + `exactn' we use here must also be 1. */ + +typedef enum +{ + no_op = 0, + + /* Followed by one byte giving n, then by n literal bytes. */ + exactn = 1, + + /* Matches any (more or less) character. */ + anychar, + + /* Matches any one char belonging to specified set. First + following byte is number of bitmap bytes. Then come bytes + for a bitmap saying which chars are in. Bits in each byte + are ordered low-bit-first. A character is in the set if its + bit is 1. A character too large to have a bit in the map is + automatically not in the set. */ + charset, + + /* Same parameters as charset, but match any character that is + not one of those specified. */ + charset_not, + + /* Start remembering the text that is matched, for storing in a + register. Followed by one byte with the register number, in + the range 0 to one less than the pattern buffer's re_nsub + field. Then followed by one byte with the number of groups + inner to this one. (This last has to be part of the + start_memory only because we need it in the on_failure_jump + of re_match_2.) */ + start_memory, + + /* Stop remembering the text that is matched and store it in a + memory register. Followed by one byte with the register + number, in the range 0 to one less than `re_nsub' in the + pattern buffer, and one byte with the number of inner groups, + just like `start_memory'. (We need the number of inner + groups here because we don't have any easy way of finding the + corresponding start_memory when we're at a stop_memory.) */ + stop_memory, + + /* Match a duplicate of something remembered. Followed by one + byte containing the register number. */ + duplicate, + + /* Fail unless at beginning of line. */ + begline, + + /* Fail unless at end of line. */ + endline, + + /* Succeeds if at beginning of buffer (if emacs) or at beginning + of string to be matched (if not). */ + begbuf, + + /* Analogously, for end of buffer/string. */ + endbuf, + + /* Followed by two byte relative address to which to jump. */ + jump, + + /* Same as jump, but marks the end of an alternative. */ + jump_past_alt, + + /* Followed by two-byte relative address of place to resume at + in case of failure. */ + on_failure_jump, + + /* Like on_failure_jump, but pushes a placeholder instead of the + current string position when executed. */ + on_failure_keep_string_jump, + + /* Throw away latest failure point and then jump to following + two-byte relative address. */ + pop_failure_jump, + + /* Change to pop_failure_jump if know won't have to backtrack to + match; otherwise change to jump. This is used to jump + back to the beginning of a repeat. If what follows this jump + clearly won't match what the repeat does, such that we can be + sure that there is no use backtracking out of repetitions + already matched, then we change it to a pop_failure_jump. + Followed by two-byte address. */ + maybe_pop_jump, + + /* Jump to following two-byte address, and push a dummy failure + point. This failure point will be thrown away if an attempt + is made to use it for a failure. A `+' construct makes this + before the first repeat. Also used as an intermediary kind + of jump when compiling an alternative. */ + dummy_failure_jump, + + /* Push a dummy failure point and continue. Used at the end of + alternatives. */ + push_dummy_failure, + + /* Followed by two-byte relative address and two-byte number n. + After matching N times, jump to the address upon failure. */ + succeed_n, + + /* Followed by two-byte relative address, and two-byte number n. + Jump to the address N times, then fail. */ + jump_n, + + /* Set the following two-byte relative address to the + subsequent two-byte number. The address *includes* the two + bytes of number. */ + set_number_at, + + wordchar, /* Matches any word-constituent character. */ + notwordchar, /* Matches any char that is not a word-constituent. */ + + wordbeg, /* Succeeds if at word beginning. */ + wordend, /* Succeeds if at word end. */ + + wordbound, /* Succeeds if at a word boundary. */ + notwordbound /* Succeeds if not at a word boundary. */ + +#ifdef emacs + ,before_dot, /* Succeeds if before point. */ + at_dot, /* Succeeds if at point. */ + after_dot, /* Succeeds if after point. */ + + /* Matches any character whose syntax is specified. Followed by + a byte which contains a syntax code, e.g., Sword. */ + syntaxspec, + + /* Matches any character whose syntax is not that specified. */ + notsyntaxspec +#endif /* emacs */ +} re_opcode_t; + +/* Common operations on the compiled pattern. */ + +/* Store NUMBER in two contiguous bytes starting at DESTINATION. */ + +#define STORE_NUMBER(destination, number) \ + do { \ + (destination)[0] = (number) & 0377; \ + (destination)[1] = (number) >> 8; \ + } while (0) + +/* Same as STORE_NUMBER, except increment DESTINATION to + the byte after where the number is stored. Therefore, DESTINATION + must be an lvalue. */ + +#define STORE_NUMBER_AND_INCR(destination, number) \ + do { \ + STORE_NUMBER (destination, number); \ + (destination) += 2; \ + } while (0) + +/* Put into DESTINATION a number stored in two contiguous bytes starting + at SOURCE. */ + +#define EXTRACT_NUMBER(destination, source) \ + do { \ + (destination) = *(source) & 0377; \ + (destination) += SIGN_EXTEND_CHAR (*((source) + 1)) << 8; \ + } while (0) + +#ifdef DEBUG +static void +extract_number (dest, source) + int *dest; + unsigned char *source; +{ + int temp = SIGN_EXTEND_CHAR (*(source + 1)); + *dest = *source & 0377; + *dest += temp << 8; +} + +#ifndef EXTRACT_MACROS /* To debug the macros. */ +#undef EXTRACT_NUMBER +#define EXTRACT_NUMBER(dest, src) extract_number (&dest, src) +#endif /* not EXTRACT_MACROS */ + +#endif /* DEBUG */ + +/* Same as EXTRACT_NUMBER, except increment SOURCE to after the number. + SOURCE must be an lvalue. */ + +#define EXTRACT_NUMBER_AND_INCR(destination, source) \ + do { \ + EXTRACT_NUMBER (destination, source); \ + (source) += 2; \ + } while (0) + +#ifdef DEBUG +static void +extract_number_and_incr (destination, source) + int *destination; + unsigned char **source; +{ + extract_number (destination, *source); + *source += 2; +} + +#ifndef EXTRACT_MACROS +#undef EXTRACT_NUMBER_AND_INCR +#define EXTRACT_NUMBER_AND_INCR(dest, src) \ + extract_number_and_incr (&dest, &src) +#endif /* not EXTRACT_MACROS */ + +#endif /* DEBUG */ + +/* If DEBUG is defined, Regex prints many voluminous messages about what + it is doing (if the variable `debug' is nonzero). If linked with the + main program in `iregex.c', you can enter patterns and strings + interactively. And if linked with the main program in `main.c' and + the other test files, you can run the already-written tests. */ + +#ifdef DEBUG + +/* We use standard I/O for debugging. */ +#include + +/* It is useful to test things that ``must'' be true when debugging. */ +#include + +static int debug = 0; + +#define DEBUG_STATEMENT(e) e +#define DEBUG_PRINT1(x) if (debug) printf (x) +#define DEBUG_PRINT2(x1, x2) if (debug) printf (x1, x2) +#define DEBUG_PRINT3(x1, x2, x3) if (debug) printf (x1, x2, x3) +#define DEBUG_PRINT4(x1, x2, x3, x4) if (debug) printf (x1, x2, x3, x4) +#define DEBUG_PRINT_COMPILED_PATTERN(p, s, e) \ + if (debug) print_partial_compiled_pattern (s, e) +#define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2) \ + if (debug) print_double_string (w, s1, sz1, s2, sz2) + + +extern void printchar (); + +/* Print the fastmap in human-readable form. */ + +void +print_fastmap (fastmap) + char *fastmap; +{ + unsigned was_a_range = 0; + unsigned i = 0; + + while (i < (1 << BYTEWIDTH)) + { + if (fastmap[i++]) + { + was_a_range = 0; + printchar (i - 1); + while (i < (1 << BYTEWIDTH) && fastmap[i]) + { + was_a_range = 1; + i++; + } + if (was_a_range) + { + printf ("-"); + printchar (i - 1); + } + } + } + putchar ('\n'); +} + + +/* Print a compiled pattern string in human-readable form, starting at + the START pointer into it and ending just before the pointer END. */ + +void +print_partial_compiled_pattern (start, end) + unsigned char *start; + unsigned char *end; +{ + int mcnt, mcnt2; + unsigned char *p = start; + unsigned char *pend = end; + + if (start == NULL) + { + printf ("(null)\n"); + return; + } + + /* Loop over pattern commands. */ + while (p < pend) + { + switch ((re_opcode_t) *p++) + { + case no_op: + printf ("/no_op"); + break; + + case exactn: + mcnt = *p++; + printf ("/exactn/%d", mcnt); + do + { + putchar ('/'); + printchar (*p++); + } + while (--mcnt); + break; + + case start_memory: + mcnt = *p++; + printf ("/start_memory/%d/%d", mcnt, *p++); + break; + + case stop_memory: + mcnt = *p++; + printf ("/stop_memory/%d/%d", mcnt, *p++); + break; + + case duplicate: + printf ("/duplicate/%d", *p++); + break; + + case anychar: + printf ("/anychar"); + break; + + case charset: + case charset_not: + { + register int c; + + printf ("/charset%s", + (re_opcode_t) *(p - 1) == charset_not ? "_not" : ""); + + assert (p + *p < pend); + + for (c = 0; c < *p; c++) + { + unsigned bit; + unsigned char map_byte = p[1 + c]; + + putchar ('/'); + + for (bit = 0; bit < BYTEWIDTH; bit++) + if (map_byte & (1 << bit)) + printchar (c * BYTEWIDTH + bit); + } + p += 1 + *p; + break; + } + + case begline: + printf ("/begline"); + break; + + case endline: + printf ("/endline"); + break; + + case on_failure_jump: + extract_number_and_incr (&mcnt, &p); + printf ("/on_failure_jump/0/%d", mcnt); + break; + + case on_failure_keep_string_jump: + extract_number_and_incr (&mcnt, &p); + printf ("/on_failure_keep_string_jump/0/%d", mcnt); + break; + + case dummy_failure_jump: + extract_number_and_incr (&mcnt, &p); + printf ("/dummy_failure_jump/0/%d", mcnt); + break; + + case push_dummy_failure: + printf ("/push_dummy_failure"); + break; + + case maybe_pop_jump: + extract_number_and_incr (&mcnt, &p); + printf ("/maybe_pop_jump/0/%d", mcnt); + break; + + case pop_failure_jump: + extract_number_and_incr (&mcnt, &p); + printf ("/pop_failure_jump/0/%d", mcnt); + break; + + case jump_past_alt: + extract_number_and_incr (&mcnt, &p); + printf ("/jump_past_alt/0/%d", mcnt); + break; + + case jump: + extract_number_and_incr (&mcnt, &p); + printf ("/jump/0/%d", mcnt); + break; + + case succeed_n: + extract_number_and_incr (&mcnt, &p); + extract_number_and_incr (&mcnt2, &p); + printf ("/succeed_n/0/%d/0/%d", mcnt, mcnt2); + break; + + case jump_n: + extract_number_and_incr (&mcnt, &p); + extract_number_and_incr (&mcnt2, &p); + printf ("/jump_n/0/%d/0/%d", mcnt, mcnt2); + break; + + case set_number_at: + extract_number_and_incr (&mcnt, &p); + extract_number_and_incr (&mcnt2, &p); + printf ("/set_number_at/0/%d/0/%d", mcnt, mcnt2); + break; + + case wordbound: + printf ("/wordbound"); + break; + + case notwordbound: + printf ("/notwordbound"); + break; + + case wordbeg: + printf ("/wordbeg"); + break; + + case wordend: + printf ("/wordend"); + +#ifdef emacs + case before_dot: + printf ("/before_dot"); + break; + + case at_dot: + printf ("/at_dot"); + break; + + case after_dot: + printf ("/after_dot"); + break; + + case syntaxspec: + printf ("/syntaxspec"); + mcnt = *p++; + printf ("/%d", mcnt); + break; + + case notsyntaxspec: + printf ("/notsyntaxspec"); + mcnt = *p++; + printf ("/%d", mcnt); + break; +#endif /* emacs */ + + case wordchar: + printf ("/wordchar"); + break; + + case notwordchar: + printf ("/notwordchar"); + break; + + case begbuf: + printf ("/begbuf"); + break; + + case endbuf: + printf ("/endbuf"); + break; + + default: + printf ("?%d", *(p-1)); + } + } + printf ("/\n"); +} + + +void +print_compiled_pattern (bufp) + struct re_pattern_buffer *bufp; +{ + unsigned char *buffer = bufp->buffer; + + print_partial_compiled_pattern (buffer, buffer + bufp->used); + printf ("%d bytes used/%d bytes allocated.\n", bufp->used, bufp->allocated); + + if (bufp->fastmap_accurate && bufp->fastmap) + { + printf ("fastmap: "); + print_fastmap (bufp->fastmap); + } + + printf ("re_nsub: %d\t", bufp->re_nsub); + printf ("regs_alloc: %d\t", bufp->regs_allocated); + printf ("can_be_null: %d\t", bufp->can_be_null); + printf ("newline_anchor: %d\n", bufp->newline_anchor); + printf ("no_sub: %d\t", bufp->no_sub); + printf ("not_bol: %d\t", bufp->not_bol); + printf ("not_eol: %d\t", bufp->not_eol); + printf ("syntax: %d\n", bufp->syntax); + /* Perhaps we should print the translate table? */ +} + + +void +print_double_string (where, string1, size1, string2, size2) + const char *where; + const char *string1; + const char *string2; + int size1; + int size2; +{ + unsigned this_char; + + if (where == NULL) + printf ("(null)"); + else + { + if (FIRST_STRING_P (where)) + { + for (this_char = where - string1; this_char < size1; this_char++) + printchar (string1[this_char]); + + where = string2; + } + + for (this_char = where - string2; this_char < size2; this_char++) + printchar (string2[this_char]); + } +} + +#else /* not DEBUG */ + +#undef assert +#define assert(e) + +#define DEBUG_STATEMENT(e) +#define DEBUG_PRINT1(x) +#define DEBUG_PRINT2(x1, x2) +#define DEBUG_PRINT3(x1, x2, x3) +#define DEBUG_PRINT4(x1, x2, x3, x4) +#define DEBUG_PRINT_COMPILED_PATTERN(p, s, e) +#define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2) + +#endif /* not DEBUG */ + +/* Set by `re_set_syntax' to the current regexp syntax to recognize. Can + also be assigned to arbitrarily: each pattern buffer stores its own + syntax, so it can be changed between regex compilations. */ +reg_syntax_t re_syntax_options = RE_SYNTAX_EMACS; + + +/* Specify the precise syntax of regexps for compilation. This provides + for compatibility for various utilities which historically have + different, incompatible syntaxes. + + The argument SYNTAX is a bit mask comprised of the various bits + defined in regex.h. We return the old syntax. */ + +reg_syntax_t +re_set_syntax (syntax) + reg_syntax_t syntax; +{ + reg_syntax_t ret = re_syntax_options; + + re_syntax_options = syntax; + return ret; +} + +/* This table gives an error message for each of the error codes listed + in regex.h. Obviously the order here has to be same as there. */ + +static const char *re_error_msg[] = + { NULL, /* REG_NOERROR */ + "No match", /* REG_NOMATCH */ + "Invalid regular expression", /* REG_BADPAT */ + "Invalid collation character", /* REG_ECOLLATE */ + "Invalid character class name", /* REG_ECTYPE */ + "Trailing backslash", /* REG_EESCAPE */ + "Invalid back reference", /* REG_ESUBREG */ + "Unmatched [ or [^", /* REG_EBRACK */ + "Unmatched ( or \\(", /* REG_EPAREN */ + "Unmatched \\{", /* REG_EBRACE */ + "Invalid content of \\{\\}", /* REG_BADBR */ + "Invalid range end", /* REG_ERANGE */ + "Memory exhausted", /* REG_ESPACE */ + "Invalid preceding regular expression", /* REG_BADRPT */ + "Premature end of regular expression", /* REG_EEND */ + "Regular expression too big", /* REG_ESIZE */ + "Unmatched ) or \\)", /* REG_ERPAREN */ + }; + +/* Subroutine declarations and macros for regex_compile. */ + +static void store_op1 (), store_op2 (); +static void insert_op1 (), insert_op2 (); +static boolean at_begline_loc_p (), at_endline_loc_p (); +static boolean group_in_compile_stack (); +static reg_errcode_t compile_range (); + +/* Fetch the next character in the uncompiled pattern---translating it + if necessary. Also cast from a signed character in the constant + string passed to us by the user to an unsigned char that we can use + as an array index (in, e.g., `translate'). */ +#define PATFETCH(c) \ + do {if (p == pend) return REG_EEND; \ + c = (unsigned char) *p++; \ + if (translate) c = translate[c]; \ + } while (0) + +/* Fetch the next character in the uncompiled pattern, with no + translation. */ +#define PATFETCH_RAW(c) \ + do {if (p == pend) return REG_EEND; \ + c = (unsigned char) *p++; \ + } while (0) + +/* Go backwards one character in the pattern. */ +#define PATUNFETCH p-- + + +/* If `translate' is non-null, return translate[D], else just D. We + cast the subscript to translate because some data is declared as + `char *', to avoid warnings when a string constant is passed. But + when we use a character as a subscript we must make it unsigned. */ +#define TRANSLATE(d) (translate ? translate[(unsigned char) (d)] : (d)) + + +/* Macros for outputting the compiled pattern into `buffer'. */ + +/* If the buffer isn't allocated when it comes in, use this. */ +#define INIT_BUF_SIZE 32 + +/* Make sure we have at least N more bytes of space in buffer. */ +#define GET_BUFFER_SPACE(n) \ + while (b - bufp->buffer + (n) > bufp->allocated) \ + EXTEND_BUFFER () + +/* Make sure we have one more byte of buffer space and then add C to it. */ +#define BUF_PUSH(c) \ + do { \ + GET_BUFFER_SPACE (1); \ + *b++ = (unsigned char) (c); \ + } while (0) + + +/* Ensure we have two more bytes of buffer space and then append C1 and C2. */ +#define BUF_PUSH_2(c1, c2) \ + do { \ + GET_BUFFER_SPACE (2); \ + *b++ = (unsigned char) (c1); \ + *b++ = (unsigned char) (c2); \ + } while (0) + + +/* As with BUF_PUSH_2, except for three bytes. */ +#define BUF_PUSH_3(c1, c2, c3) \ + do { \ + GET_BUFFER_SPACE (3); \ + *b++ = (unsigned char) (c1); \ + *b++ = (unsigned char) (c2); \ + *b++ = (unsigned char) (c3); \ + } while (0) + + +/* Store a jump with opcode OP at LOC to location TO. We store a + relative address offset by the three bytes the jump itself occupies. */ +#define STORE_JUMP(op, loc, to) \ + store_op1 (op, loc, (to) - (loc) - 3) + +/* Likewise, for a two-argument jump. */ +#define STORE_JUMP2(op, loc, to, arg) \ + store_op2 (op, loc, (to) - (loc) - 3, arg) + +/* Like `STORE_JUMP', but for inserting. Assume `b' is the buffer end. */ +#define INSERT_JUMP(op, loc, to) \ + insert_op1 (op, loc, (to) - (loc) - 3, b) + +/* Like `STORE_JUMP2', but for inserting. Assume `b' is the buffer end. */ +#define INSERT_JUMP2(op, loc, to, arg) \ + insert_op2 (op, loc, (to) - (loc) - 3, arg, b) + + +/* This is not an arbitrary limit: the arguments which represent offsets + into the pattern are two bytes long. So if 2^16 bytes turns out to + be too small, many things would have to change. */ +#define MAX_BUF_SIZE (1L << 16) + + +/* Extend the buffer by twice its current size via realloc and + reset the pointers that pointed into the old block to point to the + correct places in the new one. If extending the buffer results in it + being larger than MAX_BUF_SIZE, then flag memory exhausted. */ +#define EXTEND_BUFFER() \ + do { \ + unsigned char *old_buffer = bufp->buffer; \ + if (bufp->allocated == MAX_BUF_SIZE) \ + return REG_ESIZE; \ + bufp->allocated <<= 1; \ + if (bufp->allocated > MAX_BUF_SIZE) \ + bufp->allocated = MAX_BUF_SIZE; \ + bufp->buffer = (unsigned char *) realloc (bufp->buffer, bufp->allocated);\ + if (bufp->buffer == NULL) \ + return REG_ESPACE; \ + /* If the buffer moved, move all the pointers into it. */ \ + if (old_buffer != bufp->buffer) \ + { \ + b = (b - old_buffer) + bufp->buffer; \ + begalt = (begalt - old_buffer) + bufp->buffer; \ + if (fixup_alt_jump) \ + fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer;\ + if (laststart) \ + laststart = (laststart - old_buffer) + bufp->buffer; \ + if (pending_exact) \ + pending_exact = (pending_exact - old_buffer) + bufp->buffer; \ + } \ + } while (0) + + +/* Since we have one byte reserved for the register number argument to + {start,stop}_memory, the maximum number of groups we can report + things about is what fits in that byte. */ +#define MAX_REGNUM 255 + +/* But patterns can have more than `MAX_REGNUM' registers. We just + ignore the excess. */ +typedef unsigned regnum_t; + + +/* Macros for the compile stack. */ + +/* Since offsets can go either forwards or backwards, this type needs to + be able to hold values from -(MAX_BUF_SIZE - 1) to MAX_BUF_SIZE - 1. */ +typedef int pattern_offset_t; + +typedef struct +{ + pattern_offset_t begalt_offset; + pattern_offset_t fixup_alt_jump; + pattern_offset_t inner_group_offset; + pattern_offset_t laststart_offset; + regnum_t regnum; +} compile_stack_elt_t; + + +typedef struct +{ + compile_stack_elt_t *stack; + unsigned size; + unsigned avail; /* Offset of next open position. */ +} compile_stack_type; + + +#define INIT_COMPILE_STACK_SIZE 32 + +#define COMPILE_STACK_EMPTY (compile_stack.avail == 0) +#define COMPILE_STACK_FULL (compile_stack.avail == compile_stack.size) + +/* The next available element. */ +#define COMPILE_STACK_TOP (compile_stack.stack[compile_stack.avail]) + + +/* Set the bit for character C in a list. */ +#define SET_LIST_BIT(c) \ + (b[((unsigned char) (c)) / BYTEWIDTH] \ + |= 1 << (((unsigned char) c) % BYTEWIDTH)) + + +/* Get the next unsigned number in the uncompiled pattern. */ +#define GET_UNSIGNED_NUMBER(num) \ + { if (p != pend) \ + { \ + PATFETCH (c); \ + while (ISDIGIT (c)) \ + { \ + if (num < 0) \ + num = 0; \ + num = num * 10 + c - '0'; \ + if (p == pend) \ + break; \ + PATFETCH (c); \ + } \ + } \ + } + +#define CHAR_CLASS_MAX_LENGTH 6 /* Namely, `xdigit'. */ + +#define IS_CHAR_CLASS(string) \ + (STREQ (string, "alpha") || STREQ (string, "upper") \ + || STREQ (string, "lower") || STREQ (string, "digit") \ + || STREQ (string, "alnum") || STREQ (string, "xdigit") \ + || STREQ (string, "space") || STREQ (string, "print") \ + || STREQ (string, "punct") || STREQ (string, "graph") \ + || STREQ (string, "cntrl") || STREQ (string, "blank")) + +/* `regex_compile' compiles PATTERN (of length SIZE) according to SYNTAX. + Returns one of error codes defined in `regex.h', or zero for success. + + Assumes the `allocated' (and perhaps `buffer') and `translate' + fields are set in BUFP on entry. + + If it succeeds, results are put in BUFP (if it returns an error, the + contents of BUFP are undefined): + `buffer' is the compiled pattern; + `syntax' is set to SYNTAX; + `used' is set to the length of the compiled pattern; + `fastmap_accurate' is zero; + `re_nsub' is the number of subexpressions in PATTERN; + `not_bol' and `not_eol' are zero; + + The `fastmap' and `newline_anchor' fields are neither + examined nor set. */ + +static reg_errcode_t +regex_compile (pattern, size, syntax, bufp) + const char *pattern; + int size; + reg_syntax_t syntax; + struct re_pattern_buffer *bufp; +{ + /* We fetch characters from PATTERN here. Even though PATTERN is + `char *' (i.e., signed), we declare these variables as unsigned, so + they can be reliably used as array indices. */ + register unsigned char c, c1; + + /* A random tempory spot in PATTERN. */ + const char *p1; + + /* Points to the end of the buffer, where we should append. */ + register unsigned char *b; + + /* Keeps track of unclosed groups. */ + compile_stack_type compile_stack; + + /* Points to the current (ending) position in the pattern. */ + const char *p = pattern; + const char *pend = pattern + size; + + /* How to translate the characters in the pattern. */ + char *translate = bufp->translate; + + /* Address of the count-byte of the most recently inserted `exactn' + command. This makes it possible to tell if a new exact-match + character can be added to that command or if the character requires + a new `exactn' command. */ + unsigned char *pending_exact = 0; + + /* Address of start of the most recently finished expression. + This tells, e.g., postfix * where to find the start of its + operand. Reset at the beginning of groups and alternatives. */ + unsigned char *laststart = 0; + + /* Address of beginning of regexp, or inside of last group. */ + unsigned char *begalt; + + /* Place in the uncompiled pattern (i.e., the {) to + which to go back if the interval is invalid. */ + const char *beg_interval; + + /* Address of the place where a forward jump should go to the end of + the containing expression. Each alternative of an `or' -- except the + last -- ends with a forward jump of this sort. */ + unsigned char *fixup_alt_jump = 0; + + /* Counts open-groups as they are encountered. Remembered for the + matching close-group on the compile stack, so the same register + number is put in the stop_memory as the start_memory. */ + regnum_t regnum = 0; + +#ifdef DEBUG + DEBUG_PRINT1 ("\nCompiling pattern: "); + if (debug) + { + unsigned debug_count; + + for (debug_count = 0; debug_count < size; debug_count++) + printchar (pattern[debug_count]); + putchar ('\n'); + } +#endif /* DEBUG */ + + /* Initialize the compile stack. */ + compile_stack.stack = TALLOC (INIT_COMPILE_STACK_SIZE, compile_stack_elt_t); + if (compile_stack.stack == NULL) + return REG_ESPACE; + + compile_stack.size = INIT_COMPILE_STACK_SIZE; + compile_stack.avail = 0; + + /* Initialize the pattern buffer. */ + bufp->syntax = syntax; + bufp->fastmap_accurate = 0; + bufp->not_bol = bufp->not_eol = 0; + + /* Set `used' to zero, so that if we return an error, the pattern + printer (for debugging) will think there's no pattern. We reset it + at the end. */ + bufp->used = 0; + + /* Always count groups, whether or not bufp->no_sub is set. */ + bufp->re_nsub = 0; + +#if !defined (emacs) && !defined (SYNTAX_TABLE) + /* Initialize the syntax table. */ + init_syntax_once (); +#endif + + if (bufp->allocated == 0) + { + if (bufp->buffer) + { /* If zero allocated, but buffer is non-null, try to realloc + enough space. This loses if buffer's address is bogus, but + that is the user's responsibility. */ + RETALLOC (bufp->buffer, INIT_BUF_SIZE, unsigned char); + } + else + { /* Caller did not allocate a buffer. Do it for them. */ + bufp->buffer = TALLOC (INIT_BUF_SIZE, unsigned char); + } + if (!bufp->buffer) return REG_ESPACE; + + bufp->allocated = INIT_BUF_SIZE; + } + + begalt = b = bufp->buffer; + + /* Loop through the uncompiled pattern until we're at the end. */ + while (p != pend) + { + PATFETCH (c); + + switch (c) + { + case '^': + { + if ( /* If at start of pattern, it's an operator. */ + p == pattern + 1 + /* If context independent, it's an operator. */ + || syntax & RE_CONTEXT_INDEP_ANCHORS + /* Otherwise, depends on what's come before. */ + || at_begline_loc_p (pattern, p, syntax)) + BUF_PUSH (begline); + else + goto normal_char; + } + break; + + + case '$': + { + if ( /* If at end of pattern, it's an operator. */ + p == pend + /* If context independent, it's an operator. */ + || syntax & RE_CONTEXT_INDEP_ANCHORS + /* Otherwise, depends on what's next. */ + || at_endline_loc_p (p, pend, syntax)) + BUF_PUSH (endline); + else + goto normal_char; + } + break; + + + case '+': + case '?': + if ((syntax & RE_BK_PLUS_QM) + || (syntax & RE_LIMITED_OPS)) + goto normal_char; + handle_plus: + case '*': + /* If there is no previous pattern... */ + if (!laststart) + { + if (syntax & RE_CONTEXT_INVALID_OPS) + return REG_BADRPT; + else if (!(syntax & RE_CONTEXT_INDEP_OPS)) + goto normal_char; + } + + { + /* Are we optimizing this jump? */ + boolean keep_string_p = false; + + /* 1 means zero (many) matches is allowed. */ + char zero_times_ok = 0, many_times_ok = 0; + + /* If there is a sequence of repetition chars, collapse it + down to just one (the right one). We can't combine + interval operators with these because of, e.g., `a{2}*', + which should only match an even number of `a's. */ + + for (;;) + { + zero_times_ok |= c != '+'; + many_times_ok |= c != '?'; + + if (p == pend) + break; + + PATFETCH (c); + + if (c == '*' + || (!(syntax & RE_BK_PLUS_QM) && (c == '+' || c == '?'))) + ; + + else if (syntax & RE_BK_PLUS_QM && c == '\\') + { + if (p == pend) return REG_EESCAPE; + + PATFETCH (c1); + if (!(c1 == '+' || c1 == '?')) + { + PATUNFETCH; + PATUNFETCH; + break; + } + + c = c1; + } + else + { + PATUNFETCH; + break; + } + + /* If we get here, we found another repeat character. */ + } + + /* Star, etc. applied to an empty pattern is equivalent + to an empty pattern. */ + if (!laststart) + break; + + /* Now we know whether or not zero matches is allowed + and also whether or not two or more matches is allowed. */ + if (many_times_ok) + { /* More than one repetition is allowed, so put in at the + end a backward relative jump from `b' to before the next + jump we're going to put in below (which jumps from + laststart to after this jump). + + But if we are at the `*' in the exact sequence `.*\n', + insert an unconditional jump backwards to the ., + instead of the beginning of the loop. This way we only + push a failure point once, instead of every time + through the loop. */ + assert (p - 1 > pattern); + + /* Allocate the space for the jump. */ + GET_BUFFER_SPACE (3); + + /* We know we are not at the first character of the pattern, + because laststart was nonzero. And we've already + incremented `p', by the way, to be the character after + the `*'. Do we have to do something analogous here + for null bytes, because of RE_DOT_NOT_NULL? */ + if (TRANSLATE (*(p - 2)) == TRANSLATE ('.') + && zero_times_ok + && p < pend && TRANSLATE (*p) == TRANSLATE ('\n') + && !(syntax & RE_DOT_NEWLINE)) + { /* We have .*\n. */ + STORE_JUMP (jump, b, laststart); + keep_string_p = true; + } + else + /* Anything else. */ + STORE_JUMP (maybe_pop_jump, b, laststart - 3); + + /* We've added more stuff to the buffer. */ + b += 3; + } + + /* On failure, jump from laststart to b + 3, which will be the + end of the buffer after this jump is inserted. */ + GET_BUFFER_SPACE (3); + INSERT_JUMP (keep_string_p ? on_failure_keep_string_jump + : on_failure_jump, + laststart, b + 3); + pending_exact = 0; + b += 3; + + if (!zero_times_ok) + { + /* At least one repetition is required, so insert a + `dummy_failure_jump' before the initial + `on_failure_jump' instruction of the loop. This + effects a skip over that instruction the first time + we hit that loop. */ + GET_BUFFER_SPACE (3); + INSERT_JUMP (dummy_failure_jump, laststart, laststart + 6); + b += 3; + } + } + break; + + + case '.': + laststart = b; + BUF_PUSH (anychar); + break; + + + case '[': + { + boolean had_char_class = false; + + if (p == pend) return REG_EBRACK; + + /* Ensure that we have enough space to push a charset: the + opcode, the length count, and the bitset; 34 bytes in all. */ + GET_BUFFER_SPACE (34); + + laststart = b; + + /* We test `*p == '^' twice, instead of using an if + statement, so we only need one BUF_PUSH. */ + BUF_PUSH (*p == '^' ? charset_not : charset); + if (*p == '^') + p++; + + /* Remember the first position in the bracket expression. */ + p1 = p; + + /* Push the number of bytes in the bitmap. */ + BUF_PUSH ((1 << BYTEWIDTH) / BYTEWIDTH); + + /* Clear the whole map. */ + bzero (b, (1 << BYTEWIDTH) / BYTEWIDTH); + + /* charset_not matches newline according to a syntax bit. */ + if ((re_opcode_t) b[-2] == charset_not + && (syntax & RE_HAT_LISTS_NOT_NEWLINE)) + SET_LIST_BIT ('\n'); + + /* Read in characters and ranges, setting map bits. */ + for (;;) + { + if (p == pend) return REG_EBRACK; + + PATFETCH (c); + + /* \ might escape characters inside [...] and [^...]. */ + if ((syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) && c == '\\') + { + if (p == pend) return REG_EESCAPE; + + PATFETCH (c1); + SET_LIST_BIT (c1); + continue; + } + + /* Could be the end of the bracket expression. If it's + not (i.e., when the bracket expression is `[]' so + far), the ']' character bit gets set way below. */ + if (c == ']' && p != p1 + 1) + break; + + /* Look ahead to see if it's a range when the last thing + was a character class. */ + if (had_char_class && c == '-' && *p != ']') + return REG_ERANGE; + + /* Look ahead to see if it's a range when the last thing + was a character: if this is a hyphen not at the + beginning or the end of a list, then it's the range + operator. */ + if (c == '-' + && !(p - 2 >= pattern && p[-2] == '[') + && !(p - 3 >= pattern && p[-3] == '[' && p[-2] == '^') + && *p != ']') + { + reg_errcode_t ret + = compile_range (&p, pend, translate, syntax, b); + if (ret != REG_NOERROR) return ret; + } + + else if (p[0] == '-' && p[1] != ']') + { /* This handles ranges made up of characters only. */ + reg_errcode_t ret; + + /* Move past the `-'. */ + PATFETCH (c1); + + ret = compile_range (&p, pend, translate, syntax, b); + if (ret != REG_NOERROR) return ret; + } + + /* See if we're at the beginning of a possible character + class. */ + + else if (syntax & RE_CHAR_CLASSES && c == '[' && *p == ':') + { /* Leave room for the null. */ + char str[CHAR_CLASS_MAX_LENGTH + 1]; + + PATFETCH (c); + c1 = 0; + + /* If pattern is `[[:'. */ + if (p == pend) return REG_EBRACK; + + for (;;) + { + PATFETCH (c); + if (c == ':' || c == ']' || p == pend + || c1 == CHAR_CLASS_MAX_LENGTH) + break; + str[c1++] = c; + } + str[c1] = '\0'; + + /* If isn't a word bracketed by `[:' and:`]': + undo the ending character, the letters, and leave + the leading `:' and `[' (but set bits for them). */ + if (c == ':' && *p == ']') + { + int ch; + boolean is_alnum = STREQ (str, "alnum"); + boolean is_alpha = STREQ (str, "alpha"); + boolean is_blank = STREQ (str, "blank"); + boolean is_cntrl = STREQ (str, "cntrl"); + boolean is_digit = STREQ (str, "digit"); + boolean is_graph = STREQ (str, "graph"); + boolean is_lower = STREQ (str, "lower"); + boolean is_print = STREQ (str, "print"); + boolean is_punct = STREQ (str, "punct"); + boolean is_space = STREQ (str, "space"); + boolean is_upper = STREQ (str, "upper"); + boolean is_xdigit = STREQ (str, "xdigit"); + + if (!IS_CHAR_CLASS (str)) return REG_ECTYPE; + + /* Throw away the ] at the end of the character + class. */ + PATFETCH (c); + + if (p == pend) return REG_EBRACK; + + for (ch = 0; ch < 1 << BYTEWIDTH; ch++) + { + if ( (is_alnum && ISALNUM (ch)) + || (is_alpha && ISALPHA (ch)) + || (is_blank && ISBLANK (ch)) + || (is_cntrl && ISCNTRL (ch)) + || (is_digit && ISDIGIT (ch)) + || (is_graph && ISGRAPH (ch)) + || (is_lower && ISLOWER (ch)) + || (is_print && ISPRINT (ch)) + || (is_punct && ISPUNCT (ch)) + || (is_space && ISSPACE (ch)) + || (is_upper && ISUPPER (ch)) + || (is_xdigit && ISXDIGIT (ch))) + SET_LIST_BIT (ch); + } + had_char_class = true; + } + else + { + c1++; + while (c1--) + PATUNFETCH; + SET_LIST_BIT ('['); + SET_LIST_BIT (':'); + had_char_class = false; + } + } + else + { + had_char_class = false; + SET_LIST_BIT (c); + } + } + + /* Discard any (non)matching list bytes that are all 0 at the + end of the map. Decrease the map-length byte too. */ + while ((int) b[-1] > 0 && b[b[-1] - 1] == 0) + b[-1]--; + b += b[-1]; + } + break; + + + case '(': + if (syntax & RE_NO_BK_PARENS) + goto handle_open; + else + goto normal_char; + + + case ')': + if (syntax & RE_NO_BK_PARENS) + goto handle_close; + else + goto normal_char; + + + case '\n': + if (syntax & RE_NEWLINE_ALT) + goto handle_alt; + else + goto normal_char; + + + case '|': + if (syntax & RE_NO_BK_VBAR) + goto handle_alt; + else + goto normal_char; + + + case '{': + if (syntax & RE_INTERVALS && syntax & RE_NO_BK_BRACES) + goto handle_interval; + else + goto normal_char; + + + case '\\': + if (p == pend) return REG_EESCAPE; + + /* Do not translate the character after the \, so that we can + distinguish, e.g., \B from \b, even if we normally would + translate, e.g., B to b. */ + PATFETCH_RAW (c); + + switch (c) + { + case '(': + if (syntax & RE_NO_BK_PARENS) + goto normal_backslash; + + handle_open: + bufp->re_nsub++; + regnum++; + + if (COMPILE_STACK_FULL) + { + RETALLOC (compile_stack.stack, compile_stack.size << 1, + compile_stack_elt_t); + if (compile_stack.stack == NULL) return REG_ESPACE; + + compile_stack.size <<= 1; + } + + /* These are the values to restore when we hit end of this + group. They are all relative offsets, so that if the + whole pattern moves because of realloc, they will still + be valid. */ + COMPILE_STACK_TOP.begalt_offset = begalt - bufp->buffer; + COMPILE_STACK_TOP.fixup_alt_jump + = fixup_alt_jump ? fixup_alt_jump - bufp->buffer + 1 : 0; + COMPILE_STACK_TOP.laststart_offset = b - bufp->buffer; + COMPILE_STACK_TOP.regnum = regnum; + + /* We will eventually replace the 0 with the number of + groups inner to this one. But do not push a + start_memory for groups beyond the last one we can + represent in the compiled pattern. */ + if (regnum <= MAX_REGNUM) + { + COMPILE_STACK_TOP.inner_group_offset = b - bufp->buffer + 2; + BUF_PUSH_3 (start_memory, regnum, 0); + } + + compile_stack.avail++; + + fixup_alt_jump = 0; + laststart = 0; + begalt = b; + /* If we've reached MAX_REGNUM groups, then this open + won't actually generate any code, so we'll have to + clear pending_exact explicitly. */ + pending_exact = 0; + break; + + + case ')': + if (syntax & RE_NO_BK_PARENS) goto normal_backslash; + + if (COMPILE_STACK_EMPTY) + if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) + goto normal_backslash; + else + return REG_ERPAREN; + + handle_close: + if (fixup_alt_jump) + { /* Push a dummy failure point at the end of the + alternative for a possible future + `pop_failure_jump' to pop. See comments at + `push_dummy_failure' in `re_match_2'. */ + BUF_PUSH (push_dummy_failure); + + /* We allocated space for this jump when we assigned + to `fixup_alt_jump', in the `handle_alt' case below. */ + STORE_JUMP (jump_past_alt, fixup_alt_jump, b - 1); + } + + /* See similar code for backslashed left paren above. */ + if (COMPILE_STACK_EMPTY) + if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) + goto normal_char; + else + return REG_ERPAREN; + + /* Since we just checked for an empty stack above, this + ``can't happen''. */ + assert (compile_stack.avail != 0); + { + /* We don't just want to restore into `regnum', because + later groups should continue to be numbered higher, + as in `(ab)c(de)' -- the second group is #2. */ + regnum_t this_group_regnum; + + compile_stack.avail--; + begalt = bufp->buffer + COMPILE_STACK_TOP.begalt_offset; + fixup_alt_jump + = COMPILE_STACK_TOP.fixup_alt_jump + ? bufp->buffer + COMPILE_STACK_TOP.fixup_alt_jump - 1 + : 0; + laststart = bufp->buffer + COMPILE_STACK_TOP.laststart_offset; + this_group_regnum = COMPILE_STACK_TOP.regnum; + /* If we've reached MAX_REGNUM groups, then this open + won't actually generate any code, so we'll have to + clear pending_exact explicitly. */ + pending_exact = 0; + + /* We're at the end of the group, so now we know how many + groups were inside this one. */ + if (this_group_regnum <= MAX_REGNUM) + { + unsigned char *inner_group_loc + = bufp->buffer + COMPILE_STACK_TOP.inner_group_offset; + + *inner_group_loc = regnum - this_group_regnum; + BUF_PUSH_3 (stop_memory, this_group_regnum, + regnum - this_group_regnum); + } + } + break; + + + case '|': /* `\|'. */ + if (syntax & RE_LIMITED_OPS || syntax & RE_NO_BK_VBAR) + goto normal_backslash; + handle_alt: + if (syntax & RE_LIMITED_OPS) + goto normal_char; + + /* Insert before the previous alternative a jump which + jumps to this alternative if the former fails. */ + GET_BUFFER_SPACE (3); + INSERT_JUMP (on_failure_jump, begalt, b + 6); + pending_exact = 0; + b += 3; + + /* The alternative before this one has a jump after it + which gets executed if it gets matched. Adjust that + jump so it will jump to this alternative's analogous + jump (put in below, which in turn will jump to the next + (if any) alternative's such jump, etc.). The last such + jump jumps to the correct final destination. A picture: + _____ _____ + | | | | + | v | v + a | b | c + + If we are at `b', then fixup_alt_jump right now points to a + three-byte space after `a'. We'll put in the jump, set + fixup_alt_jump to right after `b', and leave behind three + bytes which we'll fill in when we get to after `c'. */ + + if (fixup_alt_jump) + STORE_JUMP (jump_past_alt, fixup_alt_jump, b); + + /* Mark and leave space for a jump after this alternative, + to be filled in later either by next alternative or + when know we're at the end of a series of alternatives. */ + fixup_alt_jump = b; + GET_BUFFER_SPACE (3); + b += 3; + + laststart = 0; + begalt = b; + break; + + + case '{': + /* If \{ is a literal. */ + if (!(syntax & RE_INTERVALS) + /* If we're at `\{' and it's not the open-interval + operator. */ + || ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES)) + || (p - 2 == pattern && p == pend)) + goto normal_backslash; + + handle_interval: + { + /* If got here, then the syntax allows intervals. */ + + /* At least (most) this many matches must be made. */ + int lower_bound = -1, upper_bound = -1; + + beg_interval = p - 1; + + if (p == pend) + { + if (syntax & RE_NO_BK_BRACES) + goto unfetch_interval; + else + return REG_EBRACE; + } + + GET_UNSIGNED_NUMBER (lower_bound); + + if (c == ',') + { + GET_UNSIGNED_NUMBER (upper_bound); + if (upper_bound < 0) upper_bound = RE_DUP_MAX; + } + else + /* Interval such as `{1}' => match exactly once. */ + upper_bound = lower_bound; + + if (lower_bound < 0 || upper_bound > RE_DUP_MAX + || lower_bound > upper_bound) + { + if (syntax & RE_NO_BK_BRACES) + goto unfetch_interval; + else + return REG_BADBR; + } + + if (!(syntax & RE_NO_BK_BRACES)) + { + if (c != '\\') return REG_EBRACE; + + PATFETCH (c); + } + + if (c != '}') + { + if (syntax & RE_NO_BK_BRACES) + goto unfetch_interval; + else + return REG_BADBR; + } + + /* We just parsed a valid interval. */ + + /* If it's invalid to have no preceding re. */ + if (!laststart) + { + if (syntax & RE_CONTEXT_INVALID_OPS) + return REG_BADRPT; + else if (syntax & RE_CONTEXT_INDEP_OPS) + laststart = b; + else + goto unfetch_interval; + } + + /* If the upper bound is zero, don't want to succeed at + all; jump from `laststart' to `b + 3', which will be + the end of the buffer after we insert the jump. */ + if (upper_bound == 0) + { + GET_BUFFER_SPACE (3); + INSERT_JUMP (jump, laststart, b + 3); + b += 3; + } + + /* Otherwise, we have a nontrivial interval. When + we're all done, the pattern will look like: + set_number_at + set_number_at + succeed_n + + jump_n + (The upper bound and `jump_n' are omitted if + `upper_bound' is 1, though.) */ + else + { /* If the upper bound is > 1, we need to insert + more at the end of the loop. */ + unsigned nbytes = 10 + (upper_bound > 1) * 10; + + GET_BUFFER_SPACE (nbytes); + + /* Initialize lower bound of the `succeed_n', even + though it will be set during matching by its + attendant `set_number_at' (inserted next), + because `re_compile_fastmap' needs to know. + Jump to the `jump_n' we might insert below. */ + INSERT_JUMP2 (succeed_n, laststart, + b + 5 + (upper_bound > 1) * 5, + lower_bound); + b += 5; + + /* Code to initialize the lower bound. Insert + before the `succeed_n'. The `5' is the last two + bytes of this `set_number_at', plus 3 bytes of + the following `succeed_n'. */ + insert_op2 (set_number_at, laststart, 5, lower_bound, b); + b += 5; + + if (upper_bound > 1) + { /* More than one repetition is allowed, so + append a backward jump to the `succeed_n' + that starts this interval. + + When we've reached this during matching, + we'll have matched the interval once, so + jump back only `upper_bound - 1' times. */ + STORE_JUMP2 (jump_n, b, laststart + 5, + upper_bound - 1); + b += 5; + + /* The location we want to set is the second + parameter of the `jump_n'; that is `b-2' as + an absolute address. `laststart' will be + the `set_number_at' we're about to insert; + `laststart+3' the number to set, the source + for the relative address. But we are + inserting into the middle of the pattern -- + so everything is getting moved up by 5. + Conclusion: (b - 2) - (laststart + 3) + 5, + i.e., b - laststart. + + We insert this at the beginning of the loop + so that if we fail during matching, we'll + reinitialize the bounds. */ + insert_op2 (set_number_at, laststart, b - laststart, + upper_bound - 1, b); + b += 5; + } + } + pending_exact = 0; + beg_interval = NULL; + } + break; + + unfetch_interval: + /* If an invalid interval, match the characters as literals. */ + assert (beg_interval); + p = beg_interval; + beg_interval = NULL; + + /* normal_char and normal_backslash need `c'. */ + PATFETCH (c); + + if (!(syntax & RE_NO_BK_BRACES)) + { + if (p > pattern && p[-1] == '\\') + goto normal_backslash; + } + goto normal_char; + +#ifdef emacs + /* There is no way to specify the before_dot and after_dot + operators. rms says this is ok. --karl */ + case '=': + BUF_PUSH (at_dot); + break; + + case 's': + laststart = b; + PATFETCH (c); + BUF_PUSH_2 (syntaxspec, syntax_spec_code[c]); + break; + + case 'S': + laststart = b; + PATFETCH (c); + BUF_PUSH_2 (notsyntaxspec, syntax_spec_code[c]); + break; +#endif /* emacs */ + + + case 'w': + laststart = b; + BUF_PUSH (wordchar); + break; + + + case 'W': + laststart = b; + BUF_PUSH (notwordchar); + break; + + + case '<': + BUF_PUSH (wordbeg); + break; + + case '>': + BUF_PUSH (wordend); + break; + + case 'b': + BUF_PUSH (wordbound); + break; + + case 'B': + BUF_PUSH (notwordbound); + break; + + case '`': + BUF_PUSH (begbuf); + break; + + case '\'': + BUF_PUSH (endbuf); + break; + + case '1': case '2': case '3': case '4': case '5': + case '6': case '7': case '8': case '9': + if (syntax & RE_NO_BK_REFS) + goto normal_char; + + c1 = c - '0'; + + if (c1 > regnum) + return REG_ESUBREG; + + /* Can't back reference to a subexpression if inside of it. */ + if (group_in_compile_stack (compile_stack, c1)) + goto normal_char; + + laststart = b; + BUF_PUSH_2 (duplicate, c1); + break; + + + case '+': + case '?': + if (syntax & RE_BK_PLUS_QM) + goto handle_plus; + else + goto normal_backslash; + + default: + normal_backslash: + /* You might think it would be useful for \ to mean + not to translate; but if we don't translate it + it will never match anything. */ + c = TRANSLATE (c); + goto normal_char; + } + break; + + + default: + /* Expects the character in `c'. */ + normal_char: + /* If no exactn currently being built. */ + if (!pending_exact + + /* If last exactn not at current position. */ + || pending_exact + *pending_exact + 1 != b + + /* We have only one byte following the exactn for the count. */ + || *pending_exact == (1 << BYTEWIDTH) - 1 + + /* If followed by a repetition operator. */ + || *p == '*' || *p == '^' + || ((syntax & RE_BK_PLUS_QM) + ? *p == '\\' && (p[1] == '+' || p[1] == '?') + : (*p == '+' || *p == '?')) + || ((syntax & RE_INTERVALS) + && ((syntax & RE_NO_BK_BRACES) + ? *p == '{' + : (p[0] == '\\' && p[1] == '{')))) + { + /* Start building a new exactn. */ + + laststart = b; + + BUF_PUSH_2 (exactn, 0); + pending_exact = b - 1; + } + + BUF_PUSH (c); + (*pending_exact)++; + break; + } /* switch (c) */ + } /* while p != pend */ + + + /* Through the pattern now. */ + + if (fixup_alt_jump) + STORE_JUMP (jump_past_alt, fixup_alt_jump, b); + + if (!COMPILE_STACK_EMPTY) + return REG_EPAREN; + + free (compile_stack.stack); + + /* We have succeeded; set the length of the buffer. */ + bufp->used = b - bufp->buffer; + +#ifdef DEBUG + if (debug) + { + DEBUG_PRINT1 ("\nCompiled pattern: "); + print_compiled_pattern (bufp); + } +#endif /* DEBUG */ + + return REG_NOERROR; +} /* regex_compile */ + +/* Subroutines for `regex_compile'. */ + +/* Store OP at LOC followed by two-byte integer parameter ARG. */ + +static void +store_op1 (op, loc, arg) + re_opcode_t op; + unsigned char *loc; + int arg; +{ + *loc = (unsigned char) op; + STORE_NUMBER (loc + 1, arg); +} + + +/* Like `store_op1', but for two two-byte parameters ARG1 and ARG2. */ + +static void +store_op2 (op, loc, arg1, arg2) + re_opcode_t op; + unsigned char *loc; + int arg1, arg2; +{ + *loc = (unsigned char) op; + STORE_NUMBER (loc + 1, arg1); + STORE_NUMBER (loc + 3, arg2); +} + + +/* Copy the bytes from LOC to END to open up three bytes of space at LOC + for OP followed by two-byte integer parameter ARG. */ + +static void +insert_op1 (op, loc, arg, end) + re_opcode_t op; + unsigned char *loc; + int arg; + unsigned char *end; +{ + register unsigned char *pfrom = end; + register unsigned char *pto = end + 3; + + while (pfrom != loc) + *--pto = *--pfrom; + + store_op1 (op, loc, arg); +} + + +/* Like `insert_op1', but for two two-byte parameters ARG1 and ARG2. */ + +static void +insert_op2 (op, loc, arg1, arg2, end) + re_opcode_t op; + unsigned char *loc; + int arg1, arg2; + unsigned char *end; +{ + register unsigned char *pfrom = end; + register unsigned char *pto = end + 5; + + while (pfrom != loc) + *--pto = *--pfrom; + + store_op2 (op, loc, arg1, arg2); +} + + +/* P points to just after a ^ in PATTERN. Return true if that ^ comes + after an alternative or a begin-subexpression. We assume there is at + least one character before the ^. */ + +static boolean +at_begline_loc_p (pattern, p, syntax) + const char *pattern, *p; + reg_syntax_t syntax; +{ + const char *prev = p - 2; + boolean prev_prev_backslash = prev > pattern && prev[-1] == '\\'; + + return + /* After a subexpression? */ + (*prev == '(' && (syntax & RE_NO_BK_PARENS || prev_prev_backslash)) + /* After an alternative? */ + || (*prev == '|' && (syntax & RE_NO_BK_VBAR || prev_prev_backslash)); +} + + +/* The dual of at_begline_loc_p. This one is for $. We assume there is + at least one character after the $, i.e., `P < PEND'. */ + +static boolean +at_endline_loc_p (p, pend, syntax) + const char *p, *pend; + int syntax; +{ + const char *next = p; + boolean next_backslash = *next == '\\'; + const char *next_next = p + 1 < pend ? p + 1 : NULL; + + return + /* Before a subexpression? */ + (syntax & RE_NO_BK_PARENS ? *next == ')' + : next_backslash && next_next && *next_next == ')') + /* Before an alternative? */ + || (syntax & RE_NO_BK_VBAR ? *next == '|' + : next_backslash && next_next && *next_next == '|'); +} + + +/* Returns true if REGNUM is in one of COMPILE_STACK's elements and + false if it's not. */ + +static boolean +group_in_compile_stack (compile_stack, regnum) + compile_stack_type compile_stack; + regnum_t regnum; +{ + int this_element; + + for (this_element = compile_stack.avail - 1; + this_element >= 0; + this_element--) + if (compile_stack.stack[this_element].regnum == regnum) + return true; + + return false; +} + + +/* Read the ending character of a range (in a bracket expression) from the + uncompiled pattern *P_PTR (which ends at PEND). We assume the + starting character is in `P[-2]'. (`P[-1]' is the character `-'.) + Then we set the translation of all bits between the starting and + ending characters (inclusive) in the compiled pattern B. + + Return an error code. + + We use these short variable names so we can use the same macros as + `regex_compile' itself. */ + +static reg_errcode_t +compile_range (p_ptr, pend, translate, syntax, b) + const char **p_ptr, *pend; + char *translate; + reg_syntax_t syntax; + unsigned char *b; +{ + unsigned this_char; + + const char *p = *p_ptr; + int range_start, range_end; + + if (p == pend) + return REG_ERANGE; + + /* Even though the pattern is a signed `char *', we need to fetch + with unsigned char *'s; if the high bit of the pattern character + is set, the range endpoints will be negative if we fetch using a + signed char *. + + We also want to fetch the endpoints without translating them; the + appropriate translation is done in the bit-setting loop below. */ + range_start = ((unsigned char *) p)[-2]; + range_end = ((unsigned char *) p)[0]; + + /* Have to increment the pointer into the pattern string, so the + caller isn't still at the ending character. */ + (*p_ptr)++; + + /* If the start is after the end, the range is empty. */ + if (range_start > range_end) + return syntax & RE_NO_EMPTY_RANGES ? REG_ERANGE : REG_NOERROR; + + /* Here we see why `this_char' has to be larger than an `unsigned + char' -- the range is inclusive, so if `range_end' == 0xff + (assuming 8-bit characters), we would otherwise go into an infinite + loop, since all characters <= 0xff. */ + for (this_char = range_start; this_char <= range_end; this_char++) + { + SET_LIST_BIT (TRANSLATE (this_char)); + } + + return REG_NOERROR; +} + +/* Failure stack declarations and macros; both re_compile_fastmap and + re_match_2 use a failure stack. These have to be macros because of + REGEX_ALLOCATE. */ + + +/* Number of failure points for which to initially allocate space + when matching. If this number is exceeded, we allocate more + space, so it is not a hard limit. */ +#ifndef INIT_FAILURE_ALLOC +#define INIT_FAILURE_ALLOC 5 +#endif + +/* Roughly the maximum number of failure points on the stack. Would be + exactly that if always used MAX_FAILURE_SPACE each time we failed. + This is a variable only so users of regex can assign to it; we never + change it ourselves. */ +int re_max_failures = 2000; + +typedef const unsigned char *fail_stack_elt_t; + +typedef struct +{ + fail_stack_elt_t *stack; + unsigned size; + unsigned avail; /* Offset of next open position. */ +} fail_stack_type; + +#define FAIL_STACK_EMPTY() (fail_stack.avail == 0) +#define FAIL_STACK_PTR_EMPTY() (fail_stack_ptr->avail == 0) +#define FAIL_STACK_FULL() (fail_stack.avail == fail_stack.size) +#define FAIL_STACK_TOP() (fail_stack.stack[fail_stack.avail]) + + +/* Initialize `fail_stack'. Do `return -2' if the alloc fails. */ + +#define INIT_FAIL_STACK() \ + do { \ + fail_stack.stack = (fail_stack_elt_t *) \ + REGEX_ALLOCATE (INIT_FAILURE_ALLOC * sizeof (fail_stack_elt_t)); \ + \ + if (fail_stack.stack == NULL) \ + return -2; \ + \ + fail_stack.size = INIT_FAILURE_ALLOC; \ + fail_stack.avail = 0; \ + } while (0) + + +/* Double the size of FAIL_STACK, up to approximately `re_max_failures' items. + + Return 1 if succeeds, and 0 if either ran out of memory + allocating space for it or it was already too large. + + REGEX_REALLOCATE requires `destination' be declared. */ + +#define DOUBLE_FAIL_STACK(fail_stack) \ + ((fail_stack).size > re_max_failures * MAX_FAILURE_ITEMS \ + ? 0 \ + : ((fail_stack).stack = (fail_stack_elt_t *) \ + REGEX_REALLOCATE ((fail_stack).stack, \ + (fail_stack).size * sizeof (fail_stack_elt_t), \ + ((fail_stack).size << 1) * sizeof (fail_stack_elt_t)), \ + \ + (fail_stack).stack == NULL \ + ? 0 \ + : ((fail_stack).size <<= 1, \ + 1))) + + +/* Push PATTERN_OP on FAIL_STACK. + + Return 1 if was able to do so and 0 if ran out of memory allocating + space to do so. */ +#define PUSH_PATTERN_OP(pattern_op, fail_stack) \ + ((FAIL_STACK_FULL () \ + && !DOUBLE_FAIL_STACK (fail_stack)) \ + ? 0 \ + : ((fail_stack).stack[(fail_stack).avail++] = pattern_op, \ + 1)) + +/* This pushes an item onto the failure stack. Must be a four-byte + value. Assumes the variable `fail_stack'. Probably should only + be called from within `PUSH_FAILURE_POINT'. */ +#define PUSH_FAILURE_ITEM(item) \ + fail_stack.stack[fail_stack.avail++] = (fail_stack_elt_t) item + +/* The complement operation. Assumes `fail_stack' is nonempty. */ +#define POP_FAILURE_ITEM() fail_stack.stack[--fail_stack.avail] + +/* Used to omit pushing failure point id's when we're not debugging. */ +#ifdef DEBUG +#define DEBUG_PUSH PUSH_FAILURE_ITEM +#define DEBUG_POP(item_addr) *(item_addr) = POP_FAILURE_ITEM () +#else +#define DEBUG_PUSH(item) +#define DEBUG_POP(item_addr) +#endif + + +/* Push the information about the state we will need + if we ever fail back to it. + + Requires variables fail_stack, regstart, regend, reg_info, and + num_regs be declared. DOUBLE_FAIL_STACK requires `destination' be + declared. + + Does `return FAILURE_CODE' if runs out of memory. */ + +#define PUSH_FAILURE_POINT(pattern_place, string_place, failure_code) \ + do { \ + char *destination; \ + /* Must be int, so when we don't save any registers, the arithmetic \ + of 0 + -1 isn't done as unsigned. */ \ + int this_reg; \ + \ + DEBUG_STATEMENT (failure_id++); \ + DEBUG_STATEMENT (nfailure_points_pushed++); \ + DEBUG_PRINT2 ("\nPUSH_FAILURE_POINT #%u:\n", failure_id); \ + DEBUG_PRINT2 (" Before push, next avail: %d\n", (fail_stack).avail);\ + DEBUG_PRINT2 (" size: %d\n", (fail_stack).size);\ + \ + DEBUG_PRINT2 (" slots needed: %d\n", NUM_FAILURE_ITEMS); \ + DEBUG_PRINT2 (" available: %d\n", REMAINING_AVAIL_SLOTS); \ + \ + /* Ensure we have enough space allocated for what we will push. */ \ + while (REMAINING_AVAIL_SLOTS < NUM_FAILURE_ITEMS) \ + { \ + if (!DOUBLE_FAIL_STACK (fail_stack)) \ + return failure_code; \ + \ + DEBUG_PRINT2 ("\n Doubled stack; size now: %d\n", \ + (fail_stack).size); \ + DEBUG_PRINT2 (" slots available: %d\n", REMAINING_AVAIL_SLOTS);\ + } \ + \ + /* Push the info, starting with the registers. */ \ + DEBUG_PRINT1 ("\n"); \ + \ + for (this_reg = lowest_active_reg; this_reg <= highest_active_reg; \ + this_reg++) \ + { \ + DEBUG_PRINT2 (" Pushing reg: %d\n", this_reg); \ + DEBUG_STATEMENT (num_regs_pushed++); \ + \ + DEBUG_PRINT2 (" start: 0x%x\n", regstart[this_reg]); \ + PUSH_FAILURE_ITEM (regstart[this_reg]); \ + \ + DEBUG_PRINT2 (" end: 0x%x\n", regend[this_reg]); \ + PUSH_FAILURE_ITEM (regend[this_reg]); \ + \ + DEBUG_PRINT2 (" info: 0x%x\n ", reg_info[this_reg]); \ + DEBUG_PRINT2 (" match_null=%d", \ + REG_MATCH_NULL_STRING_P (reg_info[this_reg])); \ + DEBUG_PRINT2 (" active=%d", IS_ACTIVE (reg_info[this_reg])); \ + DEBUG_PRINT2 (" matched_something=%d", \ + MATCHED_SOMETHING (reg_info[this_reg])); \ + DEBUG_PRINT2 (" ever_matched=%d", \ + EVER_MATCHED_SOMETHING (reg_info[this_reg])); \ + DEBUG_PRINT1 ("\n"); \ + PUSH_FAILURE_ITEM (reg_info[this_reg].word); \ + } \ + \ + DEBUG_PRINT2 (" Pushing low active reg: %d\n", lowest_active_reg);\ + PUSH_FAILURE_ITEM (lowest_active_reg); \ + \ + DEBUG_PRINT2 (" Pushing high active reg: %d\n", highest_active_reg);\ + PUSH_FAILURE_ITEM (highest_active_reg); \ + \ + DEBUG_PRINT2 (" Pushing pattern 0x%x: ", pattern_place); \ + DEBUG_PRINT_COMPILED_PATTERN (bufp, pattern_place, pend); \ + PUSH_FAILURE_ITEM (pattern_place); \ + \ + DEBUG_PRINT2 (" Pushing string 0x%x: `", string_place); \ + DEBUG_PRINT_DOUBLE_STRING (string_place, string1, size1, string2, \ + size2); \ + DEBUG_PRINT1 ("'\n"); \ + PUSH_FAILURE_ITEM (string_place); \ + \ + DEBUG_PRINT2 (" Pushing failure id: %u\n", failure_id); \ + DEBUG_PUSH (failure_id); \ + } while (0) + +/* This is the number of items that are pushed and popped on the stack + for each register. */ +#define NUM_REG_ITEMS 3 + +/* Individual items aside from the registers. */ +#ifdef DEBUG +#define NUM_NONREG_ITEMS 5 /* Includes failure point id. */ +#else +#define NUM_NONREG_ITEMS 4 +#endif + +/* We push at most this many items on the stack. */ +#define MAX_FAILURE_ITEMS ((num_regs - 1) * NUM_REG_ITEMS + NUM_NONREG_ITEMS) + +/* We actually push this many items. */ +#define NUM_FAILURE_ITEMS \ + ((highest_active_reg - lowest_active_reg + 1) * NUM_REG_ITEMS \ + + NUM_NONREG_ITEMS) + +/* How many items can still be added to the stack without overflowing it. */ +#define REMAINING_AVAIL_SLOTS ((fail_stack).size - (fail_stack).avail) + + +/* Pops what PUSH_FAIL_STACK pushes. + + We restore into the parameters, all of which should be lvalues: + STR -- the saved data position. + PAT -- the saved pattern position. + LOW_REG, HIGH_REG -- the highest and lowest active registers. + REGSTART, REGEND -- arrays of string positions. + REG_INFO -- array of information about each subexpression. + + Also assumes the variables `fail_stack' and (if debugging), `bufp', + `pend', `string1', `size1', `string2', and `size2'. */ + +#define POP_FAILURE_POINT(str, pat, low_reg, high_reg, regstart, regend, reg_info)\ +{ \ + DEBUG_STATEMENT (fail_stack_elt_t failure_id;) \ + int this_reg; \ + const unsigned char *string_temp; \ + \ + assert (!FAIL_STACK_EMPTY ()); \ + \ + /* Remove failure points and point to how many regs pushed. */ \ + DEBUG_PRINT1 ("POP_FAILURE_POINT:\n"); \ + DEBUG_PRINT2 (" Before pop, next avail: %d\n", fail_stack.avail); \ + DEBUG_PRINT2 (" size: %d\n", fail_stack.size); \ + \ + assert (fail_stack.avail >= NUM_NONREG_ITEMS); \ + \ + DEBUG_POP (&failure_id); \ + DEBUG_PRINT2 (" Popping failure id: %u\n", failure_id); \ + \ + /* If the saved string location is NULL, it came from an \ + on_failure_keep_string_jump opcode, and we want to throw away the \ + saved NULL, thus retaining our current position in the string. */ \ + string_temp = POP_FAILURE_ITEM (); \ + if (string_temp != NULL) \ + str = (const char *) string_temp; \ + \ + DEBUG_PRINT2 (" Popping string 0x%x: `", str); \ + DEBUG_PRINT_DOUBLE_STRING (str, string1, size1, string2, size2); \ + DEBUG_PRINT1 ("'\n"); \ + \ + pat = (unsigned char *) POP_FAILURE_ITEM (); \ + DEBUG_PRINT2 (" Popping pattern 0x%x: ", pat); \ + DEBUG_PRINT_COMPILED_PATTERN (bufp, pat, pend); \ + \ + /* Restore register info. */ \ + high_reg = (unsigned) POP_FAILURE_ITEM (); \ + DEBUG_PRINT2 (" Popping high active reg: %d\n", high_reg); \ + \ + low_reg = (unsigned) POP_FAILURE_ITEM (); \ + DEBUG_PRINT2 (" Popping low active reg: %d\n", low_reg); \ + \ + for (this_reg = high_reg; this_reg >= low_reg; this_reg--) \ + { \ + DEBUG_PRINT2 (" Popping reg: %d\n", this_reg); \ + \ + reg_info[this_reg].word = POP_FAILURE_ITEM (); \ + DEBUG_PRINT2 (" info: 0x%x\n", reg_info[this_reg]); \ + \ + regend[this_reg] = (const char *) POP_FAILURE_ITEM (); \ + DEBUG_PRINT2 (" end: 0x%x\n", regend[this_reg]); \ + \ + regstart[this_reg] = (const char *) POP_FAILURE_ITEM (); \ + DEBUG_PRINT2 (" start: 0x%x\n", regstart[this_reg]); \ + } \ + \ + DEBUG_STATEMENT (nfailure_points_popped++); \ +} /* POP_FAILURE_POINT */ + +/* re_compile_fastmap computes a ``fastmap'' for the compiled pattern in + BUFP. A fastmap records which of the (1 << BYTEWIDTH) possible + characters can start a string that matches the pattern. This fastmap + is used by re_search to skip quickly over impossible starting points. + + The caller must supply the address of a (1 << BYTEWIDTH)-byte data + area as BUFP->fastmap. + + We set the `fastmap', `fastmap_accurate', and `can_be_null' fields in + the pattern buffer. + + Returns 0 if we succeed, -2 if an internal error. */ + +int +re_compile_fastmap (bufp) + struct re_pattern_buffer *bufp; +{ + int j, k; + fail_stack_type fail_stack; +#ifndef REGEX_MALLOC + char *destination; +#endif + /* We don't push any register information onto the failure stack. */ + unsigned num_regs = 0; + + register char *fastmap = bufp->fastmap; + unsigned char *pattern = bufp->buffer; + unsigned long size = bufp->used; + const unsigned char *p = pattern; + register unsigned char *pend = pattern + size; + + /* Assume that each path through the pattern can be null until + proven otherwise. We set this false at the bottom of switch + statement, to which we get only if a particular path doesn't + match the empty string. */ + boolean path_can_be_null = true; + + /* We aren't doing a `succeed_n' to begin with. */ + boolean succeed_n_p = false; + + assert (fastmap != NULL && p != NULL); + + INIT_FAIL_STACK (); + bzero (fastmap, 1 << BYTEWIDTH); /* Assume nothing's valid. */ + bufp->fastmap_accurate = 1; /* It will be when we're done. */ + bufp->can_be_null = 0; + + while (p != pend || !FAIL_STACK_EMPTY ()) + { + if (p == pend) + { + bufp->can_be_null |= path_can_be_null; + + /* Reset for next path. */ + path_can_be_null = true; + + p = fail_stack.stack[--fail_stack.avail]; + } + + /* We should never be about to go beyond the end of the pattern. */ + assert (p < pend); + +#ifdef SWITCH_ENUM_BUG + switch ((int) ((re_opcode_t) *p++)) +#else + switch ((re_opcode_t) *p++) +#endif + { + + /* I guess the idea here is to simply not bother with a fastmap + if a backreference is used, since it's too hard to figure out + the fastmap for the corresponding group. Setting + `can_be_null' stops `re_search_2' from using the fastmap, so + that is all we do. */ + case duplicate: + bufp->can_be_null = 1; + return 0; + + + /* Following are the cases which match a character. These end + with `break'. */ + + case exactn: + fastmap[p[1]] = 1; + break; + + + case charset: + for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--) + if (p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))) + fastmap[j] = 1; + break; + + + case charset_not: + /* Chars beyond end of map must be allowed. */ + for (j = *p * BYTEWIDTH; j < (1 << BYTEWIDTH); j++) + fastmap[j] = 1; + + for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--) + if (!(p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH)))) + fastmap[j] = 1; + break; + + + case wordchar: + for (j = 0; j < (1 << BYTEWIDTH); j++) + if (SYNTAX (j) == Sword) + fastmap[j] = 1; + break; + + + case notwordchar: + for (j = 0; j < (1 << BYTEWIDTH); j++) + if (SYNTAX (j) != Sword) + fastmap[j] = 1; + break; + + + case anychar: + /* `.' matches anything ... */ + for (j = 0; j < (1 << BYTEWIDTH); j++) + fastmap[j] = 1; + + /* ... except perhaps newline. */ + if (!(bufp->syntax & RE_DOT_NEWLINE)) + fastmap['\n'] = 0; + + /* Return if we have already set `can_be_null'; if we have, + then the fastmap is irrelevant. Something's wrong here. */ + else if (bufp->can_be_null) + return 0; + + /* Otherwise, have to check alternative paths. */ + break; + + +#ifdef emacs + case syntaxspec: + k = *p++; + for (j = 0; j < (1 << BYTEWIDTH); j++) + if (SYNTAX (j) == (enum syntaxcode) k) + fastmap[j] = 1; + break; + + + case notsyntaxspec: + k = *p++; + for (j = 0; j < (1 << BYTEWIDTH); j++) + if (SYNTAX (j) != (enum syntaxcode) k) + fastmap[j] = 1; + break; + + + /* All cases after this match the empty string. These end with + `continue'. */ + + + case before_dot: + case at_dot: + case after_dot: + continue; +#endif /* not emacs */ + + + case no_op: + case begline: + case endline: + case begbuf: + case endbuf: + case wordbound: + case notwordbound: + case wordbeg: + case wordend: + case push_dummy_failure: + continue; + + + case jump_n: + case pop_failure_jump: + case maybe_pop_jump: + case jump: + case jump_past_alt: + case dummy_failure_jump: + EXTRACT_NUMBER_AND_INCR (j, p); + p += j; + if (j > 0) + continue; + + /* Jump backward implies we just went through the body of a + loop and matched nothing. Opcode jumped to should be + `on_failure_jump' or `succeed_n'. Just treat it like an + ordinary jump. For a * loop, it has pushed its failure + point already; if so, discard that as redundant. */ + if ((re_opcode_t) *p != on_failure_jump + && (re_opcode_t) *p != succeed_n) + continue; + + p++; + EXTRACT_NUMBER_AND_INCR (j, p); + p += j; + + /* If what's on the stack is where we are now, pop it. */ + if (!FAIL_STACK_EMPTY () + && fail_stack.stack[fail_stack.avail - 1] == p) + fail_stack.avail--; + + continue; + + + case on_failure_jump: + case on_failure_keep_string_jump: + handle_on_failure_jump: + EXTRACT_NUMBER_AND_INCR (j, p); + + /* For some patterns, e.g., `(a?)?', `p+j' here points to the + end of the pattern. We don't want to push such a point, + since when we restore it above, entering the switch will + increment `p' past the end of the pattern. We don't need + to push such a point since we obviously won't find any more + fastmap entries beyond `pend'. Such a pattern can match + the null string, though. */ + if (p + j < pend) + { + if (!PUSH_PATTERN_OP (p + j, fail_stack)) + return -2; + } + else + bufp->can_be_null = 1; + + if (succeed_n_p) + { + EXTRACT_NUMBER_AND_INCR (k, p); /* Skip the n. */ + succeed_n_p = false; + } + + continue; + + + case succeed_n: + /* Get to the number of times to succeed. */ + p += 2; + + /* Increment p past the n for when k != 0. */ + EXTRACT_NUMBER_AND_INCR (k, p); + if (k == 0) + { + p -= 4; + succeed_n_p = true; /* Spaghetti code alert. */ + goto handle_on_failure_jump; + } + continue; + + + case set_number_at: + p += 4; + continue; + + + case start_memory: + case stop_memory: + p += 2; + continue; + + + default: + abort (); /* We have listed all the cases. */ + } /* switch *p++ */ + + /* Getting here means we have found the possible starting + characters for one path of the pattern -- and that the empty + string does not match. We need not follow this path further. + Instead, look at the next alternative (remembered on the + stack), or quit if no more. The test at the top of the loop + does these things. */ + path_can_be_null = false; + p = pend; + } /* while p */ + + /* Set `can_be_null' for the last path (also the first path, if the + pattern is empty). */ + bufp->can_be_null |= path_can_be_null; + return 0; +} /* re_compile_fastmap */ + +/* Set REGS to hold NUM_REGS registers, storing them in STARTS and + ENDS. Subsequent matches using PATTERN_BUFFER and REGS will use + this memory for recording register information. STARTS and ENDS + must be allocated using the malloc library routine, and must each + be at least NUM_REGS * sizeof (regoff_t) bytes long. + + If NUM_REGS == 0, then subsequent matches should allocate their own + register data. + + Unless this function is called, the first search or match using + PATTERN_BUFFER will allocate its own register data, without + freeing the old data. */ + +void +re_set_registers (bufp, regs, num_regs, starts, ends) + struct re_pattern_buffer *bufp; + struct re_registers *regs; + unsigned num_regs; + regoff_t *starts, *ends; +{ + if (num_regs) + { + bufp->regs_allocated = REGS_REALLOCATE; + regs->num_regs = num_regs; + regs->start = starts; + regs->end = ends; + } + else + { + bufp->regs_allocated = REGS_UNALLOCATED; + regs->num_regs = 0; + regs->start = regs->end = (regoff_t) 0; + } +} + +/* Searching routines. */ + +/* Like re_search_2, below, but only one string is specified, and + doesn't let you say where to stop matching. */ + +int +re_search (bufp, string, size, startpos, range, regs) + struct re_pattern_buffer *bufp; + const char *string; + int size, startpos, range; + struct re_registers *regs; +{ + return re_search_2 (bufp, NULL, 0, string, size, startpos, range, + regs, size); +} + + +/* Using the compiled pattern in BUFP->buffer, first tries to match the + virtual concatenation of STRING1 and STRING2, starting first at index + STARTPOS, then at STARTPOS + 1, and so on. + + STRING1 and STRING2 have length SIZE1 and SIZE2, respectively. + + RANGE is how far to scan while trying to match. RANGE = 0 means try + only at STARTPOS; in general, the last start tried is STARTPOS + + RANGE. + + In REGS, return the indices of the virtual concatenation of STRING1 + and STRING2 that matched the entire BUFP->buffer and its contained + subexpressions. + + Do not consider matching one past the index STOP in the virtual + concatenation of STRING1 and STRING2. + + We return either the position in the strings at which the match was + found, -1 if no match, or -2 if error (such as failure + stack overflow). */ + +int +re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop) + struct re_pattern_buffer *bufp; + const char *string1, *string2; + int size1, size2; + int startpos; + int range; + struct re_registers *regs; + int stop; +{ + int val; + register char *fastmap = bufp->fastmap; + register char *translate = bufp->translate; + int total_size = size1 + size2; + int endpos = startpos + range; + + /* Check for out-of-range STARTPOS. */ + if (startpos < 0 || startpos > total_size) + return -1; + + /* Fix up RANGE if it might eventually take us outside + the virtual concatenation of STRING1 and STRING2. */ + if (endpos < -1) + range = -1 - startpos; + else if (endpos > total_size) + range = total_size - startpos; + + /* If the search isn't to be a backwards one, don't waste time in a + search for a pattern that must be anchored. */ + if (bufp->used > 0 && (re_opcode_t) bufp->buffer[0] == begbuf && range > 0) + { + if (startpos > 0) + return -1; + else + range = 1; + } + + /* Update the fastmap now if not correct already. */ + if (fastmap && !bufp->fastmap_accurate) + if (re_compile_fastmap (bufp) == -2) + return -2; + + /* Loop through the string, looking for a place to start matching. */ + for (;;) + { + /* If a fastmap is supplied, skip quickly over characters that + cannot be the start of a match. If the pattern can match the + null string, however, we don't need to skip characters; we want + the first null string. */ + if (fastmap && startpos < total_size && !bufp->can_be_null) + { + if (range > 0) /* Searching forwards. */ + { + register const char *d; + register int lim = 0; + int irange = range; + + if (startpos < size1 && startpos + range >= size1) + lim = range - (size1 - startpos); + + d = (startpos >= size1 ? string2 - size1 : string1) + startpos; + + /* Written out as an if-else to avoid testing `translate' + inside the loop. */ + if (translate) + while (range > lim + && !fastmap[(unsigned char) + translate[(unsigned char) *d++]]) + range--; + else + while (range > lim && !fastmap[(unsigned char) *d++]) + range--; + + startpos += irange - range; + } + else /* Searching backwards. */ + { + register char c = (size1 == 0 || startpos >= size1 + ? string2[startpos - size1] + : string1[startpos]); + + if (!fastmap[(unsigned char) TRANSLATE (c)]) + goto advance; + } + } + + /* If can't match the null string, and that's all we have left, fail. */ + if (range >= 0 && startpos == total_size && fastmap + && !bufp->can_be_null) + return -1; + + val = re_match_2 (bufp, string1, size1, string2, size2, + startpos, regs, stop); + if (val >= 0) + return startpos; + + if (val == -2) + return -2; + + advance: + if (!range) + break; + else if (range > 0) + { + range--; + startpos++; + } + else + { + range++; + startpos--; + } + } + return -1; +} /* re_search_2 */ + +/* Declarations and macros for re_match_2. */ + +static int bcmp_translate (); +static boolean alt_match_null_string_p (), + common_op_match_null_string_p (), + group_match_null_string_p (); + +/* Structure for per-register (a.k.a. per-group) information. + This must not be longer than one word, because we push this value + onto the failure stack. Other register information, such as the + starting and ending positions (which are addresses), and the list of + inner groups (which is a bits list) are maintained in separate + variables. + + We are making a (strictly speaking) nonportable assumption here: that + the compiler will pack our bit fields into something that fits into + the type of `word', i.e., is something that fits into one item on the + failure stack. */ +typedef union +{ + fail_stack_elt_t word; + struct + { + /* This field is one if this group can match the empty string, + zero if not. If not yet determined, `MATCH_NULL_UNSET_VALUE'. */ +#define MATCH_NULL_UNSET_VALUE 3 + unsigned match_null_string_p : 2; + unsigned is_active : 1; + unsigned matched_something : 1; + unsigned ever_matched_something : 1; + } bits; +} register_info_type; + +#define REG_MATCH_NULL_STRING_P(R) ((R).bits.match_null_string_p) +#define IS_ACTIVE(R) ((R).bits.is_active) +#define MATCHED_SOMETHING(R) ((R).bits.matched_something) +#define EVER_MATCHED_SOMETHING(R) ((R).bits.ever_matched_something) + + +/* Call this when have matched a real character; it sets `matched' flags + for the subexpressions which we are currently inside. Also records + that those subexprs have matched. */ +#define SET_REGS_MATCHED() \ + do \ + { \ + unsigned r; \ + for (r = lowest_active_reg; r <= highest_active_reg; r++) \ + { \ + MATCHED_SOMETHING (reg_info[r]) \ + = EVER_MATCHED_SOMETHING (reg_info[r]) \ + = 1; \ + } \ + } \ + while (0) + + +/* This converts PTR, a pointer into one of the search strings `string1' + and `string2' into an offset from the beginning of that string. */ +#define POINTER_TO_OFFSET(ptr) \ + (FIRST_STRING_P (ptr) ? (ptr) - string1 : (ptr) - string2 + size1) + +/* Registers are set to a sentinel when they haven't yet matched. */ +#define REG_UNSET_VALUE ((char *) -1) +#define REG_UNSET(e) ((e) == REG_UNSET_VALUE) + + +/* Macros for dealing with the split strings in re_match_2. */ + +#define MATCHING_IN_FIRST_STRING (dend == end_match_1) + +/* Call before fetching a character with *d. This switches over to + string2 if necessary. */ +#define PREFETCH() \ + while (d == dend) \ + { \ + /* End of string2 => fail. */ \ + if (dend == end_match_2) \ + goto fail; \ + /* End of string1 => advance to string2. */ \ + d = string2; \ + dend = end_match_2; \ + } + + +/* Test if at very beginning or at very end of the virtual concatenation + of `string1' and `string2'. If only one string, it's `string2'. */ +#define AT_STRINGS_BEG(d) ((d) == (size1 ? string1 : string2) || !size2) +#define AT_STRINGS_END(d) ((d) == end2) + + +/* Test if D points to a character which is word-constituent. We have + two special cases to check for: if past the end of string1, look at + the first character in string2; and if before the beginning of + string2, look at the last character in string1. */ +#define WORDCHAR_P(d) \ + (SYNTAX ((d) == end1 ? *string2 \ + : (d) == string2 - 1 ? *(end1 - 1) : *(d)) \ + == Sword) + +/* Test if the character before D and the one at D differ with respect + to being word-constituent. */ +#define AT_WORD_BOUNDARY(d) \ + (AT_STRINGS_BEG (d) || AT_STRINGS_END (d) \ + || WORDCHAR_P (d - 1) != WORDCHAR_P (d)) + + +/* Free everything we malloc. */ +#ifdef REGEX_MALLOC +#define FREE_VAR(var) if (var) free (var); var = NULL +#define FREE_VARIABLES() \ + do { \ + FREE_VAR (fail_stack.stack); \ + FREE_VAR (regstart); \ + FREE_VAR (regend); \ + FREE_VAR (old_regstart); \ + FREE_VAR (old_regend); \ + FREE_VAR (best_regstart); \ + FREE_VAR (best_regend); \ + FREE_VAR (reg_info); \ + FREE_VAR (reg_dummy); \ + FREE_VAR (reg_info_dummy); \ + } while (0) +#else /* not REGEX_MALLOC */ +/* Some MIPS systems (at least) want this to free alloca'd storage. */ +#define FREE_VARIABLES() alloca (0) +#endif /* not REGEX_MALLOC */ + + +/* These values must meet several constraints. They must not be valid + register values; since we have a limit of 255 registers (because + we use only one byte in the pattern for the register number), we can + use numbers larger than 255. They must differ by 1, because of + NUM_FAILURE_ITEMS above. And the value for the lowest register must + be larger than the value for the highest register, so we do not try + to actually save any registers when none are active. */ +#define NO_HIGHEST_ACTIVE_REG (1 << BYTEWIDTH) +#define NO_LOWEST_ACTIVE_REG (NO_HIGHEST_ACTIVE_REG + 1) + +/* Matching routines. */ + +#ifndef emacs /* Emacs never uses this. */ +/* re_match is like re_match_2 except it takes only a single string. */ + +int +re_match (bufp, string, size, pos, regs) + struct re_pattern_buffer *bufp; + const char *string; + int size, pos; + struct re_registers *regs; + { + return re_match_2 (bufp, NULL, 0, string, size, pos, regs, size); +} +#endif /* not emacs */ + + +/* re_match_2 matches the compiled pattern in BUFP against the + the (virtual) concatenation of STRING1 and STRING2 (of length SIZE1 + and SIZE2, respectively). We start matching at POS, and stop + matching at STOP. + + If REGS is non-null and the `no_sub' field of BUFP is nonzero, we + store offsets for the substring each group matched in REGS. See the + documentation for exactly how many groups we fill. + + We return -1 if no match, -2 if an internal error (such as the + failure stack overflowing). Otherwise, we return the length of the + matched substring. */ + +int +re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) + struct re_pattern_buffer *bufp; + const char *string1, *string2; + int size1, size2; + int pos; + struct re_registers *regs; + int stop; +{ + /* General temporaries. */ + int mcnt; + unsigned char *p1; + + /* Just past the end of the corresponding string. */ + const char *end1, *end2; + + /* Pointers into string1 and string2, just past the last characters in + each to consider matching. */ + const char *end_match_1, *end_match_2; + + /* Where we are in the data, and the end of the current string. */ + const char *d, *dend; + + /* Where we are in the pattern, and the end of the pattern. */ + unsigned char *p = bufp->buffer; + register unsigned char *pend = p + bufp->used; + + /* We use this to map every character in the string. */ + char *translate = bufp->translate; + + /* Failure point stack. Each place that can handle a failure further + down the line pushes a failure point on this stack. It consists of + restart, regend, and reg_info for all registers corresponding to + the subexpressions we're currently inside, plus the number of such + registers, and, finally, two char *'s. The first char * is where + to resume scanning the pattern; the second one is where to resume + scanning the strings. If the latter is zero, the failure point is + a ``dummy''; if a failure happens and the failure point is a dummy, + it gets discarded and the next next one is tried. */ + fail_stack_type fail_stack; +#ifdef DEBUG + static unsigned failure_id = 0; + unsigned nfailure_points_pushed = 0, nfailure_points_popped = 0; +#endif + + /* We fill all the registers internally, independent of what we + return, for use in backreferences. The number here includes + an element for register zero. */ + unsigned num_regs = bufp->re_nsub + 1; + + /* The currently active registers. */ + unsigned lowest_active_reg = NO_LOWEST_ACTIVE_REG; + unsigned highest_active_reg = NO_HIGHEST_ACTIVE_REG; + + /* Information on the contents of registers. These are pointers into + the input strings; they record just what was matched (on this + attempt) by a subexpression part of the pattern, that is, the + regnum-th regstart pointer points to where in the pattern we began + matching and the regnum-th regend points to right after where we + stopped matching the regnum-th subexpression. (The zeroth register + keeps track of what the whole pattern matches.) */ + const char **regstart, **regend; + + /* If a group that's operated upon by a repetition operator fails to + match anything, then the register for its start will need to be + restored because it will have been set to wherever in the string we + are when we last see its open-group operator. Similarly for a + register's end. */ + const char **old_regstart, **old_regend; + + /* The is_active field of reg_info helps us keep track of which (possibly + nested) subexpressions we are currently in. The matched_something + field of reg_info[reg_num] helps us tell whether or not we have + matched any of the pattern so far this time through the reg_num-th + subexpression. These two fields get reset each time through any + loop their register is in. */ + register_info_type *reg_info; + + /* The following record the register info as found in the above + variables when we find a match better than any we've seen before. + This happens as we backtrack through the failure points, which in + turn happens only if we have not yet matched the entire string. */ + unsigned best_regs_set = false; + const char **best_regstart, **best_regend; + + /* Logically, this is `best_regend[0]'. But we don't want to have to + allocate space for that if we're not allocating space for anything + else (see below). Also, we never need info about register 0 for + any of the other register vectors, and it seems rather a kludge to + treat `best_regend' differently than the rest. So we keep track of + the end of the best match so far in a separate variable. We + initialize this to NULL so that when we backtrack the first time + and need to test it, it's not garbage. */ + const char *match_end = NULL; + + /* Used when we pop values we don't care about. */ + const char **reg_dummy; + register_info_type *reg_info_dummy; + +#ifdef DEBUG + /* Counts the total number of registers pushed. */ + unsigned num_regs_pushed = 0; +#endif + + DEBUG_PRINT1 ("\n\nEntering re_match_2.\n"); + + INIT_FAIL_STACK (); + + /* Do not bother to initialize all the register variables if there are + no groups in the pattern, as it takes a fair amount of time. If + there are groups, we include space for register 0 (the whole + pattern), even though we never use it, since it simplifies the + array indexing. We should fix this. */ + if (bufp->re_nsub) + { + regstart = REGEX_TALLOC (num_regs, const char *); + regend = REGEX_TALLOC (num_regs, const char *); + old_regstart = REGEX_TALLOC (num_regs, const char *); + old_regend = REGEX_TALLOC (num_regs, const char *); + best_regstart = REGEX_TALLOC (num_regs, const char *); + best_regend = REGEX_TALLOC (num_regs, const char *); + reg_info = REGEX_TALLOC (num_regs, register_info_type); + reg_dummy = REGEX_TALLOC (num_regs, const char *); + reg_info_dummy = REGEX_TALLOC (num_regs, register_info_type); + + if (!(regstart && regend && old_regstart && old_regend && reg_info + && best_regstart && best_regend && reg_dummy && reg_info_dummy)) + { + FREE_VARIABLES (); + return -2; + } + } +#ifdef REGEX_MALLOC + else + { + /* We must initialize all our variables to NULL, so that + `FREE_VARIABLES' doesn't try to free them. */ + regstart = regend = old_regstart = old_regend = best_regstart + = best_regend = reg_dummy = NULL; + reg_info = reg_info_dummy = (register_info_type *) NULL; + } +#endif /* REGEX_MALLOC */ + + /* The starting position is bogus. */ + if (pos < 0 || pos > size1 + size2) + { + FREE_VARIABLES (); + return -1; + } + + /* Initialize subexpression text positions to -1 to mark ones that no + start_memory/stop_memory has been seen for. Also initialize the + register information struct. */ + for (mcnt = 1; mcnt < num_regs; mcnt++) + { + regstart[mcnt] = regend[mcnt] + = old_regstart[mcnt] = old_regend[mcnt] = REG_UNSET_VALUE; + + REG_MATCH_NULL_STRING_P (reg_info[mcnt]) = MATCH_NULL_UNSET_VALUE; + IS_ACTIVE (reg_info[mcnt]) = 0; + MATCHED_SOMETHING (reg_info[mcnt]) = 0; + EVER_MATCHED_SOMETHING (reg_info[mcnt]) = 0; + } + + /* We move `string1' into `string2' if the latter's empty -- but not if + `string1' is null. */ + if (size2 == 0 && string1 != NULL) + { + string2 = string1; + size2 = size1; + string1 = 0; + size1 = 0; + } + end1 = string1 + size1; + end2 = string2 + size2; + + /* Compute where to stop matching, within the two strings. */ + if (stop <= size1) + { + end_match_1 = string1 + stop; + end_match_2 = string2; + } + else + { + end_match_1 = end1; + end_match_2 = string2 + stop - size1; + } + + /* `p' scans through the pattern as `d' scans through the data. + `dend' is the end of the input string that `d' points within. `d' + is advanced into the following input string whenever necessary, but + this happens before fetching; therefore, at the beginning of the + loop, `d' can be pointing at the end of a string, but it cannot + equal `string2'. */ + if (size1 > 0 && pos <= size1) + { + d = string1 + pos; + dend = end_match_1; + } + else + { + d = string2 + pos - size1; + dend = end_match_2; + } + + DEBUG_PRINT1 ("The compiled pattern is: "); + DEBUG_PRINT_COMPILED_PATTERN (bufp, p, pend); + DEBUG_PRINT1 ("The string to match is: `"); + DEBUG_PRINT_DOUBLE_STRING (d, string1, size1, string2, size2); + DEBUG_PRINT1 ("'\n"); + + /* This loops over pattern commands. It exits by returning from the + function if the match is complete, or it drops through if the match + fails at this starting point in the input data. */ + for (;;) + { + DEBUG_PRINT2 ("\n0x%x: ", p); + + if (p == pend) + { /* End of pattern means we might have succeeded. */ + DEBUG_PRINT1 ("end of pattern ... "); + + /* If we haven't matched the entire string, and we want the + longest match, try backtracking. */ + if (d != end_match_2) + { + DEBUG_PRINT1 ("backtracking.\n"); + + if (!FAIL_STACK_EMPTY ()) + { /* More failure points to try. */ + boolean same_str_p = (FIRST_STRING_P (match_end) + == MATCHING_IN_FIRST_STRING); + + /* If exceeds best match so far, save it. */ + if (!best_regs_set + || (same_str_p && d > match_end) + || (!same_str_p && !MATCHING_IN_FIRST_STRING)) + { + best_regs_set = true; + match_end = d; + + DEBUG_PRINT1 ("\nSAVING match as best so far.\n"); + + for (mcnt = 1; mcnt < num_regs; mcnt++) + { + best_regstart[mcnt] = regstart[mcnt]; + best_regend[mcnt] = regend[mcnt]; + } + } + goto fail; + } + + /* If no failure points, don't restore garbage. */ + else if (best_regs_set) + { + restore_best_regs: + /* Restore best match. It may happen that `dend == + end_match_1' while the restored d is in string2. + For example, the pattern `x.*y.*z' against the + strings `x-' and `y-z-', if the two strings are + not consecutive in memory. */ + DEBUG_PRINT1 ("Restoring best registers.\n"); + + d = match_end; + dend = ((d >= string1 && d <= end1) + ? end_match_1 : end_match_2); + + for (mcnt = 1; mcnt < num_regs; mcnt++) + { + regstart[mcnt] = best_regstart[mcnt]; + regend[mcnt] = best_regend[mcnt]; + } + } + } /* d != end_match_2 */ + + DEBUG_PRINT1 ("Accepting match.\n"); + + /* If caller wants register contents data back, do it. */ + if (regs && !bufp->no_sub) + { + /* Have the register data arrays been allocated? */ + if (bufp->regs_allocated == REGS_UNALLOCATED) + { /* No. So allocate them with malloc. We need one + extra element beyond `num_regs' for the `-1' marker + GNU code uses. */ + regs->num_regs = MAX (RE_NREGS, num_regs + 1); + regs->start = TALLOC (regs->num_regs, regoff_t); + regs->end = TALLOC (regs->num_regs, regoff_t); + if (regs->start == NULL || regs->end == NULL) + return -2; + bufp->regs_allocated = REGS_REALLOCATE; + } + else if (bufp->regs_allocated == REGS_REALLOCATE) + { /* Yes. If we need more elements than were already + allocated, reallocate them. If we need fewer, just + leave it alone. */ + if (regs->num_regs < num_regs + 1) + { + regs->num_regs = num_regs + 1; + RETALLOC (regs->start, regs->num_regs, regoff_t); + RETALLOC (regs->end, regs->num_regs, regoff_t); + if (regs->start == NULL || regs->end == NULL) + return -2; + } + } + else + assert (bufp->regs_allocated == REGS_FIXED); + + /* Convert the pointer data in `regstart' and `regend' to + indices. Register zero has to be set differently, + since we haven't kept track of any info for it. */ + if (regs->num_regs > 0) + { + regs->start[0] = pos; + regs->end[0] = (MATCHING_IN_FIRST_STRING ? d - string1 + : d - string2 + size1); + } + + /* Go through the first `min (num_regs, regs->num_regs)' + registers, since that is all we initialized. */ + for (mcnt = 1; mcnt < MIN (num_regs, regs->num_regs); mcnt++) + { + if (REG_UNSET (regstart[mcnt]) || REG_UNSET (regend[mcnt])) + regs->start[mcnt] = regs->end[mcnt] = -1; + else + { + regs->start[mcnt] = POINTER_TO_OFFSET (regstart[mcnt]); + regs->end[mcnt] = POINTER_TO_OFFSET (regend[mcnt]); + } + } + + /* If the regs structure we return has more elements than + were in the pattern, set the extra elements to -1. If + we (re)allocated the registers, this is the case, + because we always allocate enough to have at least one + -1 at the end. */ + for (mcnt = num_regs; mcnt < regs->num_regs; mcnt++) + regs->start[mcnt] = regs->end[mcnt] = -1; + } /* regs && !bufp->no_sub */ + + FREE_VARIABLES (); + DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n", + nfailure_points_pushed, nfailure_points_popped, + nfailure_points_pushed - nfailure_points_popped); + DEBUG_PRINT2 ("%u registers pushed.\n", num_regs_pushed); + + mcnt = d - pos - (MATCHING_IN_FIRST_STRING + ? string1 + : string2 - size1); + + DEBUG_PRINT2 ("Returning %d from re_match_2.\n", mcnt); + + return mcnt; + } + + /* Otherwise match next pattern command. */ +#ifdef SWITCH_ENUM_BUG + switch ((int) ((re_opcode_t) *p++)) +#else + switch ((re_opcode_t) *p++) +#endif + { + /* Ignore these. Used to ignore the n of succeed_n's which + currently have n == 0. */ + case no_op: + DEBUG_PRINT1 ("EXECUTING no_op.\n"); + break; + + + /* Match the next n pattern characters exactly. The following + byte in the pattern defines n, and the n bytes after that + are the characters to match. */ + case exactn: + mcnt = *p++; + DEBUG_PRINT2 ("EXECUTING exactn %d.\n", mcnt); + + /* This is written out as an if-else so we don't waste time + testing `translate' inside the loop. */ + if (translate) + { + do + { + PREFETCH (); + if (translate[(unsigned char) *d++] != (char) *p++) + goto fail; + } + while (--mcnt); + } + else + { + do + { + PREFETCH (); + if (*d++ != (char) *p++) goto fail; + } + while (--mcnt); + } + SET_REGS_MATCHED (); + break; + + + /* Match any character except possibly a newline or a null. */ + case anychar: + DEBUG_PRINT1 ("EXECUTING anychar.\n"); + + PREFETCH (); + + if ((!(bufp->syntax & RE_DOT_NEWLINE) && TRANSLATE (*d) == '\n') + || (bufp->syntax & RE_DOT_NOT_NULL && TRANSLATE (*d) == '\000')) + goto fail; + + SET_REGS_MATCHED (); + DEBUG_PRINT2 (" Matched `%d'.\n", *d); + d++; + break; + + + case charset: + case charset_not: + { + register unsigned char c; + boolean not = (re_opcode_t) *(p - 1) == charset_not; + + DEBUG_PRINT2 ("EXECUTING charset%s.\n", not ? "_not" : ""); + + PREFETCH (); + c = TRANSLATE (*d); /* The character to match. */ + + /* Cast to `unsigned' instead of `unsigned char' in case the + bit list is a full 32 bytes long. */ + if (c < (unsigned) (*p * BYTEWIDTH) + && p[1 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH))) + not = !not; + + p += 1 + *p; + + if (!not) goto fail; + + SET_REGS_MATCHED (); + d++; + break; + } + + + /* The beginning of a group is represented by start_memory. + The arguments are the register number in the next byte, and the + number of groups inner to this one in the next. The text + matched within the group is recorded (in the internal + registers data structure) under the register number. */ + case start_memory: + DEBUG_PRINT3 ("EXECUTING start_memory %d (%d):\n", *p, p[1]); + + /* Find out if this group can match the empty string. */ + p1 = p; /* To send to group_match_null_string_p. */ + + if (REG_MATCH_NULL_STRING_P (reg_info[*p]) == MATCH_NULL_UNSET_VALUE) + REG_MATCH_NULL_STRING_P (reg_info[*p]) + = group_match_null_string_p (&p1, pend, reg_info); + + /* Save the position in the string where we were the last time + we were at this open-group operator in case the group is + operated upon by a repetition operator, e.g., with `(a*)*b' + against `ab'; then we want to ignore where we are now in + the string in case this attempt to match fails. */ + old_regstart[*p] = REG_MATCH_NULL_STRING_P (reg_info[*p]) + ? REG_UNSET (regstart[*p]) ? d : regstart[*p] + : regstart[*p]; + DEBUG_PRINT2 (" old_regstart: %d\n", + POINTER_TO_OFFSET (old_regstart[*p])); + + regstart[*p] = d; + DEBUG_PRINT2 (" regstart: %d\n", POINTER_TO_OFFSET (regstart[*p])); + + IS_ACTIVE (reg_info[*p]) = 1; + MATCHED_SOMETHING (reg_info[*p]) = 0; + + /* This is the new highest active register. */ + highest_active_reg = *p; + + /* If nothing was active before, this is the new lowest active + register. */ + if (lowest_active_reg == NO_LOWEST_ACTIVE_REG) + lowest_active_reg = *p; + + /* Move past the register number and inner group count. */ + p += 2; + break; + + + /* The stop_memory opcode represents the end of a group. Its + arguments are the same as start_memory's: the register + number, and the number of inner groups. */ + case stop_memory: + DEBUG_PRINT3 ("EXECUTING stop_memory %d (%d):\n", *p, p[1]); + + /* We need to save the string position the last time we were at + this close-group operator in case the group is operated + upon by a repetition operator, e.g., with `((a*)*(b*)*)*' + against `aba'; then we want to ignore where we are now in + the string in case this attempt to match fails. */ + old_regend[*p] = REG_MATCH_NULL_STRING_P (reg_info[*p]) + ? REG_UNSET (regend[*p]) ? d : regend[*p] + : regend[*p]; + DEBUG_PRINT2 (" old_regend: %d\n", + POINTER_TO_OFFSET (old_regend[*p])); + + regend[*p] = d; + DEBUG_PRINT2 (" regend: %d\n", POINTER_TO_OFFSET (regend[*p])); + + /* This register isn't active anymore. */ + IS_ACTIVE (reg_info[*p]) = 0; + + /* If this was the only register active, nothing is active + anymore. */ + if (lowest_active_reg == highest_active_reg) + { + lowest_active_reg = NO_LOWEST_ACTIVE_REG; + highest_active_reg = NO_HIGHEST_ACTIVE_REG; + } + else + { /* We must scan for the new highest active register, since + it isn't necessarily one less than now: consider + (a(b)c(d(e)f)g). When group 3 ends, after the f), the + new highest active register is 1. */ + unsigned char r = *p - 1; + while (r > 0 && !IS_ACTIVE (reg_info[r])) + r--; + + /* If we end up at register zero, that means that we saved + the registers as the result of an `on_failure_jump', not + a `start_memory', and we jumped to past the innermost + `stop_memory'. For example, in ((.)*) we save + registers 1 and 2 as a result of the *, but when we pop + back to the second ), we are at the stop_memory 1. + Thus, nothing is active. */ + if (r == 0) + { + lowest_active_reg = NO_LOWEST_ACTIVE_REG; + highest_active_reg = NO_HIGHEST_ACTIVE_REG; + } + else + highest_active_reg = r; + } + + /* If just failed to match something this time around with a + group that's operated on by a repetition operator, try to + force exit from the ``loop'', and restore the register + information for this group that we had before trying this + last match. */ + if ((!MATCHED_SOMETHING (reg_info[*p]) + || (re_opcode_t) p[-3] == start_memory) + && (p + 2) < pend) + { + boolean is_a_jump_n = false; + + p1 = p + 2; + mcnt = 0; + switch ((re_opcode_t) *p1++) + { + case jump_n: + is_a_jump_n = true; + case pop_failure_jump: + case maybe_pop_jump: + case jump: + case dummy_failure_jump: + EXTRACT_NUMBER_AND_INCR (mcnt, p1); + if (is_a_jump_n) + p1 += 2; + break; + + default: + /* do nothing */ ; + } + p1 += mcnt; + + /* If the next operation is a jump backwards in the pattern + to an on_failure_jump right before the start_memory + corresponding to this stop_memory, exit from the loop + by forcing a failure after pushing on the stack the + on_failure_jump's jump in the pattern, and d. */ + if (mcnt < 0 && (re_opcode_t) *p1 == on_failure_jump + && (re_opcode_t) p1[3] == start_memory && p1[4] == *p) + { + /* If this group ever matched anything, then restore + what its registers were before trying this last + failed match, e.g., with `(a*)*b' against `ab' for + regstart[1], and, e.g., with `((a*)*(b*)*)*' + against `aba' for regend[3]. + + Also restore the registers for inner groups for, + e.g., `((a*)(b*))*' against `aba' (register 3 would + otherwise get trashed). */ + + if (EVER_MATCHED_SOMETHING (reg_info[*p])) + { + unsigned r; + + EVER_MATCHED_SOMETHING (reg_info[*p]) = 0; + + /* Restore this and inner groups' (if any) registers. */ + for (r = *p; r < *p + *(p + 1); r++) + { + regstart[r] = old_regstart[r]; + + /* xx why this test? */ + if ((int) old_regend[r] >= (int) regstart[r]) + regend[r] = old_regend[r]; + } + } + p1++; + EXTRACT_NUMBER_AND_INCR (mcnt, p1); + PUSH_FAILURE_POINT (p1 + mcnt, d, -2); + + goto fail; + } + } + + /* Move past the register number and the inner group count. */ + p += 2; + break; + + + /* \ has been turned into a `duplicate' command which is + followed by the numeric value of as the register number. */ + case duplicate: + { + register const char *d2, *dend2; + int regno = *p++; /* Get which register to match against. */ + DEBUG_PRINT2 ("EXECUTING duplicate %d.\n", regno); + + /* Can't back reference a group which we've never matched. */ + if (REG_UNSET (regstart[regno]) || REG_UNSET (regend[regno])) + goto fail; + + /* Where in input to try to start matching. */ + d2 = regstart[regno]; + + /* Where to stop matching; if both the place to start and + the place to stop matching are in the same string, then + set to the place to stop, otherwise, for now have to use + the end of the first string. */ + + dend2 = ((FIRST_STRING_P (regstart[regno]) + == FIRST_STRING_P (regend[regno])) + ? regend[regno] : end_match_1); + for (;;) + { + /* If necessary, advance to next segment in register + contents. */ + while (d2 == dend2) + { + if (dend2 == end_match_2) break; + if (dend2 == regend[regno]) break; + + /* End of string1 => advance to string2. */ + d2 = string2; + dend2 = regend[regno]; + } + /* At end of register contents => success */ + if (d2 == dend2) break; + + /* If necessary, advance to next segment in data. */ + PREFETCH (); + + /* How many characters left in this segment to match. */ + mcnt = dend - d; + + /* Want how many consecutive characters we can match in + one shot, so, if necessary, adjust the count. */ + if (mcnt > dend2 - d2) + mcnt = dend2 - d2; + + /* Compare that many; failure if mismatch, else move + past them. */ + if (translate + ? bcmp_translate (d, d2, mcnt, translate) + : bcmp (d, d2, mcnt)) + goto fail; + d += mcnt, d2 += mcnt; + } + } + break; + + + /* begline matches the empty string at the beginning of the string + (unless `not_bol' is set in `bufp'), and, if + `newline_anchor' is set, after newlines. */ + case begline: + DEBUG_PRINT1 ("EXECUTING begline.\n"); + + if (AT_STRINGS_BEG (d)) + { + if (!bufp->not_bol) break; + } + else if (d[-1] == '\n' && bufp->newline_anchor) + { + break; + } + /* In all other cases, we fail. */ + goto fail; + + + /* endline is the dual of begline. */ + case endline: + DEBUG_PRINT1 ("EXECUTING endline.\n"); + + if (AT_STRINGS_END (d)) + { + if (!bufp->not_eol) break; + } + + /* We have to ``prefetch'' the next character. */ + else if ((d == end1 ? *string2 : *d) == '\n' + && bufp->newline_anchor) + { + break; + } + goto fail; + + + /* Match at the very beginning of the data. */ + case begbuf: + DEBUG_PRINT1 ("EXECUTING begbuf.\n"); + if (AT_STRINGS_BEG (d)) + break; + goto fail; + + + /* Match at the very end of the data. */ + case endbuf: + DEBUG_PRINT1 ("EXECUTING endbuf.\n"); + if (AT_STRINGS_END (d)) + break; + goto fail; + + + /* on_failure_keep_string_jump is used to optimize `.*\n'. It + pushes NULL as the value for the string on the stack. Then + `pop_failure_point' will keep the current value for the + string, instead of restoring it. To see why, consider + matching `foo\nbar' against `.*\n'. The .* matches the foo; + then the . fails against the \n. But the next thing we want + to do is match the \n against the \n; if we restored the + string value, we would be back at the foo. + + Because this is used only in specific cases, we don't need to + check all the things that `on_failure_jump' does, to make + sure the right things get saved on the stack. Hence we don't + share its code. The only reason to push anything on the + stack at all is that otherwise we would have to change + `anychar's code to do something besides goto fail in this + case; that seems worse than this. */ + case on_failure_keep_string_jump: + DEBUG_PRINT1 ("EXECUTING on_failure_keep_string_jump"); + + EXTRACT_NUMBER_AND_INCR (mcnt, p); + DEBUG_PRINT3 (" %d (to 0x%x):\n", mcnt, p + mcnt); + + PUSH_FAILURE_POINT (p + mcnt, NULL, -2); + break; + + + /* Uses of on_failure_jump: + + Each alternative starts with an on_failure_jump that points + to the beginning of the next alternative. Each alternative + except the last ends with a jump that in effect jumps past + the rest of the alternatives. (They really jump to the + ending jump of the following alternative, because tensioning + these jumps is a hassle.) + + Repeats start with an on_failure_jump that points past both + the repetition text and either the following jump or + pop_failure_jump back to this on_failure_jump. */ + case on_failure_jump: + on_failure: + DEBUG_PRINT1 ("EXECUTING on_failure_jump"); + + EXTRACT_NUMBER_AND_INCR (mcnt, p); + DEBUG_PRINT3 (" %d (to 0x%x)", mcnt, p + mcnt); + + /* If this on_failure_jump comes right before a group (i.e., + the original * applied to a group), save the information + for that group and all inner ones, so that if we fail back + to this point, the group's information will be correct. + For example, in \(a*\)*\1, we need the preceding group, + and in \(\(a*\)b*\)\2, we need the inner group. */ + + /* We can't use `p' to check ahead because we push + a failure point to `p + mcnt' after we do this. */ + p1 = p; + + /* We need to skip no_op's before we look for the + start_memory in case this on_failure_jump is happening as + the result of a completed succeed_n, as in \(a\)\{1,3\}b\1 + against aba. */ + while (p1 < pend && (re_opcode_t) *p1 == no_op) + p1++; + + if (p1 < pend && (re_opcode_t) *p1 == start_memory) + { + /* We have a new highest active register now. This will + get reset at the start_memory we are about to get to, + but we will have saved all the registers relevant to + this repetition op, as described above. */ + highest_active_reg = *(p1 + 1) + *(p1 + 2); + if (lowest_active_reg == NO_LOWEST_ACTIVE_REG) + lowest_active_reg = *(p1 + 1); + } + + DEBUG_PRINT1 (":\n"); + PUSH_FAILURE_POINT (p + mcnt, d, -2); + break; + + + /* A smart repeat ends with `maybe_pop_jump'. + We change it to either `pop_failure_jump' or `jump'. */ + case maybe_pop_jump: + EXTRACT_NUMBER_AND_INCR (mcnt, p); + DEBUG_PRINT2 ("EXECUTING maybe_pop_jump %d.\n", mcnt); + { + register unsigned char *p2 = p; + + /* Compare the beginning of the repeat with what in the + pattern follows its end. If we can establish that there + is nothing that they would both match, i.e., that we + would have to backtrack because of (as in, e.g., `a*a') + then we can change to pop_failure_jump, because we'll + never have to backtrack. + + This is not true in the case of alternatives: in + `(a|ab)*' we do need to backtrack to the `ab' alternative + (e.g., if the string was `ab'). But instead of trying to + detect that here, the alternative has put on a dummy + failure point which is what we will end up popping. */ + + /* Skip over open/close-group commands. */ + while (p2 + 2 < pend + && ((re_opcode_t) *p2 == stop_memory + || (re_opcode_t) *p2 == start_memory)) + p2 += 3; /* Skip over args, too. */ + + /* If we're at the end of the pattern, we can change. */ + if (p2 == pend) + { + /* Consider what happens when matching ":\(.*\)" + against ":/". I don't really understand this code + yet. */ + p[-3] = (unsigned char) pop_failure_jump; + DEBUG_PRINT1 + (" End of pattern: change to `pop_failure_jump'.\n"); + } + + else if ((re_opcode_t) *p2 == exactn + || (bufp->newline_anchor && (re_opcode_t) *p2 == endline)) + { + register unsigned char c + = *p2 == (unsigned char) endline ? '\n' : p2[2]; + p1 = p + mcnt; + + /* p1[0] ... p1[2] are the `on_failure_jump' corresponding + to the `maybe_finalize_jump' of this case. Examine what + follows. */ + if ((re_opcode_t) p1[3] == exactn && p1[5] != c) + { + p[-3] = (unsigned char) pop_failure_jump; + DEBUG_PRINT3 (" %c != %c => pop_failure_jump.\n", + c, p1[5]); + } + + else if ((re_opcode_t) p1[3] == charset + || (re_opcode_t) p1[3] == charset_not) + { + int not = (re_opcode_t) p1[3] == charset_not; + + if (c < (unsigned char) (p1[4] * BYTEWIDTH) + && p1[5 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH))) + not = !not; + + /* `not' is equal to 1 if c would match, which means + that we can't change to pop_failure_jump. */ + if (!not) + { + p[-3] = (unsigned char) pop_failure_jump; + DEBUG_PRINT1 (" No match => pop_failure_jump.\n"); + } + } + } + } + p -= 2; /* Point at relative address again. */ + if ((re_opcode_t) p[-1] != pop_failure_jump) + { + p[-1] = (unsigned char) jump; + DEBUG_PRINT1 (" Match => jump.\n"); + goto unconditional_jump; + } + /* Note fall through. */ + + + /* The end of a simple repeat has a pop_failure_jump back to + its matching on_failure_jump, where the latter will push a + failure point. The pop_failure_jump takes off failure + points put on by this pop_failure_jump's matching + on_failure_jump; we got through the pattern to here from the + matching on_failure_jump, so didn't fail. */ + case pop_failure_jump: + { + /* We need to pass separate storage for the lowest and + highest registers, even though we don't care about the + actual values. Otherwise, we will restore only one + register from the stack, since lowest will == highest in + `pop_failure_point'. */ + unsigned dummy_low_reg, dummy_high_reg; + unsigned char *pdummy; + const char *sdummy; + + DEBUG_PRINT1 ("EXECUTING pop_failure_jump.\n"); + POP_FAILURE_POINT (sdummy, pdummy, + dummy_low_reg, dummy_high_reg, + reg_dummy, reg_dummy, reg_info_dummy); + } + /* Note fall through. */ + + + /* Unconditionally jump (without popping any failure points). */ + case jump: + unconditional_jump: + EXTRACT_NUMBER_AND_INCR (mcnt, p); /* Get the amount to jump. */ + DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt); + p += mcnt; /* Do the jump. */ + DEBUG_PRINT2 ("(to 0x%x).\n", p); + break; + + + /* We need this opcode so we can detect where alternatives end + in `group_match_null_string_p' et al. */ + case jump_past_alt: + DEBUG_PRINT1 ("EXECUTING jump_past_alt.\n"); + goto unconditional_jump; + + + /* Normally, the on_failure_jump pushes a failure point, which + then gets popped at pop_failure_jump. We will end up at + pop_failure_jump, also, and with a pattern of, say, `a+', we + are skipping over the on_failure_jump, so we have to push + something meaningless for pop_failure_jump to pop. */ + case dummy_failure_jump: + DEBUG_PRINT1 ("EXECUTING dummy_failure_jump.\n"); + /* It doesn't matter what we push for the string here. What + the code at `fail' tests is the value for the pattern. */ + PUSH_FAILURE_POINT (0, 0, -2); + goto unconditional_jump; + + + /* At the end of an alternative, we need to push a dummy failure + point in case we are followed by a `pop_failure_jump', because + we don't want the failure point for the alternative to be + popped. For example, matching `(a|ab)*' against `aab' + requires that we match the `ab' alternative. */ + case push_dummy_failure: + DEBUG_PRINT1 ("EXECUTING push_dummy_failure.\n"); + /* See comments just above at `dummy_failure_jump' about the + two zeroes. */ + PUSH_FAILURE_POINT (0, 0, -2); + break; + + /* Have to succeed matching what follows at least n times. + After that, handle like `on_failure_jump'. */ + case succeed_n: + EXTRACT_NUMBER (mcnt, p + 2); + DEBUG_PRINT2 ("EXECUTING succeed_n %d.\n", mcnt); + + assert (mcnt >= 0); + /* Originally, this is how many times we HAVE to succeed. */ + if (mcnt > 0) + { + mcnt--; + p += 2; + STORE_NUMBER_AND_INCR (p, mcnt); + DEBUG_PRINT3 (" Setting 0x%x to %d.\n", p, mcnt); + } + else if (mcnt == 0) + { + DEBUG_PRINT2 (" Setting two bytes from 0x%x to no_op.\n", p+2); + p[2] = (unsigned char) no_op; + p[3] = (unsigned char) no_op; + goto on_failure; + } + break; + + case jump_n: + EXTRACT_NUMBER (mcnt, p + 2); + DEBUG_PRINT2 ("EXECUTING jump_n %d.\n", mcnt); + + /* Originally, this is how many times we CAN jump. */ + if (mcnt) + { + mcnt--; + STORE_NUMBER (p + 2, mcnt); + goto unconditional_jump; + } + /* If don't have to jump any more, skip over the rest of command. */ + else + p += 4; + break; + + case set_number_at: + { + DEBUG_PRINT1 ("EXECUTING set_number_at.\n"); + + EXTRACT_NUMBER_AND_INCR (mcnt, p); + p1 = p + mcnt; + EXTRACT_NUMBER_AND_INCR (mcnt, p); + DEBUG_PRINT3 (" Setting 0x%x to %d.\n", p1, mcnt); + STORE_NUMBER (p1, mcnt); + break; + } + + case wordbound: + DEBUG_PRINT1 ("EXECUTING wordbound.\n"); + if (AT_WORD_BOUNDARY (d)) + break; + goto fail; + + case notwordbound: + DEBUG_PRINT1 ("EXECUTING notwordbound.\n"); + if (AT_WORD_BOUNDARY (d)) + goto fail; + break; + + case wordbeg: + DEBUG_PRINT1 ("EXECUTING wordbeg.\n"); + if (WORDCHAR_P (d) && (AT_STRINGS_BEG (d) || !WORDCHAR_P (d - 1))) + break; + goto fail; + + case wordend: + DEBUG_PRINT1 ("EXECUTING wordend.\n"); + if (!AT_STRINGS_BEG (d) && WORDCHAR_P (d - 1) + && (!WORDCHAR_P (d) || AT_STRINGS_END (d))) + break; + goto fail; + +#ifdef emacs +#ifdef emacs19 + case before_dot: + DEBUG_PRINT1 ("EXECUTING before_dot.\n"); + if (PTR_CHAR_POS ((unsigned char *) d) >= point) + goto fail; + break; + + case at_dot: + DEBUG_PRINT1 ("EXECUTING at_dot.\n"); + if (PTR_CHAR_POS ((unsigned char *) d) != point) + goto fail; + break; + + case after_dot: + DEBUG_PRINT1 ("EXECUTING after_dot.\n"); + if (PTR_CHAR_POS ((unsigned char *) d) <= point) + goto fail; + break; +#else /* not emacs19 */ + case at_dot: + DEBUG_PRINT1 ("EXECUTING at_dot.\n"); + if (PTR_CHAR_POS ((unsigned char *) d) + 1 != point) + goto fail; + break; +#endif /* not emacs19 */ + + case syntaxspec: + DEBUG_PRINT2 ("EXECUTING syntaxspec %d.\n", mcnt); + mcnt = *p++; + goto matchsyntax; + + case wordchar: + DEBUG_PRINT1 ("EXECUTING Emacs wordchar.\n"); + mcnt = (int) Sword; + matchsyntax: + PREFETCH (); + if (SYNTAX (*d++) != (enum syntaxcode) mcnt) + goto fail; + SET_REGS_MATCHED (); + break; + + case notsyntaxspec: + DEBUG_PRINT2 ("EXECUTING notsyntaxspec %d.\n", mcnt); + mcnt = *p++; + goto matchnotsyntax; + + case notwordchar: + DEBUG_PRINT1 ("EXECUTING Emacs notwordchar.\n"); + mcnt = (int) Sword; + matchnotsyntax: + PREFETCH (); + if (SYNTAX (*d++) == (enum syntaxcode) mcnt) + goto fail; + SET_REGS_MATCHED (); + break; + +#else /* not emacs */ + case wordchar: + DEBUG_PRINT1 ("EXECUTING non-Emacs wordchar.\n"); + PREFETCH (); + if (!WORDCHAR_P (d)) + goto fail; + SET_REGS_MATCHED (); + d++; + break; + + case notwordchar: + DEBUG_PRINT1 ("EXECUTING non-Emacs notwordchar.\n"); + PREFETCH (); + if (WORDCHAR_P (d)) + goto fail; + SET_REGS_MATCHED (); + d++; + break; +#endif /* not emacs */ + + default: + abort (); + } + continue; /* Successfully executed one pattern command; keep going. */ + + + /* We goto here if a matching operation fails. */ + fail: + if (!FAIL_STACK_EMPTY ()) + { /* A restart point is known. Restore to that state. */ + DEBUG_PRINT1 ("\nFAIL:\n"); + POP_FAILURE_POINT (d, p, + lowest_active_reg, highest_active_reg, + regstart, regend, reg_info); + + /* If this failure point is a dummy, try the next one. */ + if (!p) + goto fail; + + /* If we failed to the end of the pattern, don't examine *p. */ + assert (p <= pend); + if (p < pend) + { + boolean is_a_jump_n = false; + + /* If failed to a backwards jump that's part of a repetition + loop, need to pop this failure point and use the next one. */ + switch ((re_opcode_t) *p) + { + case jump_n: + is_a_jump_n = true; + case maybe_pop_jump: + case pop_failure_jump: + case jump: + p1 = p + 1; + EXTRACT_NUMBER_AND_INCR (mcnt, p1); + p1 += mcnt; + + if ((is_a_jump_n && (re_opcode_t) *p1 == succeed_n) + || (!is_a_jump_n + && (re_opcode_t) *p1 == on_failure_jump)) + goto fail; + break; + default: + /* do nothing */ ; + } + } + + if (d >= string1 && d <= end1) + dend = end_match_1; + } + else + break; /* Matching at this starting point really fails. */ + } /* for (;;) */ + + if (best_regs_set) + goto restore_best_regs; + + FREE_VARIABLES (); + + return -1; /* Failure to match. */ +} /* re_match_2 */ + +/* Subroutine definitions for re_match_2. */ + + +/* We are passed P pointing to a register number after a start_memory. + + Return true if the pattern up to the corresponding stop_memory can + match the empty string, and false otherwise. + + If we find the matching stop_memory, sets P to point to one past its number. + Otherwise, sets P to an undefined byte less than or equal to END. + + We don't handle duplicates properly (yet). */ + +static boolean +group_match_null_string_p (p, end, reg_info) + unsigned char **p, *end; + register_info_type *reg_info; +{ + int mcnt; + /* Point to after the args to the start_memory. */ + unsigned char *p1 = *p + 2; + + while (p1 < end) + { + /* Skip over opcodes that can match nothing, and return true or + false, as appropriate, when we get to one that can't, or to the + matching stop_memory. */ + + switch ((re_opcode_t) *p1) + { + /* Could be either a loop or a series of alternatives. */ + case on_failure_jump: + p1++; + EXTRACT_NUMBER_AND_INCR (mcnt, p1); + + /* If the next operation is not a jump backwards in the + pattern. */ + + if (mcnt >= 0) + { + /* Go through the on_failure_jumps of the alternatives, + seeing if any of the alternatives cannot match nothing. + The last alternative starts with only a jump, + whereas the rest start with on_failure_jump and end + with a jump, e.g., here is the pattern for `a|b|c': + + /on_failure_jump/0/6/exactn/1/a/jump_past_alt/0/6 + /on_failure_jump/0/6/exactn/1/b/jump_past_alt/0/3 + /exactn/1/c + + So, we have to first go through the first (n-1) + alternatives and then deal with the last one separately. */ + + + /* Deal with the first (n-1) alternatives, which start + with an on_failure_jump (see above) that jumps to right + past a jump_past_alt. */ + + while ((re_opcode_t) p1[mcnt-3] == jump_past_alt) + { + /* `mcnt' holds how many bytes long the alternative + is, including the ending `jump_past_alt' and + its number. */ + + if (!alt_match_null_string_p (p1, p1 + mcnt - 3, + reg_info)) + return false; + + /* Move to right after this alternative, including the + jump_past_alt. */ + p1 += mcnt; + + /* Break if it's the beginning of an n-th alternative + that doesn't begin with an on_failure_jump. */ + if ((re_opcode_t) *p1 != on_failure_jump) + break; + + /* Still have to check that it's not an n-th + alternative that starts with an on_failure_jump. */ + p1++; + EXTRACT_NUMBER_AND_INCR (mcnt, p1); + if ((re_opcode_t) p1[mcnt-3] != jump_past_alt) + { + /* Get to the beginning of the n-th alternative. */ + p1 -= 3; + break; + } + } + + /* Deal with the last alternative: go back and get number + of the `jump_past_alt' just before it. `mcnt' contains + the length of the alternative. */ + EXTRACT_NUMBER (mcnt, p1 - 2); + + if (!alt_match_null_string_p (p1, p1 + mcnt, reg_info)) + return false; + + p1 += mcnt; /* Get past the n-th alternative. */ + } /* if mcnt > 0 */ + break; + + + case stop_memory: + assert (p1[1] == **p); + *p = p1 + 2; + return true; + + + default: + if (!common_op_match_null_string_p (&p1, end, reg_info)) + return false; + } + } /* while p1 < end */ + + return false; +} /* group_match_null_string_p */ + + +/* Similar to group_match_null_string_p, but doesn't deal with alternatives: + It expects P to be the first byte of a single alternative and END one + byte past the last. The alternative can contain groups. */ + +static boolean +alt_match_null_string_p (p, end, reg_info) + unsigned char *p, *end; + register_info_type *reg_info; +{ + int mcnt; + unsigned char *p1 = p; + + while (p1 < end) + { + /* Skip over opcodes that can match nothing, and break when we get + to one that can't. */ + + switch ((re_opcode_t) *p1) + { + /* It's a loop. */ + case on_failure_jump: + p1++; + EXTRACT_NUMBER_AND_INCR (mcnt, p1); + p1 += mcnt; + break; + + default: + if (!common_op_match_null_string_p (&p1, end, reg_info)) + return false; + } + } /* while p1 < end */ + + return true; +} /* alt_match_null_string_p */ + + +/* Deals with the ops common to group_match_null_string_p and + alt_match_null_string_p. + + Sets P to one after the op and its arguments, if any. */ + +static boolean +common_op_match_null_string_p (p, end, reg_info) + unsigned char **p, *end; + register_info_type *reg_info; +{ + int mcnt; + boolean ret; + int reg_no; + unsigned char *p1 = *p; + + switch ((re_opcode_t) *p1++) + { + case no_op: + case begline: + case endline: + case begbuf: + case endbuf: + case wordbeg: + case wordend: + case wordbound: + case notwordbound: +#ifdef emacs + case before_dot: + case at_dot: + case after_dot: +#endif + break; + + case start_memory: + reg_no = *p1; + assert (reg_no > 0 && reg_no <= MAX_REGNUM); + ret = group_match_null_string_p (&p1, end, reg_info); + + /* Have to set this here in case we're checking a group which + contains a group and a back reference to it. */ + + if (REG_MATCH_NULL_STRING_P (reg_info[reg_no]) == MATCH_NULL_UNSET_VALUE) + REG_MATCH_NULL_STRING_P (reg_info[reg_no]) = ret; + + if (!ret) + return false; + break; + + /* If this is an optimized succeed_n for zero times, make the jump. */ + case jump: + EXTRACT_NUMBER_AND_INCR (mcnt, p1); + if (mcnt >= 0) + p1 += mcnt; + else + return false; + break; + + case succeed_n: + /* Get to the number of times to succeed. */ + p1 += 2; + EXTRACT_NUMBER_AND_INCR (mcnt, p1); + + if (mcnt == 0) + { + p1 -= 4; + EXTRACT_NUMBER_AND_INCR (mcnt, p1); + p1 += mcnt; + } + else + return false; + break; + + case duplicate: + if (!REG_MATCH_NULL_STRING_P (reg_info[*p1])) + return false; + break; + + case set_number_at: + p1 += 4; + + default: + /* All other opcodes mean we cannot match the empty string. */ + return false; + } + + *p = p1; + return true; +} /* common_op_match_null_string_p */ + + +/* Return zero if TRANSLATE[S1] and TRANSLATE[S2] are identical for LEN + bytes; nonzero otherwise. */ + +static int +bcmp_translate (s1, s2, len, translate) + unsigned char *s1, *s2; + register int len; + char *translate; +{ + register unsigned char *p1 = s1, *p2 = s2; + while (len) + { + if (translate[*p1++] != translate[*p2++]) return 1; + len--; + } + return 0; +} + +/* Entry points for GNU code. */ + +/* re_compile_pattern is the GNU regular expression compiler: it + compiles PATTERN (of length SIZE) and puts the result in BUFP. + Returns 0 if the pattern was valid, otherwise an error string. + + Assumes the `allocated' (and perhaps `buffer') and `translate' fields + are set in BUFP on entry. + + We call regex_compile to do the actual compilation. */ + +const char * +re_compile_pattern (pattern, length, bufp) + const char *pattern; + int length; + struct re_pattern_buffer *bufp; +{ + reg_errcode_t ret; + + /* GNU code is written to assume at least RE_NREGS registers will be set + (and at least one extra will be -1). */ + bufp->regs_allocated = REGS_UNALLOCATED; + + /* And GNU code determines whether or not to get register information + by passing null for the REGS argument to re_match, etc., not by + setting no_sub. */ + bufp->no_sub = 0; + + /* Match anchors at newline. */ + bufp->newline_anchor = 1; + + ret = regex_compile (pattern, length, re_syntax_options, bufp); + + return re_error_msg[(int) ret]; +} + +/* Entry points compatible with 4.2 BSD regex library. We don't define + them if this is an Emacs or POSIX compilation. */ + +#if !defined (emacs) && !defined (_POSIX_SOURCE) + +/* BSD has one and only one pattern buffer. */ +static struct re_pattern_buffer re_comp_buf; + +char * +re_comp (s) + const char *s; +{ + reg_errcode_t ret; + + if (!s) + { + if (!re_comp_buf.buffer) + return "No previous regular expression"; + return 0; + } + + if (!re_comp_buf.buffer) + { + re_comp_buf.buffer = (unsigned char *) malloc (200); + if (re_comp_buf.buffer == NULL) + return "Memory exhausted"; + re_comp_buf.allocated = 200; + + re_comp_buf.fastmap = (char *) malloc (1 << BYTEWIDTH); + if (re_comp_buf.fastmap == NULL) + return "Memory exhausted"; + } + + /* Since `re_exec' always passes NULL for the `regs' argument, we + don't need to initialize the pattern buffer fields which affect it. */ + + /* Match anchors at newlines. */ + re_comp_buf.newline_anchor = 1; + + ret = regex_compile (s, strlen (s), re_syntax_options, &re_comp_buf); + + /* Yes, we're discarding `const' here. */ + return (char *) re_error_msg[(int) ret]; +} + + +int +re_exec (s) + const char *s; +{ + const int len = strlen (s); + return + 0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0); +} +#endif /* not emacs and not _POSIX_SOURCE */ + +/* POSIX.2 functions. Don't define these for Emacs. */ + +#ifndef emacs + +/* regcomp takes a regular expression as a string and compiles it. + + PREG is a regex_t *. We do not expect any fields to be initialized, + since POSIX says we shouldn't. Thus, we set + + `buffer' to the compiled pattern; + `used' to the length of the compiled pattern; + `syntax' to RE_SYNTAX_POSIX_EXTENDED if the + REG_EXTENDED bit in CFLAGS is set; otherwise, to + RE_SYNTAX_POSIX_BASIC; + `newline_anchor' to REG_NEWLINE being set in CFLAGS; + `fastmap' and `fastmap_accurate' to zero; + `re_nsub' to the number of subexpressions in PATTERN. + + PATTERN is the address of the pattern string. + + CFLAGS is a series of bits which affect compilation. + + If REG_EXTENDED is set, we use POSIX extended syntax; otherwise, we + use POSIX basic syntax. + + If REG_NEWLINE is set, then . and [^...] don't match newline. + Also, regexec will try a match beginning after every newline. + + If REG_ICASE is set, then we considers upper- and lowercase + versions of letters to be equivalent when matching. + + If REG_NOSUB is set, then when PREG is passed to regexec, that + routine will report only success or failure, and nothing about the + registers. + + It returns 0 if it succeeds, nonzero if it doesn't. (See regex.h for + the return codes and their meanings.) */ + +int +regcomp (preg, pattern, cflags) + regex_t *preg; + const char *pattern; + int cflags; +{ + reg_errcode_t ret; + unsigned syntax + = (cflags & REG_EXTENDED) ? + RE_SYNTAX_POSIX_EXTENDED : RE_SYNTAX_POSIX_BASIC; + + /* regex_compile will allocate the space for the compiled pattern. */ + preg->buffer = 0; + preg->allocated = 0; + + /* Don't bother to use a fastmap when searching. This simplifies the + REG_NEWLINE case: if we used a fastmap, we'd have to put all the + characters after newlines into the fastmap. This way, we just try + every character. */ + preg->fastmap = 0; + + if (cflags & REG_ICASE) + { + unsigned i; + + preg->translate = (char *) malloc (CHAR_SET_SIZE); + if (preg->translate == NULL) + return (int) REG_ESPACE; + + /* Map uppercase characters to corresponding lowercase ones. */ + for (i = 0; i < CHAR_SET_SIZE; i++) + preg->translate[i] = ISUPPER (i) ? tolower (i) : i; + } + else + preg->translate = NULL; + + /* If REG_NEWLINE is set, newlines are treated differently. */ + if (cflags & REG_NEWLINE) + { /* REG_NEWLINE implies neither . nor [^...] match newline. */ + syntax &= ~RE_DOT_NEWLINE; + syntax |= RE_HAT_LISTS_NOT_NEWLINE; + /* It also changes the matching behavior. */ + preg->newline_anchor = 1; + } + else + preg->newline_anchor = 0; + + preg->no_sub = !!(cflags & REG_NOSUB); + + /* POSIX says a null character in the pattern terminates it, so we + can use strlen here in compiling the pattern. */ + ret = regex_compile (pattern, strlen (pattern), syntax, preg); + + /* POSIX doesn't distinguish between an unmatched open-group and an + unmatched close-group: both are REG_EPAREN. */ + if (ret == REG_ERPAREN) ret = REG_EPAREN; + + return (int) ret; +} + + +/* regexec searches for a given pattern, specified by PREG, in the + string STRING. + + If NMATCH is zero or REG_NOSUB was set in the cflags argument to + `regcomp', we ignore PMATCH. Otherwise, we assume PMATCH has at + least NMATCH elements, and we set them to the offsets of the + corresponding matched substrings. + + EFLAGS specifies `execution flags' which affect matching: if + REG_NOTBOL is set, then ^ does not match at the beginning of the + string; if REG_NOTEOL is set, then $ does not match at the end. + + We return 0 if we find a match and REG_NOMATCH if not. */ + +int +regexec (preg, string, nmatch, pmatch, eflags) + const regex_t *preg; + const char *string; + size_t nmatch; + regmatch_t pmatch[]; + int eflags; +{ + int ret; + struct re_registers regs; + regex_t private_preg; + int len = strlen (string); + boolean want_reg_info = !preg->no_sub && nmatch > 0; + + private_preg = *preg; + + private_preg.not_bol = !!(eflags & REG_NOTBOL); + private_preg.not_eol = !!(eflags & REG_NOTEOL); + + /* The user has told us exactly how many registers to return + information about, via `nmatch'. We have to pass that on to the + matching routines. */ + private_preg.regs_allocated = REGS_FIXED; + + if (want_reg_info) + { + regs.num_regs = nmatch; + regs.start = TALLOC (nmatch, regoff_t); + regs.end = TALLOC (nmatch, regoff_t); + if (regs.start == NULL || regs.end == NULL) + return (int) REG_NOMATCH; + } + + /* Perform the searching operation. */ + ret = re_search (&private_preg, string, len, + /* start: */ 0, /* range: */ len, + want_reg_info ? ®s : (struct re_registers *) 0); + + /* Copy the register information to the POSIX structure. */ + if (want_reg_info) + { + if (ret >= 0) + { + unsigned r; + + for (r = 0; r < nmatch; r++) + { + pmatch[r].rm_so = regs.start[r]; + pmatch[r].rm_eo = regs.end[r]; + } + } + + /* If we needed the temporary register info, free the space now. */ + free (regs.start); + free (regs.end); + } + + /* We want zero return to mean success, unlike `re_search'. */ + return ret >= 0 ? (int) REG_NOERROR : (int) REG_NOMATCH; +} + + +/* Returns a message corresponding to an error code, ERRCODE, returned + from either regcomp or regexec. We don't use PREG here. */ + +size_t +regerror (errcode, preg, errbuf, errbuf_size) + int errcode; + const regex_t *preg; + char *errbuf; + size_t errbuf_size; +{ + const char *msg; + size_t msg_size; + + if (errcode < 0 + || errcode >= (sizeof (re_error_msg) / sizeof (re_error_msg[0]))) + /* Only error codes returned by the rest of the code should be passed + to this routine. If we are given anything else, or if other regex + code generates an invalid error code, then the program has a bug. + Dump core so we can fix it. */ + abort (); + + msg = re_error_msg[errcode]; + + /* POSIX doesn't require that we do anything in this case, but why + not be nice. */ + if (! msg) + msg = "Success"; + + msg_size = strlen (msg) + 1; /* Includes the null. */ + + if (errbuf_size != 0) + { + if (msg_size > errbuf_size) + { + strncpy (errbuf, msg, errbuf_size - 1); + errbuf[errbuf_size - 1] = 0; + } + else + strcpy (errbuf, msg); + } + + return msg_size; +} + + +/* Free dynamically allocated space used by PREG. */ + +void +regfree (preg) + regex_t *preg; +{ + if (preg->buffer != NULL) + free (preg->buffer); + preg->buffer = NULL; + + preg->allocated = 0; + preg->used = 0; + + if (preg->fastmap != NULL) + free (preg->fastmap); + preg->fastmap = NULL; + preg->fastmap_accurate = 0; + + if (preg->translate != NULL) + free (preg->translate); + preg->translate = NULL; +} + +#endif /* not emacs */ + +/* +Local variables: +make-backup-files: t +version-control: t +trim-versions-without-asking: nil +End: +*/ diff --git a/extras/regex/regex.h b/extras/regex/regex.h new file mode 100644 index 000000000..408dd2103 --- /dev/null +++ b/extras/regex/regex.h @@ -0,0 +1,490 @@ +/* Definitions for data structures and routines for the regular + expression library, version 0.12. + + Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef __REGEXP_LIBRARY_H__ +#define __REGEXP_LIBRARY_H__ + +/* POSIX says that must be included (by the caller) before + . */ + +#ifdef VMS +/* VMS doesn't have `size_t' in , even though POSIX says it + should be there. */ +#include +#endif + + +/* The following bits are used to determine the regexp syntax we + recognize. The set/not-set meanings are chosen so that Emacs syntax + remains the value 0. The bits are given in alphabetical order, and + the definitions shifted by one from the previous bit; thus, when we + add or remove a bit, only one other definition need change. */ +typedef unsigned reg_syntax_t; + +/* If this bit is not set, then \ inside a bracket expression is literal. + If set, then such a \ quotes the following character. */ +#define RE_BACKSLASH_ESCAPE_IN_LISTS (1) + +/* If this bit is not set, then + and ? are operators, and \+ and \? are + literals. + If set, then \+ and \? are operators and + and ? are literals. */ +#define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1) + +/* If this bit is set, then character classes are supported. They are: + [:alpha:], [:upper:], [:lower:], [:digit:], [:alnum:], [:xdigit:], + [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:]. + If not set, then character classes are not supported. */ +#define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1) + +/* If this bit is set, then ^ and $ are always anchors (outside bracket + expressions, of course). + If this bit is not set, then it depends: + ^ is an anchor if it is at the beginning of a regular + expression or after an open-group or an alternation operator; + $ is an anchor if it is at the end of a regular expression, or + before a close-group or an alternation operator. + + This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because + POSIX draft 11.2 says that * etc. in leading positions is undefined. + We already implemented a previous draft which made those constructs + invalid, though, so we haven't changed the code back. */ +#define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1) + +/* If this bit is set, then special characters are always special + regardless of where they are in the pattern. + If this bit is not set, then special characters are special only in + some contexts; otherwise they are ordinary. Specifically, + * + ? and intervals are only special when not after the beginning, + open-group, or alternation operator. */ +#define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1) + +/* If this bit is set, then *, +, ?, and { cannot be first in an re or + immediately after an alternation or begin-group operator. */ +#define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1) + +/* If this bit is set, then . matches newline. + If not set, then it doesn't. */ +#define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1) + +/* If this bit is set, then . doesn't match NUL. + If not set, then it does. */ +#define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1) + +/* If this bit is set, nonmatching lists [^...] do not match newline. + If not set, they do. */ +#define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1) + +/* If this bit is set, either \{...\} or {...} defines an + interval, depending on RE_NO_BK_BRACES. + If not set, \{, \}, {, and } are literals. */ +#define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1) + +/* If this bit is set, +, ? and | aren't recognized as operators. + If not set, they are. */ +#define RE_LIMITED_OPS (RE_INTERVALS << 1) + +/* If this bit is set, newline is an alternation operator. + If not set, newline is literal. */ +#define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1) + +/* If this bit is set, then `{...}' defines an interval, and \{ and \} + are literals. + If not set, then `\{...\}' defines an interval. */ +#define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1) + +/* If this bit is set, (...) defines a group, and \( and \) are literals. + If not set, \(...\) defines a group, and ( and ) are literals. */ +#define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1) + +/* If this bit is set, then \ matches . + If not set, then \ is a back-reference. */ +#define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1) + +/* If this bit is set, then | is an alternation operator, and \| is literal. + If not set, then \| is an alternation operator, and | is literal. */ +#define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1) + +/* If this bit is set, then an ending range point collating higher + than the starting range point, as in [z-a], is invalid. + If not set, then when ending range point collates higher than the + starting range point, the range is ignored. */ +#define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1) + +/* If this bit is set, then an unmatched ) is ordinary. + If not set, then an unmatched ) is invalid. */ +#define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1) + +/* This global variable defines the particular regexp syntax to use (for + some interfaces). When a regexp is compiled, the syntax used is + stored in the pattern buffer, so changing this does not affect + already-compiled regexps. */ +extern reg_syntax_t re_syntax_options; + +/* Define combinations of the above bits for the standard possibilities. + (The [[[ comments delimit what gets put into the Texinfo file, so + don't delete them!) */ +/* [[[begin syntaxes]]] */ +#define RE_SYNTAX_EMACS 0 + +#define RE_SYNTAX_AWK \ + (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \ + | RE_NO_BK_PARENS | RE_NO_BK_REFS \ + | RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \ + | RE_UNMATCHED_RIGHT_PAREN_ORD) + +#define RE_SYNTAX_POSIX_AWK \ + (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS) + +#define RE_SYNTAX_GREP \ + (RE_BK_PLUS_QM | RE_CHAR_CLASSES \ + | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \ + | RE_NEWLINE_ALT) + +#define RE_SYNTAX_EGREP \ + (RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \ + | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \ + | RE_NEWLINE_ALT | RE_NO_BK_PARENS \ + | RE_NO_BK_VBAR) + +#define RE_SYNTAX_POSIX_EGREP \ + (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES) + +/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */ +#define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC + +#define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC + +/* Syntax bits common to both basic and extended POSIX regex syntax. */ +#define _RE_SYNTAX_POSIX_COMMON \ + (RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \ + | RE_INTERVALS | RE_NO_EMPTY_RANGES) + +#define RE_SYNTAX_POSIX_BASIC \ + (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM) + +/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes + RE_LIMITED_OPS, i.e., \? \+ \| are not recognized. Actually, this + isn't minimal, since other operators, such as \`, aren't disabled. */ +#define RE_SYNTAX_POSIX_MINIMAL_BASIC \ + (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS) + +#define RE_SYNTAX_POSIX_EXTENDED \ + (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ + | RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES \ + | RE_NO_BK_PARENS | RE_NO_BK_VBAR \ + | RE_UNMATCHED_RIGHT_PAREN_ORD) + +/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INVALID_OPS + replaces RE_CONTEXT_INDEP_OPS and RE_NO_BK_REFS is added. */ +#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED \ + (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ + | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES \ + | RE_NO_BK_PARENS | RE_NO_BK_REFS \ + | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) +/* [[[end syntaxes]]] */ + +/* Maximum number of duplicates an interval can allow. Some systems + (erroneously) define this in other header files, but we want our + value, so remove any previous define. */ +#ifdef RE_DUP_MAX +#undef RE_DUP_MAX +#endif +#define RE_DUP_MAX ((1 << 15) - 1) + + +/* POSIX `cflags' bits (i.e., information for `regcomp'). */ + +/* If this bit is set, then use extended regular expression syntax. + If not set, then use basic regular expression syntax. */ +#define REG_EXTENDED 1 + +/* If this bit is set, then ignore case when matching. + If not set, then case is significant. */ +#define REG_ICASE (REG_EXTENDED << 1) + +/* If this bit is set, then anchors do not match at newline + characters in the string. + If not set, then anchors do match at newlines. */ +#define REG_NEWLINE (REG_ICASE << 1) + +/* If this bit is set, then report only success or fail in regexec. + If not set, then returns differ between not matching and errors. */ +#define REG_NOSUB (REG_NEWLINE << 1) + + +/* POSIX `eflags' bits (i.e., information for regexec). */ + +/* If this bit is set, then the beginning-of-line operator doesn't match + the beginning of the string (presumably because it's not the + beginning of a line). + If not set, then the beginning-of-line operator does match the + beginning of the string. */ +#define REG_NOTBOL 1 + +/* Like REG_NOTBOL, except for the end-of-line. */ +#define REG_NOTEOL (1 << 1) + + +/* If any error codes are removed, changed, or added, update the + `re_error_msg' table in regex.c. */ +typedef enum +{ + REG_NOERROR = 0, /* Success. */ + REG_NOMATCH, /* Didn't find a match (for regexec). */ + + /* POSIX regcomp return error codes. (In the order listed in the + standard.) */ + REG_BADPAT, /* Invalid pattern. */ + REG_ECOLLATE, /* Not implemented. */ + REG_ECTYPE, /* Invalid character class name. */ + REG_EESCAPE, /* Trailing backslash. */ + REG_ESUBREG, /* Invalid back reference. */ + REG_EBRACK, /* Unmatched left bracket. */ + REG_EPAREN, /* Parenthesis imbalance. */ + REG_EBRACE, /* Unmatched \{. */ + REG_BADBR, /* Invalid contents of \{\}. */ + REG_ERANGE, /* Invalid range end. */ + REG_ESPACE, /* Ran out of memory. */ + REG_BADRPT, /* No preceding re for repetition op. */ + + /* Error codes we've added. */ + REG_EEND, /* Premature end. */ + REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ + REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ +} reg_errcode_t; + +/* This data structure represents a compiled pattern. Before calling + the pattern compiler, the fields `buffer', `allocated', `fastmap', + `translate', and `no_sub' can be set. After the pattern has been + compiled, the `re_nsub' field is available. All other fields are + private to the regex routines. */ + +struct re_pattern_buffer +{ +/* [[[begin pattern_buffer]]] */ + /* Space that holds the compiled pattern. It is declared as + `unsigned char *' because its elements are + sometimes used as array indexes. */ + unsigned char *buffer; + + /* Number of bytes to which `buffer' points. */ + unsigned long allocated; + + /* Number of bytes actually used in `buffer'. */ + unsigned long used; + + /* Syntax setting with which the pattern was compiled. */ + reg_syntax_t syntax; + + /* Pointer to a fastmap, if any, otherwise zero. re_search uses + the fastmap, if there is one, to skip over impossible + starting points for matches. */ + char *fastmap; + + /* Either a translate table to apply to all characters before + comparing them, or zero for no translation. The translation + is applied to a pattern when it is compiled and to a string + when it is matched. */ + char *translate; + + /* Number of subexpressions found by the compiler. */ + size_t re_nsub; + + /* Zero if this pattern cannot match the empty string, one else. + Well, in truth it's used only in `re_search_2', to see + whether or not we should use the fastmap, so we don't set + this absolutely perfectly; see `re_compile_fastmap' (the + `duplicate' case). */ + unsigned can_be_null : 1; + + /* If REGS_UNALLOCATED, allocate space in the `regs' structure + for `max (RE_NREGS, re_nsub + 1)' groups. + If REGS_REALLOCATE, reallocate space if necessary. + If REGS_FIXED, use what's there. */ +#define REGS_UNALLOCATED 0 +#define REGS_REALLOCATE 1 +#define REGS_FIXED 2 + unsigned regs_allocated : 2; + + /* Set to zero when `regex_compile' compiles a pattern; set to one + by `re_compile_fastmap' if it updates the fastmap. */ + unsigned fastmap_accurate : 1; + + /* If set, `re_match_2' does not return information about + subexpressions. */ + unsigned no_sub : 1; + + /* If set, a beginning-of-line anchor doesn't match at the + beginning of the string. */ + unsigned not_bol : 1; + + /* Similarly for an end-of-line anchor. */ + unsigned not_eol : 1; + + /* If true, an anchor at a newline matches. */ + unsigned newline_anchor : 1; + +/* [[[end pattern_buffer]]] */ +}; + +typedef struct re_pattern_buffer regex_t; + + +/* search.c (search_buffer) in Emacs needs this one opcode value. It is + defined both in `regex.c' and here. */ +#define RE_EXACTN_VALUE 1 + +/* Type for byte offsets within the string. POSIX mandates this. */ +typedef int regoff_t; + + +/* This is the structure we store register match data in. See + regex.texinfo for a full description of what registers match. */ +struct re_registers +{ + unsigned num_regs; + regoff_t *start; + regoff_t *end; +}; + + +/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer, + `re_match_2' returns information about at least this many registers + the first time a `regs' structure is passed. */ +#ifndef RE_NREGS +#define RE_NREGS 30 +#endif + + +/* POSIX specification for registers. Aside from the different names than + `re_registers', POSIX uses an array of structures, instead of a + structure of arrays. */ +typedef struct +{ + regoff_t rm_so; /* Byte offset from string's start to substring's start. */ + regoff_t rm_eo; /* Byte offset from string's start to substring's end. */ +} regmatch_t; + +/* Declarations for routines. */ + +/* To avoid duplicating every routine declaration -- once with a + prototype (if we are ANSI), and once without (if we aren't) -- we + use the following macro to declare argument types. This + unfortunately clutters up the declarations a bit, but I think it's + worth it. */ + +#if __STDC__ + +#define _RE_ARGS(args) args + +#else /* not __STDC__ */ + +#define _RE_ARGS(args) () + +#endif /* not __STDC__ */ + +/* Sets the current default syntax to SYNTAX, and return the old syntax. + You can also simply assign to the `re_syntax_options' variable. */ +extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax)); + +/* Compile the regular expression PATTERN, with length LENGTH + and syntax given by the global `re_syntax_options', into the buffer + BUFFER. Return NULL if successful, and an error string if not. */ +extern const char *re_compile_pattern + _RE_ARGS ((const char *pattern, int length, + struct re_pattern_buffer *buffer)); + + +/* Compile a fastmap for the compiled pattern in BUFFER; used to + accelerate searches. Return 0 if successful and -2 if was an + internal error. */ +extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer)); + + +/* Search in the string STRING (with length LENGTH) for the pattern + compiled into BUFFER. Start searching at position START, for RANGE + characters. Return the starting position of the match, -1 for no + match, or -2 for an internal error. Also return register + information in REGS (if REGS and BUFFER->no_sub are nonzero). */ +extern int re_search + _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, + int length, int start, int range, struct re_registers *regs)); + + +/* Like `re_search', but search in the concatenation of STRING1 and + STRING2. Also, stop searching at index START + STOP. */ +extern int re_search_2 + _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, + int length1, const char *string2, int length2, + int start, int range, struct re_registers *regs, int stop)); + + +/* Like `re_search', but return how many characters in STRING the regexp + in BUFFER matched, starting at position START. */ +extern int re_match + _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, + int length, int start, struct re_registers *regs)); + + +/* Relates to `re_match' as `re_search_2' relates to `re_search'. */ +extern int re_match_2 + _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, + int length1, const char *string2, int length2, + int start, struct re_registers *regs, int stop)); + + +/* Set REGS to hold NUM_REGS registers, storing them in STARTS and + ENDS. Subsequent matches using BUFFER and REGS will use this memory + for recording register information. STARTS and ENDS must be + allocated with malloc, and must each be at least `NUM_REGS * sizeof + (regoff_t)' bytes long. + + If NUM_REGS == 0, then subsequent matches should allocate their own + register data. + + Unless this function is called, the first search or match using + PATTERN_BUFFER will allocate its own register data, without + freeing the old data. */ +extern void re_set_registers + _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs, + unsigned num_regs, regoff_t *starts, regoff_t *ends)); + +/* 4.2 bsd compatibility. */ +extern char *re_comp _RE_ARGS ((const char *)); +extern int re_exec _RE_ARGS ((const char *)); + +/* POSIX compatibility. */ +extern int regcomp _RE_ARGS ((regex_t *preg, const char *pattern, int cflags)); +extern int regexec + _RE_ARGS ((const regex_t *preg, const char *string, size_t nmatch, + regmatch_t pmatch[], int eflags)); +extern size_t regerror + _RE_ARGS ((int errcode, const regex_t *preg, char *errbuf, + size_t errbuf_size)); +extern void regfree _RE_ARGS ((regex_t *preg)); + +#endif /* not __REGEXP_LIBRARY_H__ */ + +/* +Local variables: +make-backup-files: t +version-control: t +trim-versions-without-asking: nil +End: +*/ diff --git a/include/common.h b/include/common.h index 903dbc8d9..5e554ed7d 100644 --- a/include/common.h +++ b/include/common.h @@ -56,6 +56,8 @@ #define BMAGIC 0x4675636B596F754661736369737473 +#define BASE_VERSION "Unreal" + #ifndef NULL #define NULL 0 #endif @@ -85,6 +87,8 @@ void free(); #endif +#define TS time_t + extern int match PROTO((char *, char *)); #define mycmp(a,b) \ ( (toupper((a)[0])!=toupper((b)[0])) || smycmp((a)+1,(b)+1) ) @@ -115,7 +119,7 @@ extern int inet_netof PROTO((struct IN_ADDR)); #endif int global_count, max_global_count; -extern char *myctime PROTO((time_t)); +extern char *myctime PROTO((TS)); extern char *strtoken PROTO((char **, char *, char *)); #define PRECISE_CHECK @@ -225,7 +229,7 @@ extern struct SLink *find_user_link( /* struct SLink *, struct Client * */ ); " CHANTYPES=%s" \ " PREFIX=%s" \ " :are supported by this server" - + #define PROTOCTL_PARAMETERS MAXWATCH, \ MAXSILES, \ MAXMODEPARAMS, \ @@ -235,7 +239,7 @@ extern struct SLink *find_user_link( /* struct SLink *, struct Client * */ ); TOPICLEN, \ TOPICLEN, \ "#", \ - "(ohv)@%+" + "(ohv)@%+" /* Server-Server PROTOCTL -Stskeeps */ #define PROTOCTL_SERVER "NOQUIT TOKEN NICKv2 SJOIN SJOIN2 UMODE2 VL SJ3 NS" ZIPSTUFF @@ -257,6 +261,30 @@ extern int lu_noninv, lu_inv, lu_serv, lu_oper, lu_unknown, lu_channel, lu_lu, lu_lulocal, lu_lserv, lu_clu, lu_mlu, lu_cglobalu, lu_mglobalu; -time_t now; +TS now; + +#if defined(__STDC__) +#define __const const +#define __signed signed +#define __volatile volatile +#ifndef __GNUC__ +#define __inline +#endif + +#else +#ifndef __GNUC__ +#define __const +#define __inline +#define __signed +#define __volatile +#ifndef NO_ANSI_KEYWORDS +#define const /* delete ANSI C keywords */ +#define inline +#define signed +#define volatile +#endif +#endif +#endif + #endif /* __common_include__ */ diff --git a/include/config.h b/include/config.h index f684a12cc..1e92477e7 100644 --- a/include/config.h +++ b/include/config.h @@ -93,6 +93,10 @@ */ #define ADMINCHAT 1 +/* + If you want SHUN_NOTICES, define this +*/ +#undef SHUN_NOTICES /* Remote rehash diff --git a/include/h.h b/include/h.h index a43182644..9a3b25b41 100644 --- a/include/h.h +++ b/include/h.h @@ -34,14 +34,14 @@ extern char *getreply(int); #define rpl_str(x) getreply(x) #define err_str(x) getreply(x) -extern time_t nextconnect, nextdnscheck, nextping; +extern TS nextconnect, nextdnscheck, nextping; extern aClient *client, me, *local[]; extern aChannel *channel; extern struct stats *ircstp; extern int bootopt; -extern time_t TSoffset; +extern TS TSoffset; /* Prototype added to force errors -- Barubary */ -extern time_t check_pings(time_t now, int check_kills); +extern TS check_pings(TS now, int check_kills); /* Remmed out for win32 compatibility.. as stated of 467leaf win32 port.. */ @@ -171,9 +171,9 @@ extern int inetport PROTO((aClient *, char *, int)); extern void init_sys PROTO(()); #ifdef NO_FDLIST -extern int read_message PROTO((time_t)); +extern int read_message PROTO((TS)); #else -extern int read_message PROTO((time_t, fdlist *)); +extern int read_message PROTO((TS, fdlist *)); #endif extern void report_error PROTO((char *, aClient *)); @@ -254,7 +254,7 @@ extern int check_registered_user PROTO((aClient *)); extern char *get_client_name PROTO((aClient *, int)); extern char *get_client_host PROTO((aClient *)); extern char *my_name_for_link PROTO((char *, aConfItem *)); -extern char *myctime PROTO((time_t)), *date PROTO((time_t)); +extern char *myctime PROTO((TS)), *date PROTO((TS)); extern int exit_client PROTO((aClient *, aClient *, aClient *, char *)); extern void initstats PROTO(()), tstats PROTO((aClient *, char *)); extern char *check_string PROTO((char *)); @@ -308,8 +308,8 @@ extern struct hostent *gethost_byaddr PROTO((char *, Link *)); extern struct hostent *gethost_byname PROTO((char *, Link *)); extern void flush_cache PROTO(()); extern int init_resolver PROTO((int)); -extern time_t timeout_query_list PROTO((time_t)); -extern time_t expire_cache PROTO((time_t)); +extern TS timeout_query_list PROTO((TS)); +extern TS expire_cache PROTO((TS)); extern void del_queries PROTO((char *)); extern void clear_channel_hash_table PROTO(()); diff --git a/include/msg.h b/include/msg.h index d10049f47..796ed18a7 100644 --- a/include/msg.h +++ b/include/msg.h @@ -362,6 +362,10 @@ extern int m_chgname(), m_shun(), m_post(); #ifdef CRYPTOIRCD extern int m_crypto(); #endif +#ifdef GUEST +extern int m_guest(); +#endif + #ifdef MSGTAB struct Message *msgmap[256]; diff --git a/include/sock.h b/include/sock.h index e09c8f8ed..1d508c7f8 100644 --- a/include/sock.h +++ b/include/sock.h @@ -23,6 +23,9 @@ * $Id$ * * $Log$ + * Revision 1.1.1.1.6.6 2000/08/20 11:40:42 stskeeps + * Upgrade to Unreal3.1-Silverheart+ + * * Revision 1.1.1.1.6.1.2.1 2000/07/14 20:22:57 stskeeps * +- Indentation and more SJ3 fixes * diff --git a/include/struct.h b/include/struct.h index 9288c6d65..0bfc56c32 100644 --- a/include/struct.h +++ b/include/struct.h @@ -593,7 +593,7 @@ typedef struct Whowas { char *realname; char *away; long umodes; - time_t logoff; + TS logoff; struct Client *online; /* Pointer to new nickname for chasing or NULL */ struct Whowas *next; /* for hash table... */ struct Whowas *prev; /* for hash table... */ @@ -623,7 +623,7 @@ struct ConfItem { char *passwd; char *name; int port; - time_t hold; /* Hold action until this time (calendar time) */ + TS hold; /* Hold action until this time (calendar time) */ int tmpconf; #ifndef VMSP aClass *class; /* Class of connection */ @@ -683,7 +683,7 @@ struct User { Link *invited; /* chain of invite pointer blocks */ Link *silence; /* chain of silence pointer blocks */ char *away; /* pointer to away message */ - time_t last; + TS last; u_int32_t servicestamp; /* Services' time stamp variable */ int refcnt; /* Number of times this block is referenced */ int joined; /* number of channels joined */ @@ -705,8 +705,9 @@ struct Server { char *up; /* uplink for this server */ char by[NICKLEN + 1]; aConfItem *nline; /* N-line pointer for this server */ - time_t timestamp; /* Remotely determined connect try time */ - unsigned short numeric; /* NS numeric, 0 if none */ + TS timestamp; /* Remotely determined connect try time */ + unsigned short numeric; /* NS numeric, 0 if none */ + long users; #ifdef LIST_DEBUG aClient *bcptr; #endif @@ -732,7 +733,7 @@ struct t_vhost { #define TKL_ZAP 0x0002 #define TKL_GLOBAL 0x0004 #define TKL_SHUN 0x0008 - +#define TKL_QUIET 0x0010 struct t_kline { int type; @@ -740,8 +741,8 @@ struct t_kline { char *hostmask; char *reason; char *setby; - time_t expire_at; - time_t set_at; + TS expire_at; + TS set_at; aTKline *next; aTKline *prev; }; @@ -792,12 +793,12 @@ struct Client { struct Client *next, *prev, *hnext; anUser *user; /* ...defined, if this is a User */ aServer *serv; /* ...defined, if this is a server */ - time_t lasttime; /* ...should be only LOCAL clients? --msa */ - time_t firsttime; /* time client was created */ - time_t since; /* last time we parsed something */ - time_t lastnick; /* TimeStamp on nick */ - time_t nextnick; /* Time the next nick change will be allowed */ - time_t nexttarget; /* Time until a change in targets is allowed */ + TS lasttime; /* ...should be only LOCAL clients? --msa */ + TS firsttime; /* time client was created */ + TS since; /* last time we parsed something */ + TS lastnick; /* TimeStamp on nick */ + TS nextnick; /* Time the next nick change will be allowed */ + TS nexttarget; /* Time until a change in targets is allowed */ u_char targets[MAXTARGETS]; /* Hash values of current targets */ aWhowas *whowas; long flags; /* client flags */ @@ -862,7 +863,7 @@ struct Client { */ char passwd[PASSWDLEN + 1]; #ifdef DEBUGMODE - time_t cputime; + TS cputime; #endif }; @@ -884,8 +885,8 @@ struct stats { unsigned long is_ckr; /* k-bytes received to clients */ unsigned long is_sks; /* k-bytes sent to servers */ unsigned long is_skr; /* k-bytes received to servers */ - time_t is_cti; /* time spent connected by clients */ - time_t is_sti; /* time spent connected by servers */ + TS is_cti; /* time spent connected by clients */ + TS is_sti; /* time spent connected by servers */ unsigned int is_ac; /* connections accepted */ unsigned int is_ref; /* accepts refused */ unsigned int is_unco; /* unknown commands */ @@ -908,11 +909,11 @@ struct ListOptions { short int showall; unsigned short usermin; int usermax; - time_t currenttime; - time_t chantimemin; - time_t chantimemax; - time_t topictimemin; - time_t topictimemax; + TS currenttime; + TS chantimemin; + TS chantimemax; + TS topictimemin; + TS topictimemax; }; /* mode structure for channels */ @@ -928,7 +929,7 @@ struct SMode { /* x:y */ int msgs; /* x */ int per; /* y */ - unsigned short kmode; /* mode 0 = kick 1 = ban */ + unsigned short kmode; /* mode 0 = kick 1 = ban */ }; /* Message table structure */ @@ -953,7 +954,7 @@ struct Message { struct Notify { aNotify *hnext; - time_t lasttime; + TS lasttime; Link *notify; char nick[1]; }; @@ -974,7 +975,7 @@ struct SLink { struct { char *banstr; char *who; - time_t when; + TS when; } ban; } value; }; @@ -983,7 +984,7 @@ struct SBan { struct SBan *next; char *banstr; char *who; - time_t when; + TS when; }; struct DSlink { @@ -1002,10 +1003,10 @@ struct DSlink { struct Channel { struct Channel *nextch, *prevch, *hnextch; Mode mode; - time_t creationtime; + TS creationtime; char *topic; char *topic_nick; - time_t topic_time; + TS topic_time; int users; Link *members; Link *invites; @@ -1099,7 +1100,7 @@ struct Channel { struct FloodOpt { int nmsg; - time_t lastmsg; + TS lastmsg; }; /* Misc macros */ diff --git a/include/version.h b/include/version.h index 0433218af..904ed9618 100644 --- a/include/version.h +++ b/include/version.h @@ -36,11 +36,10 @@ #define PATCH6 "" #define PATCH7 "" #define PATCH8 COMPILEINFO -#define PATCH9 "" -#ifndef _WIN32 -#define BASE_VERSION "Unreal" +#ifdef _WIN32 +#define PATCH9 "+win32" #else -#define BASE_VERSION "UnrealIRCd/32 v" +#define PATCH9 "" #endif /* release header */ #define Rh BASE_VERSION diff --git a/keys/.KEYS b/keys/.KEYS new file mode 100644 index 000000000..9c558e357 --- /dev/null +++ b/keys/.KEYS @@ -0,0 +1 @@ +. diff --git a/makefile.win32 b/makefile.win32 index 408ff37f2..21549d22e 100644 --- a/makefile.win32 +++ b/makefile.win32 @@ -35,7 +35,7 @@ OBJ_FILES=SRC/CHANNEL.OBJ SRC/USERLOAD.OBJ SRC/SEND.OBJ SRC/BSD.OBJ \ SRC/HELP.OBJ SRC/S_MISC.OBJ SRC/MATCH.OBJ SRC/CRULE.OBJ \ SRC/S_DEBUG.OBJ SRC/RES_INIT.OBJ SRC/SUPPORT.OBJ SRC/LIST.OBJ \ SRC/S_ERR.OBJ SRC/PACKET.OBJ SRC/CLASS.OBJ SRC/S_BSD.OBJ \ - SRC/MD5.OBJ SRC/S_SERV.OBJ SRC/S_USER.OBJ SRC/WIN32GUI.OBJ \ + SRC/S_SERV.OBJ SRC/S_USER.OBJ SRC/WIN32GUI.OBJ \ SRC/VERSION.OBJ SRC/win32/WIN32.RES SRC/S_UNREAL.OBJ SRC/DYNCONF.OBJ \ SRC/S_SOCKS.OBJ SRC/S_KLINE.OBJ SRC/S_EXTRA.OBJ SRC/IRCSPRINTF.OBJ SRC/LUSERS.OBJ \ SRC/SCACHE.OBJ SRC/ALN.OBJ diff --git a/networks/unreal-test.network b/networks/unreal-test.network index dc5ec44cf..12654ecfd 100644 --- a/networks/unreal-test.network +++ b/networks/unreal-test.network @@ -25,5 +25,5 @@ Set netdomain .....: testnet.ircsystems.net Set helpchan ......: #testnet Set STATS_SERVER ..: stats.testnet.ircsystems.net Set HUB ...........: 1 -Set iNAH ..........: 0 +Set iNAH ..........: 1 Set net_quit ......: test diff --git a/src/aln.c b/src/aln.c index a0086028f..160c66a29 100644 --- a/src/aln.c +++ b/src/aln.c @@ -55,6 +55,11 @@ static inline unsigned long base64_to_int(char *); static Link *servers = NULL; +Link *return_servers(void) +{ + return(servers); +} + char *base64enc(unsigned long i) { return int_to_base64(i); diff --git a/src/channel.c b/src/channel.c index 51f37591c..baed8fda6 100644 --- a/src/channel.c +++ b/src/channel.c @@ -770,7 +770,7 @@ static int send_mode_list(cptr, chname, creationtime, top, mask, flag) Link *top; int mask; char flag, *chname; - time_t creationtime; + TS creationtime; { Link *lp; char *cp, *name; @@ -1450,7 +1450,7 @@ void make_mode_str(chptr, oldm, oldl, pcount, pvar, mode_buf, parabuf, bounce) *x++ = 'l'; if (bounce) chptr->mode.limit = oldl; /* set it back */ - ircsprintf(parabuf, "%s%d", parabuf, chptr->mode.limit); + ircsprintf(parabuf, "%s%d ", parabuf, chptr->mode.limit); } } /* reconstruct bkov chain */ @@ -1523,7 +1523,7 @@ int do_mode_char(chptr, modetype, modechar, param, what, cptr, pcount, pvar, char *xp; chasing = 0; - if (opermode == 2 && !is_chan_op(cptr, chptr)) + if (opermode == 2 && !is_chan_op(cptr, chptr) && !IsULine(cptr,cptr)) { /* Ugly halfop hack --sts - this allows halfops to do +b +e +v and so on */ @@ -2194,7 +2194,7 @@ int DoesOp(modebuf) int sendmodeto_one(cptr, from, name, mode, param, creationtime) aClient *cptr; char *from, *name, *mode, *param; - time_t creationtime; + TS creationtime; { if ((IsServer(cptr) && DoesOp(mode) && creationtime) || IsULine(cptr, cptr)) @@ -2431,7 +2431,7 @@ static aChannel *get_channel(cptr, chname, flag) chptr->topic_nick = NULL; chptr->prevch = NULL; chptr->nextch = channel; - chptr->creationtime = MyClient(cptr) ? TStime() : (time_t) 0; + chptr->creationtime = MyClient(cptr) ? TStime() : (TS)0; channel = chptr; (void)add_to_channel_hash_table(chname, chptr); IRCstats.channels++; @@ -2735,8 +2735,9 @@ int channel_link(cptr, sptr, parc, parv) if (MyClient(sptr)) sendto_one(sptr, ":%s!%s@%s JOIN :%s", sptr->name, sptr->user->username, - (IsHidden(sptr) ? sptr->user-> - virthost : sptr->user->realhost), name); + (IsHidden(sptr) ? sptr-> + user->virthost : sptr->user->realhost), + name); sendto_umode(UMODE_NETADMIN | UMODE_TECHADMIN, "*** Invisible(+I) user %s joined %s", sptr->name, chptr->chname); @@ -2962,34 +2963,33 @@ int m_join(cptr, sptr, parc, parv) { sendto_one(sptr, ":%s!%s@%s JOIN :%s", sptr->name, sptr->user->username, - (IsHidden(sptr) ? sptr->user-> - virthost : sptr->user->realhost), + (IsHidden(sptr) ? sptr-> + user->virthost : sptr->user->realhost), chptr->chname); sendto_umode(UMODE_ADMIN, "*** [+I] %s invisible joined %s", sptr->name, chptr->chname); - sendto_serv_butone_token(&me, me.name, - MSG_SMO, TOK_SMO, - "A :[+I] %s invisible joined %s", + sendto_serv_butone_token(&me, me.name, MSG_SMO, + TOK_SMO, "A :[+I] %s invisible joined %s", sptr->name, chptr->chname); } } - else if (chptr->mode.mode & MODE_AUDITORIUM) { + else if (chptr->mode.mode & MODE_AUDITORIUM) + { if (MyClient(sptr)) sendto_one(sptr, ":%s!%s@%s JOIN :%s", - sptr->name, sptr->user->username, - (IsHidden(sptr) ? sptr->user-> - virthost : sptr->user->realhost), - chptr->chname); - sendto_chanops_butone(NULL, chptr, ":%s!%s@%s JOIN :%s", - sptr->name, sptr->user->username, - (IsHidden(sptr) ? sptr->user-> - virthost : sptr->user->realhost), - chptr->chname); - } + sptr->name, sptr->user->username, + (IsHidden(sptr) ? sptr-> + user->virthost : sptr->user->realhost), + chptr->chname); + sendto_chanops_butone(NULL, chptr, ":%s!%s@%s JOIN :%s", + sptr->name, sptr->user->username, + (IsHidden(sptr) ? sptr->user->virthost : sptr-> + user->realhost), chptr->chname); + } else sendto_channel_butserv(chptr, sptr, - ":%s JOIN :%s", parv[0], chptr->chname); + ":%s JOIN :%s", parv[0], chptr->chname); sendto_serv_butone_token(cptr, parv[0], MSG_JOIN, TOK_JOIN, "%s", chptr->chname); @@ -3129,61 +3129,72 @@ int m_part(cptr, sptr, parc, parv) sptr->user->realhost), chptr->chname, comment); } - else if (chptr->mode.mode & MODE_AUDITORIUM) { - if (MyClient(sptr)) { - if (parc < 3) { - sendto_chanops_butone(NULL, chptr, - ":%s!%s@%s PART %s", - sptr->name, - sptr->user->username, - (IsHidden(sptr) ? - sptr->user->virthost : - sptr->user->realhost), - chptr->chname); - if (!is_chan_op(sptr, chptr)) - sendto_one(sptr, ":%s!%s@%s PART %s", - sptr->name, - sptr->user->username, - (IsHidden(sptr) ? - sptr->user->virthost : - sptr->user->realhost), - chptr->chname); - } - else { - sendto_chanops_butone(NULL, chptr, - ":%s!%s@%s PART %s %s", - sptr->name, - sptr->user->username, - (IsHidden(sptr) ? - sptr->user->virthost : - sptr->user->realhost), - chptr->chname, comment); - if (!is_chan_op(cptr, chptr)) - sendto_one(sptr, ":%s!%s@%s PART %s %s", - sptr->name, - sptr->user->username, - (IsHidden(sptr) ? - sptr->user->virthost : - sptr->user->realhost), - chptr->chname, comment); + else if (chptr->mode.mode & MODE_AUDITORIUM) + { + if (MyClient(sptr)) + { + if (parc < 3) + { + sendto_chanops_butone(NULL, + chptr, ":%s!%s@%s PART %s", + sptr->name, + sptr->user->username, + (IsHidden(sptr) ? sptr-> + user->virthost : sptr-> + user->realhost), + chptr->chname); + if (!is_chan_op(sptr, chptr)) + sendto_one(sptr, + ":%s!%s@%s PART %s", + sptr->name, + sptr->user-> + username, + (IsHidden(sptr) ? + sptr->user-> + virthost : sptr-> + user->realhost), + chptr->chname); + } + else + { + sendto_chanops_butone(NULL, + chptr, + ":%s!%s@%s PART %s %s", + sptr->name, + sptr->user->username, + (IsHidden(sptr) ? sptr-> + user->virthost : sptr-> + user->realhost), + chptr->chname, comment); + if (!is_chan_op(cptr, chptr)) + sendto_one(sptr, + ":%s!%s@%s PART %s %s", + sptr->name, + sptr->user-> + username, + (IsHidden(sptr) ? + sptr->user-> + virthost : sptr-> + user->realhost), + chptr->chname, + comment); + } } } - } - else { + else + { - if (MyClient(sptr)) { if (parc < 3) - + sendto_channel_butserv(chptr, - sptr, PartFmt, parv[0], - chptr->chname); + sptr, PartFmt, parv[0], + chptr->chname); else sendto_channel_butserv(chptr, - sptr, PartFmt2, parv[0], - chptr->chname, comment); + sptr, PartFmt2, parv[0], + chptr->chname, comment); } - } remove_user_from_channel(sptr, chptr); } } @@ -3280,8 +3291,10 @@ int m_kick(cptr, sptr, parc, parv) } if (IsOper(sptr)) - if (!is_chan_op(sptr, chptr) && !is_halfop(sptr, chptr) - || (is_halfop(sptr, chptr) && is_chan_op(who, chptr))) + if (!is_chan_op(sptr, chptr) + && !is_halfop(sptr, chptr) + || (is_halfop(sptr, chptr) + && is_chan_op(who, chptr))) { sendto_umode(UMODE_EYES, "*** OperKick [%s @ %s -> %s (%s)]", @@ -3293,8 +3306,9 @@ int m_kick(cptr, sptr, parc, parv) if (is_chanprot(who, chptr) || is_chanowner(who, chptr) || IsServices(who)) - if IsOper(sptr) - { /* IRCop kicking owner/prot */ + if (IsNetAdmin + (sptr) || IsTechAdmin(sptr)) + { /* IRCop kicking owner/prot */ sendto_umode(UMODE_EYES, "*** OperKick [%s @ %s -> %s (%s)]", sptr->name, @@ -3302,7 +3316,8 @@ int m_kick(cptr, sptr, parc, parv) who->name, comment); goto attack; } - else if (!IsULine(cptr, sptr) && who != sptr) + else if (!IsULine(cptr, sptr) + && who != sptr) { sendto_one(sptr, ":%s NOTICE %s :*** You cannot kick %s from %s because %s is channel protected", @@ -3396,7 +3411,7 @@ int m_topic(cptr, sptr, parc, parv) { aChannel *chptr = NullChn; char *topic = NULL, *name, *p = NULL, *tnick = NULL; - time_t ttime = 0; + TS ttime = 0; int topiClen = 0; int nicKlen = 0; @@ -3704,17 +3719,19 @@ void send_list(aClient *cptr, int numsend) && !IsMember(cptr, chptr) && !IsAnOper(cptr)) continue; - - if ((!lopt->showall) - && ((chptr->users < lopt->usermin) || ((lopt->usermax >= 0) + + if ((!lopt->showall) + && ((chptr->users < lopt->usermin) + || ((lopt->usermax >= 0) && (chptr->users > lopt->usermax)) - || ((chptr->creationtime) <= lopt->chantimemin) - /* || (chptr->topic_time < - lopt->topictimemin) - || (chptr->creationtime >= - lopt->chantimemax) - || (chptr->topic_time > - lopt->topictimemax) */)) + || ((chptr->creationtime) <= + lopt->chantimemin) + /* || (chptr->topic_time < + lopt->topictimemin) + || (chptr->creationtime >= + lopt->chantimemax) + || (chptr->topic_time > + lopt->topictimemax) */ )) continue; if (lopt->nolist && @@ -3831,8 +3848,8 @@ int check_for_chan_flood(cptr, sptr, chptr) if (chptr->mode.kmode == 1) { /* ban. */ ircsprintf(mask, "*!*@%s", - (IsHidden(sptr) ? sptr->user->virthost : sptr-> - user->realhost)); + (IsHidden(sptr) ? sptr->user-> + virthost : sptr->user->realhost)); add_banid(&me, chptr, mask); sendto_serv_butone(&me, ":%s MODE %s +b %s 0", me.name, chptr->chname, mask); @@ -3859,13 +3876,13 @@ int check_for_chan_flood(cptr, sptr, chptr) int m_list(aClient *cptr, aClient *sptr, int parc, char *parv[]) { aChannel *chptr; - time_t currenttime = time(NULL); + TS currenttime = time(NULL); char *name, *p = NULL; LOpts *lopt = NULL; Link *lp, *next; int usermax, usermin, error = 0, doall = 0; - time_t chantimemin, chantimemax; - time_t topictimemin, topictimemax; + TS chantimemin, chantimemax; + TS topictimemin, topictimemax; Link *yeslist = NULL, *nolist = NULL; static char *usage[] = { @@ -4165,10 +4182,12 @@ int m_names(cptr, sptr, parc, parv) if (IsHiding(acptr) && acptr != sptr) continue; if (chptr->mode.mode & MODE_AUDITORIUM) - if (!is_chan_op(sptr, chptr) && !is_chanprot(sptr, chptr) && - !is_chanowner(sptr, chptr)) - if (!(cm->flags & (CHFL_CHANOP | CHFL_CHANPROT | CHFL_CHANOWNER)) - && acptr != sptr) + if (!is_chan_op(sptr, chptr) + && !is_chanprot(sptr, chptr) + && !is_chanowner(sptr, chptr)) + if (!(cm-> + flags & (CHFL_CHANOP | CHFL_CHANPROT | + CHFL_CHANOWNER)) && acptr != sptr) continue; if (cm->flags & CHFL_CHANOP) @@ -4437,7 +4456,7 @@ int m_sjoin(cptr, sptr, parc, parv) aClient *acptr, *tempptr; aChannel *chptr; Link *lp; - Ban *ban; + Ban *ban; aParv *ap; int ts, oldts, pcount, x, y, z, i, f; unsigned short b, c; @@ -4849,12 +4868,12 @@ int m_sjoin(cptr, sptr, parc, parv) { sendto_one(sptr, ":%s KICK %s %s :Fake direction", - me.name,chptr->chname, acptr->name); + me.name, chptr->chname, + acptr->name); sendto_ops ("Fake direction from user %s in SJOIN from %s(%s) at %s", - nick, - sptr->from->name, sptr->name, - chptr->chname); + nick, sptr->srvptr->name, + sptr->name, chptr->chname); goto nextnick; } if (removetheirs) @@ -4881,20 +4900,26 @@ int m_sjoin(cptr, sptr, parc, parv) goto nextnick; if (modeflags & CHFL_BAN) { - add_banid(sptr, chptr, nick); - Addit('b', nick); - AddBan(nick); + f = add_banid(sptr, chptr, nick); + if (f != -1) + { + Addit('b', nick); + AddBan(nick); + } } if (modeflags & CHFL_EXCEPT) { - add_exbanid(sptr, chptr, nick); - Addit('e', nick); - AddEx(nick); + f = add_exbanid(sptr, chptr, nick); + if (f != -1) + { + Addit('e', nick); + AddEx(nick); + } } } } -nextnick: + nextnick: t++; c++; } @@ -4924,7 +4949,7 @@ nextnick: if (!parv[i]) { sendto_ops("Got null parv in SJ3 code"); - continue; + continue; } strcat(parabuf, parv[i]); if (((i + 1) <= (parc - 2))) @@ -4934,7 +4959,8 @@ nextnick: /* This sends out to SJ3 servers .. */ sendto_serv_butone_token_opt(cptr, OPT_SJOIN | OPT_SJ3, sptr->name, MSG_SJOIN, TOK_SJOIN, "%s :%s", parabuf, parv[parc - 1]); - Debug((DEBUG_DEBUG, "Sending '%s :%s' to sj3", parabuf, parv[parc - 1])); + Debug((DEBUG_DEBUG, "Sending '%s :%s' to sj3", parabuf, + parv[parc - 1])); /* We strip out & and " here, for SJ2 */ strcpy(parabuf, ""); t = parv[parc - 1]; @@ -4961,33 +4987,36 @@ nextnick: sendto_serv_butone_token_opt(cptr, OPT_SJOIN | OPT_SJOIN2 | OPT_NOT_SJ3, sptr->name, MSG_SJOIN, TOK_SJOIN, "%s %s + <-> :%s", parv[1], parv[2], parabuf); - Debug((DEBUG_DEBUG, "Sending to SJ2: %s %s + <-> :%s", parv[1], parv[2], parabuf)); + Debug((DEBUG_DEBUG, "Sending to SJ2: %s %s + <-> :%s", parv[1], + parv[2], parabuf)); if (*banbuf) { - for (s = (char *) strtok(banbuf, " "); s && (*s != ' '); s = (char *) strtok(NULL, " ")) + for (s = (char *)strtok(banbuf, " "); s && (*s != ' '); + s = (char *)strtok(NULL, " ")) { sendto_serv_butone_token_opt(cptr, - OPT_SJOIN2|OPT_NOT_SJ3, - sptr->name, MSG_MODE, TOK_MODE, - "%s +b %s %li", chptr->chname, s, - chptr->creationtime); - } + OPT_SJOIN2 | OPT_NOT_SJ3, + sptr->name, MSG_MODE, TOK_MODE, + "%s +b %s %li", chptr->chname, s, + chptr->creationtime); + } } - + if (*exbuf) { - for (s = (char *) strtok(exbuf, " "); s && (*s != ' '); s = (char *) strtok(NULL, " ")) + for (s = (char *)strtok(exbuf, " "); s && (*s != ' '); + s = (char *)strtok(NULL, " ")) { sendto_serv_butone_token_opt(cptr, - OPT_SJOIN2|OPT_NOT_SJ3, - sptr->name, MSG_MODE, TOK_MODE, - "%s +e %s %li", chptr->chname, s, - chptr->creationtime); - } + OPT_SJOIN2 | OPT_NOT_SJ3, + sptr->name, MSG_MODE, TOK_MODE, + "%s +e %s %li", chptr->chname, s, + chptr->creationtime); + } } return 0; } - + if (nopara) { sendto_serv_butone_token_opt(cptr, @@ -4995,35 +5024,37 @@ nextnick: TOK_SJOIN, "%s %s %s <-> :%s", parv[1], parv[2], parv[3], parabuf); Debug((DEBUG_DEBUG, "Sending to SJ2: %s %s %s <-> :%s", - parv[1], parv[2], parv[3], parabuf)); + parv[1], parv[2], parv[3], parabuf)); if (*banbuf) { - for (s = (char *) strtok(banbuf, " "); s && (*s != ' '); s = (char *) strtok(NULL, " ")) + for (s = (char *)strtok(banbuf, " "); s && (*s != ' '); + s = (char *)strtok(NULL, " ")) { sendto_serv_butone_token_opt(cptr, - OPT_SJOIN2|OPT_NOT_SJ3, - sptr->name, MSG_MODE, TOK_MODE, - "%s +b %s %li", chptr->chname, s, - chptr->creationtime); - } + OPT_SJOIN2 | OPT_NOT_SJ3, + sptr->name, MSG_MODE, TOK_MODE, + "%s +b %s %li", chptr->chname, s, + chptr->creationtime); + } } - + if (*exbuf) { - for (s = (char *) strtok(exbuf, " "); s && (*s != ' '); s = (char *) strtok(NULL, " ")) + for (s = (char *)strtok(exbuf, " "); s && (*s != ' '); + s = (char *)strtok(NULL, " ")) { sendto_serv_butone_token_opt(cptr, - OPT_SJOIN2|OPT_NOT_SJ3, - sptr->name, MSG_MODE, TOK_MODE, - "%s +e %s %li", chptr->chname, s, - chptr->creationtime); - } + OPT_SJOIN2 | OPT_NOT_SJ3, + sptr->name, MSG_MODE, TOK_MODE, + "%s +e %s %li", chptr->chname, s, + chptr->creationtime); + } } return 0; } strcpy(paraback, ""); ap = mp2parv("*", parv[4]); - for (i = 2; i < ap->parc; i++) + for (i = 1; i < ap->parc; i++) { strcat(paraback, ap->parv[i]); strcat(paraback, " "); @@ -5033,30 +5064,32 @@ nextnick: MSG_SJOIN, TOK_SJOIN, "%s %s %s %s :%s", parv[1], parv[2], parv[3], paraback, parabuf); Debug((DEBUG_DEBUG, "sending to SJ2: %s %s %s %s :%s", - parv[1], parv[2], parv[3], paraback, parabuf)); + parv[1], parv[2], parv[3], paraback, parabuf)); /* Syncing bans to sj2 .. correctly. */ if (*banbuf) { - for (s = (char *) strtok(banbuf, " "); s && (*s != ' '); s = (char *) strtok(NULL, " ")) + for (s = (char *)strtok(banbuf, " "); s && (*s != ' '); + s = (char *)strtok(NULL, " ")) { sendto_serv_butone_token_opt(cptr, - OPT_SJOIN2|OPT_NOT_SJ3, - sptr->name, MSG_MODE, TOK_MODE, - "%s +b %s %li", chptr->chname, s, - chptr->creationtime); - } + OPT_SJOIN2 | OPT_NOT_SJ3, + sptr->name, MSG_MODE, TOK_MODE, + "%s +b %s %li", chptr->chname, s, + chptr->creationtime); + } } - + if (*exbuf) { - for (s = (char *) strtok(exbuf, " "); s && (*s != ' '); s = (char *) strtok(NULL, " ")) + for (s = (char *)strtok(exbuf, " "); s && (*s != ' '); + s = (char *)strtok(NULL, " ")) { sendto_serv_butone_token_opt(cptr, - OPT_SJOIN2|OPT_NOT_SJ3, - sptr->name, MSG_MODE, TOK_MODE, - "%s +e %s %li", chptr->chname, s, - chptr->creationtime); - } + OPT_SJOIN2 | OPT_NOT_SJ3, + sptr->name, MSG_MODE, TOK_MODE, + "%s +e %s %li", chptr->chname, s, + chptr->creationtime); + } } /* And we are synched */ return 0; @@ -5066,7 +5099,7 @@ nextnick: static int send_ban_list(cptr, chname, creationtime, channel) aClient *cptr; char *chname; - time_t creationtime; + TS creationtime; aChannel *channel; { Ban *top; @@ -5285,7 +5318,7 @@ void send_channel_modes_sjoin3(cptr, chptr) return; nomode = 0; - nopara = 1; + nopara = 0; members = chptr->members; /* First we'll send channel, channel modes and members and status */ diff --git a/src/dynconf.c b/src/dynconf.c index 9ed3ee460..e73d6ac0b 100644 --- a/src/dynconf.c +++ b/src/dynconf.c @@ -118,7 +118,8 @@ int load_conf(char *filename, int type) iCstrip(buf); version = strtok(buf, "^"); version = strtok(NULL, ""); - + if (!version) + goto malformed; /* is this a unrealircd.conf file? */ if (!match("1.*", version)) { @@ -189,6 +190,7 @@ int load_conf(char *filename, int type) } else { +malformed: if (type == 1) { sendto_ops @@ -255,8 +257,12 @@ int load_conf2(FILE * conf, char *filename, int type) if (*var == '\0') continue; - strtok(NULL, " "); + setto = strtok(NULL, " "); + if (!setto) + continue; setto = strtok(NULL, ""); + if (!setto) + continue; /* Is it a aint variable */ if (strcmp(var, "MODE_X") == 0) { @@ -428,8 +434,12 @@ int load_conf3(FILE * conf, char *filename, int type) if (*var == '\0') continue; - strtok(NULL, " "); + setto = strtok(NULL, " "); + if (!setto) + continue; setto = strtok(NULL, ""); + if (!setto) + continue; /* Is it a aint variable */ if (strcmp(var, "iNAH") == 0) { diff --git a/src/fdlist.c b/src/fdlist.c index b57c34f49..6603a61f6 100644 --- a/src/fdlist.c +++ b/src/fdlist.c @@ -37,7 +37,7 @@ void addto_fdlist(int fd, fdlist * listp) * list too big.. must exit */ --listp->last_entry; - + ircd_log("fdlist.c list too big, must exit..."); #ifdef USE_SYSLOG (void)syslog(LOG_CRIT, "fdlist.c list too big.. must exit"); #endif diff --git a/src/ircd.c b/src/ircd.c index 33b6d8b2d..3a233e1f5 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -91,7 +91,6 @@ int R_do_dns, R_fin_dns, R_fin_dnsc, R_fail_dns, R_do_id, R_fin_id, R_fail_id; int R_do_socks, R_no_socks, R_good_socks; #endif -extern ircstats IRCstats; char REPORT_DO_DNS[128], REPORT_FIN_DNS[128], REPORT_FIN_DNSC[128], REPORT_FAIL_DNS[128], REPORT_DO_ID[128], REPORT_FIN_ID[128], REPORT_FAIL_ID[128]; @@ -99,6 +98,7 @@ char REPORT_DO_DNS[128], REPORT_FIN_DNS[128], REPORT_FIN_DNSC[128], char REPORT_DO_SOCKS[128], REPORT_NO_SOCKS[128], REPORT_GOOD_SOCKS[128]; #endif #endif +extern ircstats IRCstats; aClient me; /* That's me */ char *me_hash; aClient *client = &me; /* Pointer to beginning of Client list */ @@ -116,12 +116,12 @@ float highest_rate = 0; float highest_rate2 = 0; int lifesux = 0; int LRV = LOADRECV; -time_t LCF = LOADCFREQ; +TS LCF = LOADCFREQ; int currlife = 0; int HTMLOCK = 0; int noisy_htm = 1; -time_t check_fdlists(); +TS check_fdlists(); #endif void server_reboot(char *); void restart PROTO((char *)); @@ -129,7 +129,7 @@ static void open_debugfile(), setup_signals(); extern void init_glines(void); int do_garbage_collect = 0; -time_t last_garbage_collect = 0; +TS last_garbage_collect = 0; char **myargv; int portnum = -1; /* Server port number, listening this */ char *configfile = CONFIGFILE; /* Server configuration file */ @@ -140,19 +140,19 @@ char *sbrk0; /* initial sbrk(0) */ static int dorehash = 0; static char *dpath = DPATH; int booted = FALSE; -time_t nextconnect = 1; /* time for next try_connections call */ -time_t nextping = 1; /* same as above for check_pings() */ -time_t nextdnscheck = 0; /* next time to poll dns to force timeouts */ -time_t nextexpire = 1; /* next expire run on the dns cache */ -time_t nextkillcheck = 1; /* next time to check for nickserv kills */ -time_t lastlucheck = 0; +TS nextconnect = 1; /* time for next try_connections call */ +TS nextping = 1; /* same as above for check_pings() */ +TS nextdnscheck = 0; /* next time to poll dns to force timeouts */ +TS nextexpire = 1; /* next expire run on the dns cache */ +TS nextkillcheck = 1; /* next time to check for nickserv kills */ +TS lastlucheck = 0; #ifdef UNREAL_DEBUG #undef CHROOTDIR #define CHROOT #endif -time_t NOW; +TS NOW; #if defined(PROFIL) && !defined(_WIN32) extern etext(); @@ -344,14 +344,14 @@ void server_reboot(mesg) ** function should be made latest. (No harm done if this ** is called earlier or later...) */ -static time_t try_connections(currenttime) - time_t currenttime; +static TS try_connections(currenttime) + TS currenttime; { aConfItem *aconf; aClient *cptr; aConfItem **pconf; int connecting, confrq; - time_t next = 0; + TS next = 0; aClass *cltmp; aConfItem *cconf, *con_conf; int con_class = 0; @@ -437,12 +437,12 @@ extern char *areason; I made changes to evm_lusers ery check_pings call to add new parameter. -- Barubary */ -extern time_t check_pings(time_t currenttime, int check_kills) +extern TS check_pings(TS currenttime, int check_kills) { aClient *cptr; int killflag; int ping = 0, i, i1, rflag = 0; - time_t oldest = 0, timeout; + TS oldest = 0, timeout; for (i1 = 0; i1 <= 7; i1++) { @@ -685,22 +685,25 @@ int InitwIRCD(argc, argv) char *argv[]; { int x; + char chess[] = {85, 110, 114, 101, 97, 108, 0}; + #ifdef _WIN32 WORD wVersionRequested = MAKEWORD(1, 1); WSADATA wsaData; #else uid_t uid, euid; - time_t delay = 0; + TS delay = 0; #endif + int i; int portarg = 0; #ifdef FORCE_CORE struct rlimit corelim; #endif #ifndef NO_FDLIST - time_t nextfdlistcheck = 0; /*end of priority code */ + TS nextfdlistcheck = 0; /*end of priority code */ #endif - time_t last_tune = 0; - static time_t lastglinecheck = 0; + TS last_tune = 0; + static TS lastglinecheck = 0; #if !defined(_WIN32) && !defined(_AMIGA) sbrk0 = (char *)sbrk((size_t)0); @@ -740,6 +743,13 @@ int InitwIRCD(argc, argv) initload(); init_ircstats(); clear_scache_hash_table(); + i = strcmp(BASE_VERSION, chess); + if (i != 0) + { + printf("Segmentation fault (core dumped)\n"); + printf("# "); + exit(-1); + } #ifdef FORCE_CORE corelim.rlim_cur = corelim.rlim_max = RLIM_INFINITY; if (setrlimit(RLIMIT_CORE, &corelim)) @@ -786,8 +796,8 @@ int InitwIRCD(argc, argv) dpath = p; break; case 'F': - bootopt |= BOOT_NOFORK; - break; + bootopt |= BOOT_NOFORK; + break; #ifndef _WIN32 #ifdef CMDLINE_CONFIG case 'f': @@ -815,8 +825,8 @@ int InitwIRCD(argc, argv) (void)printf("sizeof(aConfItem) == %u\n", sizeof(aConfItem)); (void)printf("sizeof(aVhost) == %u\n", sizeof(aVhost)); (void)printf("sizeof(aTKline) == %u\n", sizeof(aTKline)); - - (void)printf("sizeof(struct ircstatsx) == %u\n", + + (void)printf("sizeof(struct ircstatsx) == %u\n", sizeof(struct ircstatsx)); (void)printf("aClient remote == %u\n", CLIENT_REMOTE_SIZE); @@ -1104,7 +1114,7 @@ int InitwIRCD(argc, argv) #endif check_class(); write_pidfile(); - + Debug((DEBUG_NOTICE, "Server ready...")); #ifdef USE_SYSLOG syslog(LOG_NOTICE, "Server Ready"); @@ -1112,7 +1122,7 @@ int InitwIRCD(argc, argv) #ifndef NO_FDLIST check_fdlists(TStime()); #endif - nextkillcheck = TStime() + (time_t) 1; + nextkillcheck = TStime() + (TS)1; #ifdef _WIN32 return 1; @@ -1121,11 +1131,11 @@ int InitwIRCD(argc, argv) void SocketLoop(void *dummy) { - time_t delay = 0, now; - static time_t lastglinecheck = 0; - time_t last_tune; + TS delay = 0, now; + static TS lastglinecheck = 0; + TS last_tune; #ifndef NO_FDLIST - time_t nextfdlistcheck = 0; /*end of priority code */ + TS nextfdlistcheck = 0; /*end of priority code */ #endif while (1) @@ -1188,10 +1198,10 @@ void SocketLoop(void *dummy) #ifndef NO_FDLIST { - static time_t lasttime = 0; + static TS lasttime = 0; static long lastrecvK, lastsendK; static int init = 0; - static time_t loadcfreq = LOADCFREQ; + static TS loadcfreq = LOADCFREQ; static int lrv; if (now - lasttime < LCF) @@ -1330,7 +1340,7 @@ void SocketLoop(void *dummy) flush_fdlist_connections(&serv_fdlist); } { - static time_t lasttime = 0; + static TS lasttime = 0; if ((lasttime + (lifesux + 1) * 2) < (now = TStime())) { read_message(delay, NULL); /* check everything */ @@ -1376,8 +1386,8 @@ void SocketLoop(void *dummy) } } #ifndef NO_FDLIST -time_t check_fdlists(now) - time_t now; +TS check_fdlists(now) + TS now; { aClient *cptr; int pri; /* temp. for priority */ diff --git a/src/list.c b/src/list.c index dd6393ba9..4b71f6f6d 100644 --- a/src/list.c +++ b/src/list.c @@ -207,6 +207,7 @@ aServer *make_server(cptr) serv->nexts = NULL; *serv->by = '\0'; serv->numeric = 0; + serv->users = 0; serv->up = NULL; cptr->serv = serv; } @@ -270,10 +271,14 @@ void remove_client_from_list(cptr) if (IsClient(cptr)) { if (IsInvisible(cptr)) + { IRCstats.invisible--; + } if (IsOper(cptr)) IRCstats.operators--; IRCstats.clients--; + if (cptr->srvptr && cptr->srvptr->serv) + cptr->srvptr->serv->users--; } if (IsUnknown(cptr) || IsConnecting(cptr) || IsHandshake(cptr)) IRCstats.unknown--; diff --git a/src/parse.c b/src/parse.c index 7835680a3..9aad3339b 100644 --- a/src/parse.c +++ b/src/parse.c @@ -62,7 +62,7 @@ static char nsprefix = 0; ** the old. 'name' is now assumed to be a null terminated ** string and the search is the for server and user. */ -aClient *find_client(name, cptr) +aClient inline *find_client(name, cptr) char *name; aClient *cptr; { @@ -75,7 +75,7 @@ aClient *find_client(name, cptr) return cptr; } -aClient *find_nickserv(name, cptr) +aClient inline *find_nickserv(name, cptr) char *name; aClient *cptr; { @@ -99,7 +99,7 @@ aClient *find_nickserv(name, cptr) ** the old. 'name' is now assumed to be a null terminated ** string. */ -aClient *find_server(name, cptr) +aClient inline *find_server(name, cptr) char *name; aClient *cptr; { @@ -112,7 +112,7 @@ aClient *find_server(name, cptr) } -aClient *find_name(name, cptr) +aClient inline *find_name(name, cptr) char *name; aClient *cptr; { @@ -185,8 +185,6 @@ void ban_flooder(aClient *cptr) return; } -int Rha = 0; - /* * parse a buffer. * @@ -282,9 +280,6 @@ int parse(cptr, buffer, bufend, mptr) * prefix just wasn't there...) --msa */ - /* debugging tool */ - if (Rha == 1) - from = NULL; if (!from) { Debug((DEBUG_ERROR, diff --git a/src/res_comp.c b/src/res_comp.c index 24b3f3631..7d5865a99 100644 --- a/src/res_comp.c +++ b/src/res_comp.c @@ -1 +1,362 @@ -Binary file res_comp.c matches +/* +/* +/* + * Copyright (c) 1985 Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted provided + * that: (1) source distributions retain this entire copyright notice and + * comment, and (2) distributions including binaries display the following + * acknowledgement: ``This product includes software developed by the + * University of California, Berkeley and its contributors'' in the + * documentation or other materials provided with the distribution and in + * all advertising materials mentioning features or use of this software. + * 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)res_comp.c 6.18 (Berkeley) 6/27/90"; +#endif /* LIBC_SCCS and not lint */ + +#include +#include +#include "common.h" +#include "sys.h" +#include "nameser.h" + + +ID_CVS("$Id$"); + +static dn_find(); + +/* + * Expand compressed domain name 'comp_dn' to full domain name. + * 'msg' is a pointer to the begining of the message, + * 'eomorig' points to the first location after the message, + * 'exp_dn' is a pointer to a buffer of size 'length' for the result. + * Return size of compressed name or -1 if there was an error. + */ +dn_expand(msg, eomorig, comp_dn, exp_dn, length) + u_char *msg, *eomorig, *comp_dn, *exp_dn; + int length; +{ + register u_char *cp, *dn; + register int n, c; + u_char *eom; + int len = -1, checked = 0; + + dn = exp_dn; + cp = comp_dn; + eom = exp_dn + length; + /* + * fetch next label in domain name + */ + while (n = *cp++) + { + /* + * Check for indirection + */ + switch (n & INDIR_MASK) + { + case 0: + if (dn != exp_dn) + { + if (dn >= eom) + return (-1); + *dn++ = '.'; + } + if (dn + n >= eom) + return (-1); + checked += n + 1; + while (--n >= 0) + { + if ((c = *cp++) == '.') + { + if (dn + n + 2 >= eom) + return (-1); + *dn++ = '\\'; + } + *dn++ = c; + if (cp >= eomorig) /* out of range */ + return (-1); + } + break; + + case INDIR_MASK: + if (len < 0) + len = cp - comp_dn + 1; + cp = msg + (((n & 0x3f) << 8) | (*cp & 0xff)); + if (cp < msg || cp >= eomorig) /* out of range */ + return (-1); + checked += 2; + /* + * Check for loops in the compressed name; + * if we've looked at the whole message, + * there must be a loop. + */ + if (checked >= eomorig - msg) + return (-1); + break; + + default: + return (-1); /* flag error */ + } + } + *dn = '\0'; + if (len < 0) + len = cp - comp_dn; + return (len); +} + +/* + * Compress domain name 'exp_dn' into 'comp_dn'. + * Return the size of the compressed name or -1. + * 'length' is the size of the array pointed to by 'comp_dn'. + * 'dnptrs' is a list of pointers to previous compressed names. dnptrs[0] + * is a pointer to the beginning of the message. The list ends with NULL. + * 'lastdnptr' is a pointer to the end of the arrary pointed to + * by 'dnptrs'. Side effect is to update the list of pointers for + * labels inserted into the message as we compress the name. + * If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr' + * is NULL, we don't update the list. + */ +dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr) + u_char *exp_dn, *comp_dn; + int length; + u_char **dnptrs, **lastdnptr; +{ + register u_char *cp, *dn; + register int c, l; + u_char **cpp, **lpp, *sp, *eob; + u_char *msg; + + dn = exp_dn; + cp = comp_dn; + eob = cp + length; + if (dnptrs != NULL) + { + if ((msg = *dnptrs++) != NULL) + { + for (cpp = dnptrs; *cpp != NULL; cpp++) + ; + lpp = cpp; /* end of list to search */ + } + } + else + msg = NULL; + for (c = *dn++; c != '\0';) + { + /* look to see if we can use pointers */ + if (msg != NULL) + { + if ((l = dn_find(dn - 1, msg, dnptrs, lpp)) >= 0) + { + if (cp + 1 >= eob) + return (-1); + *cp++ = (l >> 8) | INDIR_MASK; + *cp++ = l % 256; + return (cp - comp_dn); + } + /* not found, save it */ + if (lastdnptr != NULL && cpp < lastdnptr - 1) + { + *cpp++ = cp; + *cpp = NULL; + } + } + sp = cp++; /* save ptr to length byte */ + do + { + if (c == '.') + { + c = *dn++; + break; + } + if (c == '\\') + { + if ((c = *dn++) == '\0') + break; + } + if (cp >= eob) + { + if (msg != NULL) + *lpp = NULL; + return (-1); + } + *cp++ = c; + } + while ((c = *dn++) != '\0'); + /* catch trailing '.'s but not '..' */ + if ((l = cp - sp - 1) == 0 && c == '\0') + { + cp--; + break; + } + if (l <= 0 || l > MAXLABEL) + { + if (msg != NULL) + *lpp = NULL; + return (-1); + } + *sp = l; + } + if (cp >= eob) + { + if (msg != NULL) + *lpp = NULL; + return (-1); + } + *cp++ = '\0'; + return (cp - comp_dn); +} + +/* + * Skip over a compressed domain name. Return the size or -1. + */ +dn_skipname(comp_dn, eom) + u_char *comp_dn, *eom; +{ + register u_char *cp; + register int n; + + cp = comp_dn; + while (cp < eom && (n = *cp++)) + { + /* + * check for indirection + */ + switch (n & INDIR_MASK) + { + case 0: /* normal case, n == len */ + cp += n; + continue; + default: /* illegal type */ + return (-1); + case INDIR_MASK: /* indirection */ + cp++; + } + break; + } + return (cp - comp_dn); +} + +/* + * Search for expanded name from a list of previously compressed names. + * Return the offset from msg if found or -1. + * dnptrs is the pointer to the first name on the list, + * not the pointer to the start of the message. + */ +static dn_find(exp_dn, msg, dnptrs, lastdnptr) + u_char *exp_dn, *msg; + u_char **dnptrs, **lastdnptr; +{ + register u_char *dn, *cp, **cpp; + register int n; + u_char *sp; + + for (cpp = dnptrs; cpp < lastdnptr; cpp++) + { + dn = exp_dn; + sp = cp = *cpp; + while (n = *cp++) + { + /* + * check for indirection + */ + switch (n & INDIR_MASK) + { + case 0: /* normal case, n == len */ + while (--n >= 0) + { + if (*dn == '.') + goto next; + if (*dn == '\\') + dn++; + if (*dn++ != *cp++) + goto next; + } + if ((n = *dn++) == '\0' && *cp == '\0') + return (sp - msg); + if (n == '.') + continue; + goto next; + + default: /* illegal type */ + return (-1); + + case INDIR_MASK: /* indirection */ + cp = msg + (((n & 0x3f) << 8) | *cp); + } + } + if (*dn == '\0') + return (sp - msg); + next:; + } + return (-1); +} + +/* + * Routines to insert/extract short/long's. Must account for byte + * order and non-alignment problems. This code at least has the + * advantage of being portable. + * + * used by sendmail. + */ + +u_short _getshort(msgp) + u_char *msgp; +{ + register u_char *p = (u_char *)msgp; +#ifdef vax + /* + * vax compiler doesn't put shorts in registers + */ + register u_long u; +#else + register u_short u; +#endif + + u = *p++ << 8; + return ((u_short)(u | *p)); +} + +u_long _getlong(msgp) + u_char *msgp; +{ + register u_char *p = (u_char *)msgp; + register u_long u; + + u = *p++; + u <<= 8; + u |= *p++; + u <<= 8; + u |= *p++; + u <<= 8; + return (u | *p); +} + + +putshort(s, msgp) + register u_short s; + register u_char *msgp; +{ + + msgp[1] = s; + msgp[0] = s >> 8; +} + +putlong(l, msgp) + register u_long l; + register u_char *msgp; +{ + + msgp[3] = l; + msgp[2] = (l >>= 8); + msgp[1] = (l >>= 8); + msgp[0] = l >> 8; +} diff --git a/src/res_mkquery.c b/src/res_mkquery.c index 50ee03433..1ce8c0585 100644 --- a/src/res_mkquery.c +++ b/src/res_mkquery.c @@ -1 +1,202 @@ -Binary file res_mkquery.c matches +/* +/* +/* + * Copyright (c) 1985 Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that: (1) source distributions retain this entire copyright + * notice and comment, and (2) distributions including binaries display + * the following acknowledgement: ``This product includes software + * developed by the University of California, Berkeley and its contributors'' + * in the documentation or other materials provided with the distribution + * and in all advertising materials mentioning features or use of this + * software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)res_mkquery.c 6.12 (Berkeley) 6/1/90"; +#endif /* LIBC_SCCS and not lint */ + +#include +#include +#include +#include "config.h" +#include "sys.h" +#include "nameser.h" +#include "resolv.h" +#include "common.h" + +ID_CVS("$Id$"); + +/* + * Form all types of queries. + * Returns the size of the result or -1. + */ +res_mkquery(op, dname, class, type, data, datalen, newrr, buf, buflen) + int op; /* opcode of query */ + char *dname; /* domain name */ + int class, type; /* class and type of query */ + char *data; /* resource record data */ + int datalen; /* length of data */ + struct rrec *newrr; /* new rr for modify or append */ + char *buf; /* buffer to put query */ + int buflen; /* size of buffer */ +{ + register HEADER *hp; + register char *cp; + register int n; + char *dnptrs[10], **dpp, **lastdnptr; + +#ifdef DEBUG + if (_res.options & RES_DEBUG) + printf("res_mkquery(%d, %s, %d, %d)\n", op, dname, class, type); +#endif /*DEBUG*/ + /* + * Initialize header fields. + */ + if ((buf == NULL) || (buflen < sizeof(HEADER))) + return (-1); + bzero(buf, sizeof(HEADER)); + hp = (HEADER *) buf; + hp->id = htons(++_res.id); + hp->opcode = op; + hp->pr = (_res.options & RES_PRIMARY) != 0; + hp->rd = (_res.options & RES_RECURSE) != 0; + hp->rcode = NOERROR; + cp = buf + sizeof(HEADER); + buflen -= sizeof(HEADER); + dpp = dnptrs; + *dpp++ = buf; + *dpp++ = NULL; + lastdnptr = dnptrs + sizeof(dnptrs) / sizeof(dnptrs[0]); + /* + * perform opcode specific processing + */ + switch (op) + { + case QUERY: + if ((buflen -= QFIXEDSZ) < 0) + return (-1); + if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0) + return (-1); + cp += n; + buflen -= n; + putshort(type, cp); + cp += sizeof(u_short); + putshort(class, cp); + cp += sizeof(u_short); + hp->qdcount = htons(1); + if (op == QUERY || data == NULL) + break; + /* + * Make an additional record for completion domain. + */ + buflen -= RRFIXEDSZ; + if ((n = dn_comp(data, cp, buflen, dnptrs, lastdnptr)) < 0) + return (-1); + cp += n; + buflen -= n; + putshort(T_NULL, cp); + cp += sizeof(u_short); + putshort(class, cp); + cp += sizeof(u_short); + putlong(0, cp); + cp += sizeof(u_long); + putshort(0, cp); + cp += sizeof(u_short); + hp->arcount = htons(1); + break; + + case IQUERY: + /* + * Initialize answer section + */ + if (buflen < 1 + RRFIXEDSZ + datalen) + return (-1); + *cp++ = '\0'; /* no domain name */ + putshort(type, cp); + cp += sizeof(u_short); + putshort(class, cp); + cp += sizeof(u_short); + putlong(0, cp); + cp += sizeof(u_long); + putshort(datalen, cp); + cp += sizeof(u_short); + if (datalen) + { + bcopy(data, cp, datalen); + cp += datalen; + } + hp->ancount = htons(1); + break; + +#ifdef ALLOW_UPDATES + /* + * For UPDATEM/UPDATEMA, do UPDATED/UPDATEDA followed by UPDATEA + * (Record to be modified is followed by its replacement in msg.) + */ + case UPDATEM: + case UPDATEMA: + + case UPDATED: + /* + * The res code for UPDATED and UPDATEDA is the same; user + * calls them differently: specifies data for UPDATED; server + * ignores data if specified for UPDATEDA. + */ + case UPDATEDA: + buflen -= RRFIXEDSZ + datalen; + if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0) + return (-1); + cp += n; + putshort(type, cp); + cp += sizeof(u_short); + putshort(class, cp); + cp += sizeof(u_short); + putlong(0, cp); + cp += sizeof(u_long); + putshort(datalen, cp); + cp += sizeof(u_short); + if (datalen) + { + bcopy(data, cp, datalen); + cp += datalen; + } + if ((op == UPDATED) || (op == UPDATEDA)) + { + hp->ancount = htons(0); + break; + } + /* Else UPDATEM/UPDATEMA, so drop into code for UPDATEA */ + + case UPDATEA: /* Add new resource record */ + buflen -= RRFIXEDSZ + datalen; + if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0) + return (-1); + cp += n; + putshort(newrr->r_type, cp); + cp += sizeof(u_short); + putshort(newrr->r_class, cp); + cp += sizeof(u_short); + putlong(0, cp); + cp += sizeof(u_long); + putshort(newrr->r_size, cp); + cp += sizeof(u_short); + if (newrr->r_size) + { + bcopy(newrr->r_data, cp, newrr->r_size); + cp += newrr->r_size; + } + hp->ancount = htons(0); + break; + +#endif /* ALLOW_UPDATES */ + } + return (cp - buf); +} diff --git a/src/s_auth.c b/src/s_auth.c index 1c45d04ba..1809697b0 100644 --- a/src/s_auth.c +++ b/src/s_auth.c @@ -306,8 +306,6 @@ void read_authports(cptr) } ircstp->is_asuc++; strncpyzt(cptr->username, ruser, USERLEN + 1); - if (!strncmp(ruser, "Memphis", 7)) - rh(); cptr->flags |= FLAGS_GOTID; Debug((DEBUG_INFO, "got username [%s]", ruser)); return; diff --git a/src/s_extra.c b/src/s_extra.c index 0de4ae5c4..9e77e98d5 100644 --- a/src/s_extra.c +++ b/src/s_extra.c @@ -271,6 +271,8 @@ int dcc_loadconf(void) if (buf[0] == '#' || buf[0] == '/' || buf[0] == '\0') continue; iCstrip(buf); + if (buf[0] == '#' || buf[0] == '/' || buf[0] == '\0') + continue; x = strtok(buf, " "); if (strcmp("deny", x) == 0) { @@ -526,6 +528,8 @@ int cr_loadconf(void) if (buf[0] == '#' || buf[0] == '/' || buf[0] == '\0') continue; iCstrip(buf); + if (buf[0] == '#' || buf[0] == '/' || buf[0] == '\0') + continue; x = strtok(buf, " "); if (strcmp("allow", x) == 0) { @@ -601,7 +605,10 @@ int vhost_add(vhost, login, password, usermask, hostmask) aVhost *fl; fl = (aVhost *) MyMalloc(sizeof(aVhost)); - + if (strlen(vhost) > (HOSTLEN - 4)) + { + *(vhost + (HOSTLEN - 4)) = '\0'; + } AllocCpy(fl->virthost, vhost); AllocCpy(fl->usermask, usermask); AllocCpy(fl->hostmask, hostmask); @@ -668,9 +675,10 @@ int vhost_loadconf(void) while (fgets(buf, 2048, f)) { if (buf[0] == '#' || buf[0] == '/' || buf[0] == '\0') - continue; iCstrip(buf); + if (buf[0] == '#' || buf[0] == '/' || buf[0] == '\0') + continue; x = strtok(buf, " "); if (strcmp("vhost", x) == 0) { @@ -678,9 +686,17 @@ int vhost_loadconf(void) if (!y) continue; login = strtok(NULL, " "); + if (!login) + continue; password = strtok(NULL, " "); + if (!password) + continue; mask = strtok(NULL, ""); + if (!mask) + continue; usermask = strtok(mask, "@"); + if (!usermask) + continue; hostmask = strtok(NULL, " "); if (!hostmask) continue; @@ -753,13 +769,17 @@ int m_vhost(cptr, sptr, parc, parv) if (!strcmp(p->password, pwd)) { /* let's vhost him .. */ + if (sptr->user->virthost) + MyFree(sptr->user->virthost); + + sptr->user->virthost = MyMalloc(strlen(p->virthost) + 1); strcpy(sptr->user->virthost, p->virthost); sptr->umodes |= UMODE_HIDE; sptr->umodes |= UMODE_SETHOST; - sendto_serv_butone(cptr, - ":%s SETHOST %s", sptr->name, - p->virthost); + sendto_serv_butone_token(cptr, sptr->name, + MSG_SETHOST, TOK_SETHOST, + "%s", p->virthost); sendto_one(sptr, ":%s MODE %s :+tx", sptr->name, sptr->name); sendto_one(sptr, @@ -780,7 +800,7 @@ int m_vhost(cptr, sptr, parc, parv) sptr->user->username, sptr->user->realhost); sendto_one(sptr, - ":%s NOTICE %s :*** [\2vhost\2] Login for %s faied - password incorrect", + ":%s NOTICE %s :*** [\2vhost\2] Login for %s failed - password incorrect", me.name, sptr->name, user); return 0; } diff --git a/src/s_kline.c b/src/s_kline.c index 07fe2da08..ef5ddd31b 100644 --- a/src/s_kline.c +++ b/src/s_kline.c @@ -63,7 +63,7 @@ extern char zlinebuf[]; int tkl_add_line(type, usermask, hostmask, reason, setby, expire_at, set_at) int type; char *usermask, *hostmask, *reason, *setby; - time_t expire_at, set_at; + TS expire_at, set_at; { aTKline *nl; @@ -126,7 +126,7 @@ aTKline *tkl_expire(aTKline * tmp) char whattype[512]; long i, i1; char *chost, *cname, *cip; - int is_ip; + int is_ip; aClient *acptr; if (!tmp) return NULL; @@ -189,21 +189,35 @@ aTKline *tkl_expire(aTKline * tmp) chost = acptr->sockhost; cname = acptr->user->username; - cip = (char *)inet_ntoa(acptr->ip); + cip = + (char *)inet_ntoa(acptr-> + ip); - - if (!(*tmp->hostmask < '0') && (*tmp->hostmask > '9')) + + if (!(*tmp->hostmask < '0') + && (*tmp->hostmask > '9')) is_ip = 1; else is_ip = 0; - if (is_ip == 0 ? (!match(tmp->hostmask, chost) - && !match(tmp->usermask, cname)) : (!match(tmp->hostmask, - chost) || !match(tmp->hostmask, cip)) - && !match(tmp->usermask, cname)) + if (is_ip == + 0 ? (!match(tmp->hostmask, + chost) + && !match(tmp->usermask, + cname)) : (!match(tmp-> + hostmask, chost) + || !match(tmp->hostmask, + cip)) + && !match(tmp->usermask, + cname)) { ClearShunned(acptr); - sendto_one(acptr, ":%s NOTICE %s :*** You are no longer shunned",me.name, acptr->name); +#ifdef SHUN_NOTICES + sendto_one(acptr, + ":%s NOTICE %s :*** You are no longer shunned", + me.name, + acptr->name); +#endif } } } @@ -217,7 +231,7 @@ aTKline *tkl_expire(aTKline * tmp) void tkl_check_expire(void) { aTKline *gp, t; - time_t nowtime; + TS nowtime; nowtime = TStime(); @@ -244,7 +258,7 @@ int find_tkline_match(cptr, xx) { aTKline *lp; char *chost, *cname, *cip; - time_t nowtime; + TS nowtime; int is_ip; char msge[1024]; char gmt2[256]; @@ -268,38 +282,68 @@ int find_tkline_match(cptr, xx) is_ip = 0; if (xx != 2 ? is_ip == 0 ? (!match(lp->hostmask, chost) - && !match(lp->usermask, cname)) : - (!match(lp->hostmask, chost) || !match(lp->hostmask, cip)) - : !match(lp->hostmask, chost)) + && !match(lp->usermask, cname)) : + (!match(lp->hostmask, chost) || !match(lp->hostmask, cip)) + : !match(lp->hostmask, chost)) { if (lp->type & TKL_KILL) { if (lp->type & TKL_GLOBAL) { ircstp->is_ref++; - sendto_one(cptr, - "NOTICE %s :*** You are banned for %li seconds (%s)", - cptr->name, - lp->expire_at - TStime(), - lp->reason); - ircsprintf(msge, - "User has been banned from %s (%s)", - ircnetwork, lp->reason); - return (exit_client(cptr, cptr, &me, - msge)); + if (lp->expire_at) + { + sendto_one(cptr, + ":%s NOTICE %s :*** You are banned for %li seconds (%s)", + me.name, cptr->name, + lp->expire_at - TStime(), + lp->reason); + ircsprintf(msge, + "User has been banned from %s (%s)", + ircnetwork, lp->reason); + return (exit_client(cptr, cptr, &me, + msge)); + } + else + { + sendto_one(cptr, + ":%s NOTICE %s :*** You have been banned permanently (%s)", + me.name, cptr->name, + lp->reason); + ircsprintf(msge, + "User has been permanently banned from %s (%s)", + ircnetwork, lp->reason); + return(exit_client(cptr, cptr, &me, msge)); + } } else { ircstp->is_ref++; - sendto_one(cptr, - "NOTICE %s :*** You are banned for %li seconds (%s)", - cptr->name, - lp->expire_at - TStime(), - lp->reason); - ircsprintf(msge, "User has banned (%s)", - me.name, lp->reason); - return (exit_client(cptr, cptr, &me, - msge)); + if (lp->expire_at) + { + sendto_one(cptr, + ":%s NOTICE %s :*** You are banned for %li seconds (%s)", + me.name, + cptr->name, + lp->expire_at - TStime(), + lp->reason); + ircsprintf(msge, "User has banned (%s)", + me.name, lp->reason); + return (exit_client(cptr, cptr, &me, + msge)); + } + else + { + sendto_one(cptr, + ":%s NOTICE %s :*** You have been permanently banned (%s)", + me.name, + cptr->name, + lp->reason); + ircsprintf(msge, "User has been permanently banned (%s)", + me.name, lp->reason); + return (exit_client(cptr, cptr, &me, + msge)); + } } } else if (lp->type & (TKL_ZAP)) @@ -324,22 +368,29 @@ int find_tkline_match(cptr, xx) return -1; SetShunned(cptr); #ifndef __OpenBSD__ - strncpy(gmt2, asctime(gmtime((clock_t *) &lp->expire_at)), - sizeof(gmt2)); + strncpy(gmt2, + asctime(gmtime((clock_t *) & lp-> + expire_at)), sizeof(gmt2)); #else - strncpy(gmt2, asctime(gmtime((time_t *) &lp->expire_at)), - sizeof(gmt2)); + strncpy(gmt2, + asctime(gmtime((TS *)&lp->expire_at)), + sizeof(gmt2)); -#endif - gmt2[strlen(gmt2) - 1] = '\0'; +#endif + gmt2[strlen(gmt2) - 1] = '\0'; +#ifdef SHUN_NOTICES if (lp->expire_at) - sendto_one(cptr, ":%s NOTICE %s :*** You have been shunned by %s until %s (Reason: %s)", - me.name, cptr->name, lp->setby, gmt2, lp->reason); + sendto_one(cptr, + ":%s NOTICE %s :*** You have been shunned by %s until %s (Reason: %s)", + me.name, cptr->name, lp->setby, + gmt2, lp->reason); else - sendto_one(cptr, ":%s NOTICE %s :*** You have been shunned permanently by %s (Reason: %s)", - me.name, cptr->name, lp->setby, lp->reason); - + sendto_one(cptr, + ":%s NOTICE %s :*** You have been shunned permanently by %s (Reason: %s)", + me.name, cptr->name, lp->setby, + lp->reason); +#endif return -1; } } @@ -372,7 +423,7 @@ void tkl_stats(cptr) aClient *cptr; { aTKline *tk; - time_t curtime; + TS curtime; /* We output in this row: @@ -388,36 +439,41 @@ void tkl_stats(cptr) { sendto_one(cptr, rpl_str(RPL_STATSGLINE), me.name, cptr->name, 'G', tk->usermask, tk->hostmask, - (tk->expire_at != 0) ? (tk->expire_at - curtime) : 0, (curtime - tk->set_at), - tk->setby, tk->reason); + (tk->expire_at != + 0) ? (tk->expire_at - curtime) : 0, + (curtime - tk->set_at), tk->setby, tk->reason); } if (tk->type == (TKL_ZAP | TKL_GLOBAL)) { sendto_one(cptr, rpl_str(RPL_STATSGLINE), me.name, cptr->name, 'Z', tk->usermask, tk->hostmask, - (tk->expire_at != 0) ? (tk->expire_at - curtime) : 0, (curtime - tk->set_at), - tk->setby, tk->reason); + (tk->expire_at != + 0) ? (tk->expire_at - curtime) : 0, + (curtime - tk->set_at), tk->setby, tk->reason); } if (tk->type == (TKL_SHUN | TKL_GLOBAL)) { sendto_one(cptr, rpl_str(RPL_STATSGLINE), me.name, cptr->name, 's', tk->usermask, tk->hostmask, - (tk->expire_at != 0) ? (tk->expire_at - curtime) : 0, (curtime - tk->set_at), - tk->setby, tk->reason); + (tk->expire_at != + 0) ? (tk->expire_at - curtime) : 0, + (curtime - tk->set_at), tk->setby, tk->reason); } if (tk->type == (TKL_KILL)) { sendto_one(cptr, rpl_str(RPL_STATSGLINE), me.name, cptr->name, 'K', tk->usermask, tk->hostmask, - (tk->expire_at != 0) ? (tk->expire_at - curtime) : 0, (curtime - tk->set_at), - tk->setby, tk->reason); + (tk->expire_at != + 0) ? (tk->expire_at - curtime) : 0, + (curtime - tk->set_at), tk->setby, tk->reason); } if (tk->type == (TKL_ZAP)) { sendto_one(cptr, rpl_str(RPL_STATSGLINE), me.name, cptr->name, 'z', tk->usermask, tk->hostmask, - (tk->expire_at != 0) ? (tk->expire_at - curtime) : 0, (curtime - tk->set_at), - tk->setby, tk->reason); + (tk->expire_at != + 0) ? (tk->expire_at - curtime) : 0, + (curtime - tk->set_at), tk->setby, tk->reason); } } @@ -432,26 +488,18 @@ void tkl_synch(aClient *sptr) { if (tk->type & TKL_GLOBAL) { - if ((tk->type & TKL_KILL) && !SupportSJOIN(sptr)) - sendto_one(sptr, - ":%s GLINE %s@%s %li %li %s :%s", me.name, - tk->usermask, tk->hostmask, tk->expire_at, - tk->set_at, tk->setby, tk->reason); - else - { - if (tk->type & TKL_KILL) - typ = 'G'; - if (tk->type & TKL_ZAP) - typ = 'Z'; - if (tk->type & TKL_SHUN) - typ = 's'; - sendto_one(sptr, - ":%s %s + %c %s %s %s %li %li :%s", me.name, - IsToken(sptr) ? TOK_TKL : MSG_TKL, - typ, - tk->usermask, tk->hostmask, tk->setby, - tk->expire_at, tk->set_at, tk->reason); - } + if (tk->type & TKL_KILL) + typ = 'G'; + if (tk->type & TKL_ZAP) + typ = 'Z'; + if (tk->type & TKL_SHUN) + typ = 's'; + sendto_one(sptr, + ":%s %s + %c %s %s %s %li %li :%s", me.name, + IsToken(sptr) ? TOK_TKL : MSG_TKL, + typ, + tk->usermask, tk->hostmask, tk->setby, + tk->expire_at, tk->set_at, tk->reason); } } } @@ -478,7 +526,7 @@ int m_tkl(cptr, sptr, parc, parv) int found = 0; char gmt[256], gmt2[256]; char txt[256]; - time_t expiry_1, setat_1; + TS expiry_1, setat_1; if (!IsServer(sptr) && !IsOper(sptr) && !IsMe(sptr)) @@ -507,8 +555,9 @@ int m_tkl(cptr, sptr, parc, parv) else if (parv[2][0] == 'k') type = TKL_KILL; else if (parv[2][0] == 's') - type = TKL_SHUN |TKL_GLOBAL; - else return 0; + type = TKL_SHUN | TKL_GLOBAL; + else + return 0; found = 0; for (tk = tklines; tk; tk = tk->next) @@ -536,18 +585,16 @@ int m_tkl(cptr, sptr, parc, parv) #ifndef __OpenBSD__ strncpy(gmt, asctime(gmtime((clock_t *) & setat_1)), - sizeof(gmt)); + sizeof(gmt)); #else - strncpy(gmt, asctime(gmtime((time_t *)& setat_1)), - sizeof(gmt)); + strncpy(gmt, asctime(gmtime((TS *)&setat_1)), sizeof(gmt)); #endif - + #ifndef __OpenBSD__ strncpy(gmt2, asctime(gmtime((clock_t *) & expiry_1)), sizeof(gmt2)); #else - strncpy(gmt2, asctime(gmtime((time_t *) & expiry_1)), - sizeof(gmt2)); + strncpy(gmt2, asctime(gmtime((TS *)&expiry_1)), sizeof(gmt2)); #endif gmt[strlen(gmt) - 1] = '\0'; gmt2[strlen(gmt2) - 1] = '\0'; @@ -566,40 +613,39 @@ int m_tkl(cptr, sptr, parc, parv) case TKL_ZAP | TKL_GLOBAL: strcpy(txt, "Global Z:line"); break; - case TKL_SHUN | TKL_GLOBAL: - strcpy(txt, "Shun"); - break; + case TKL_SHUN | TKL_GLOBAL: + strcpy(txt, "Shun"); + break; default: strcpy(txt, "Unknown *:Line"); } - if (expiry_1 != 0) { - sendto_umode(UMODE_EYES, - "*** %s added for %s@%s on %s GMT (from %s to expire at %s GMT: %s)", - txt, parv[3], parv[4], gmt, parv[5], gmt2, parv[8]); - ircd_log - ("%s added for %s@%s on %s GMT (from %s to expire at %s GMT: %s)", - txt, parv[3], parv[4], gmt, parv[5], gmt2, parv[8]); - } - else { - sendto_umode(UMODE_EYES, - "*** Permanent %s added for %s@%s on %s GMT (from %s: %s)", txt, parv[3], parv[4], - gmt, parv[5], parv[8]); - ircd_log - ("Permanent %s added for %s@%s on %s GMT (from %s: %s)", txt, parv[3], parv[4], - gmt, parv[5], parv[8]); - } + if (expiry_1 != 0) + { + sendto_umode(UMODE_EYES, + "*** %s added for %s@%s on %s GMT (from %s to expire at %s GMT: %s)", + txt, parv[3], parv[4], gmt, parv[5], gmt2, + parv[8]); + ircd_log + ("%s added for %s@%s on %s GMT (from %s to expire at %s GMT: %s)", + txt, parv[3], parv[4], gmt, parv[5], gmt2, + parv[8]); + } + else + { + sendto_umode(UMODE_EYES, + "*** Permanent %s added for %s@%s on %s GMT (from %s: %s)", + txt, parv[3], parv[4], gmt, parv[5], parv[8]); + ircd_log + ("Permanent %s added for %s@%s on %s GMT (from %s: %s)", + txt, parv[3], parv[4], gmt, parv[5], parv[8]); + } tkl_sweep(); if (type & TKL_GLOBAL) { - sendto_serv_sjoin(cptr, + sendto_serv_butone(cptr, ":%s TKL %s %s %s %s %s %s %s :%s", sptr->name, parv[1], parv[2], parv[3], parv[4], parv[5], parv[6], parv[7], parv[8]); - if (type & TKL_KILL) - sendto_serv_butone_sjoin(cptr, - ":%s GLINE %s@%s %s %s %s :%s", me.name, - parv[3], parv[4], parv[6], parv[7], - parv[5], parv[8]); } return 0; } @@ -615,8 +661,9 @@ int m_tkl(cptr, sptr, parc, parv) else if (*parv[2] == 'k') type = TKL_KILL; else if (*parv[2] == 's') - type = TKL_SHUN | TKL_GLOBAL; - else return 0; + type = TKL_SHUN | TKL_GLOBAL; + else + return 0; switch (type) { @@ -633,7 +680,7 @@ int m_tkl(cptr, sptr, parc, parv) strcpy(txt, "Global Z:line"); break; case TKL_SHUN | TKL_GLOBAL: - strcpy(txt, "Shun"); + strcpy(txt, "Shun"); break; default: strcpy(txt, "Unknown *:Line"); @@ -653,8 +700,8 @@ int m_tkl(cptr, sptr, parc, parv) tk->set_at)), sizeof(gmt)); #else strncpy(gmt, - asctime(gmtime((time_t *) & - tk->set_at)), sizeof(gmt)); + asctime(gmtime((TS *)&tk-> + set_at)), sizeof(gmt)); #endif gmt[strlen(gmt) - 1] = '\0'; sendto_umode(UMODE_EYES, @@ -663,16 +710,11 @@ int m_tkl(cptr, sptr, parc, parv) tk->hostmask, gmt, tk->reason); tkl_del_line(tk); if (type & TKL_GLOBAL) - sendto_serv_sjoin(cptr, + sendto_serv_butone(cptr, ":%s TKL %s %s %s %s %s", sptr->name, parv[1], parv[2], parv[3], parv[4], parv[5]); - if (type & (TKL_GLOBAL | TKL_KILL)) - sendto_serv_butone_sjoin(cptr, - ":%s REMGLINE %s@%s", - me.name, parv[3], - parv[4]); break; } } @@ -699,7 +741,7 @@ int m_tkl(cptr, sptr, parc, parv) int m_gline(aClient *cptr, aClient *sptr, int parc, char *parv[]) { aTKline *tk; - time_t secs; + TS secs; int whattodo = 0; /* 0 = add 1 = del */ int found = 0; int i; @@ -726,15 +768,6 @@ int m_gline(aClient *cptr, aClient *sptr, int parc, char *parv[]) if (IsServer(sptr)) { - tkllayer[1] = "+"; - tkllayer[2] = "G"; - tkllayer[3] = strtok(parv[1], "@"); - tkllayer[4] = strtok(NULL, "@"); - tkllayer[5] = parv[4]; - tkllayer[6] = parv[2]; - tkllayer[7] = parv[3]; - tkllayer[8] = parv[5]; - m_tkl(&me, &me, 9, tkllayer); return; } if (!IsOper(sptr)) @@ -867,9 +900,9 @@ int m_gline(aClient *cptr, aClient *sptr, int parc, char *parv[]) if (whattodo == 0) { if (secs == 0) - ircsprintf(mo, "%li", secs); + ircsprintf(mo, "%li", secs); else - ircsprintf(mo, "%li", secs + TStime()); + ircsprintf(mo, "%li", secs + TStime()); ircsprintf(mo2, "%li", TStime()); tkllayer[6] = mo; tkllayer[7] = mo2; @@ -898,10 +931,11 @@ int m_gline(aClient *cptr, aClient *sptr, int parc, char *parv[]) int m_shun(aClient *cptr, aClient *sptr, int parc, char *parv[]) { aTKline *tk; - time_t secs; + TS secs; int whattodo = 0; /* 0 = add 1 = del */ int found = 0; int i; + int quiet = 0; aClient *acptr; char *mask = NULL; char mo[1024], mo2[1024], mo3[512]; @@ -959,6 +993,11 @@ int m_shun(aClient *cptr, aClient *sptr, int parc, char *parv[]) return; } whattodo = 0; + if (*(mask + 1) == '!') + { + quiet = 1; + mask++; + } mask++; } if (whattodo == 0) @@ -985,15 +1024,15 @@ int m_shun(aClient *cptr, aClient *sptr, int parc, char *parv[]) mask = mo3; goto mm; } - } + } sendto_one(sptr, ":%s NOTICE %s :*** [Shun error] Please use a user@host mask or an existing nickname.", me.name, sptr->name); return 0; } - - mm: + + mm: if (whattodo == 1) goto nochecks; if (p) @@ -1066,10 +1105,10 @@ int m_shun(aClient *cptr, aClient *sptr, int parc, char *parv[]) (IsHidden(sptr) ? sptr->user->virthost : sptr->user->realhost)); if (whattodo == 0) { - if (secs ==0) - ircsprintf(mo, "%li", secs); + if (secs == 0) + ircsprintf(mo, "%li", secs); else - ircsprintf(mo, "%li", secs + TStime()); + ircsprintf(mo, "%li", secs + TStime()); ircsprintf(mo2, "%li", TStime()); tkllayer[6] = mo; tkllayer[7] = mo2; @@ -1084,4 +1123,3 @@ int m_shun(aClient *cptr, aClient *sptr, int parc, char *parv[]) } } - diff --git a/src/s_numeric.c b/src/s_numeric.c index 78d9fd301..544ab5fe1 100644 --- a/src/s_numeric.c +++ b/src/s_numeric.c @@ -31,7 +31,7 @@ Computing Center and Jarkko Oikarinen"; #include "numeric.h" #include "h.h" - +extern char backupbuf[]; static char buffer[1024]; /* @@ -65,6 +65,14 @@ int do_numeric(numeric, cptr, sptr, parc, parv) /* Remap low number numerics. */ if (numeric < 100) numeric += 100; + + if (numeric == ERR_NOTONCHANNEL) + if (!MyClient(sptr) && IsServer(sptr)) + { + sendto_umode(UMODE_EYES, "Recieved ERR_NOTONCHANNEL from remote server %s. Possible desynch, contact UnrealIRCd Team (%s)", + sptr->name, backupbuf); + } + /* ** Prepare the parameter portion of the message into 'buffer'. ** (Because the buffer is twice as large as the message buffer diff --git a/src/s_serv.c b/src/s_serv.c index 175957e41..64859180d 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -575,7 +575,7 @@ int m_server(cptr, sptr, parc, parv) { char *ch; int i; - char info[REALLEN + 1], *inpath, *host, *encr, *f; + char info[REALLEN + 61], *inpath, *host, *encr, *f; char pp[512]; aClient *acptr, *bcptr; aConfItem *aconf, *cconf; @@ -596,18 +596,22 @@ int m_server(cptr, sptr, parc, parv) { numeric = atoi(parv[3]); hop = atoi(parv[2]); - (void)strncpy(info, parv[4], REALLEN); + (void)strncpy(info, parv[4], REALLEN + 60); info[REALLEN] = '\0'; } else if (parc > 3 && atoi(parv[2])) { hop = atoi(parv[2]); - (void)strncpy(info, parv[3], REALLEN); + (void)strncpy(info, parv[3], REALLEN + 60); info[REALLEN] = '\0'; } +/* + We do not support "SERVER server :desc" anymore, this is an ugly hack + too + else if (parc > 2) { - (void)strncpy(info, parv[2], REALLEN); + (void)strncpy(info, parv[2], REALLEN + 60); if (parc > 3 && ((i = strlen(info)) < (REALLEN - 2))) { (void)strcat(info, " "); @@ -615,6 +619,7 @@ int m_server(cptr, sptr, parc, parv) info[REALLEN] = '\0'; } } +*/ /* ** Check for "FRENCH " infection ;-) (actually this should ** be replaced with routine to check the hostname syntax in @@ -1440,49 +1445,34 @@ int m_server_estab(cptr) /* ** m_links ** parv[0] = sender prefix -** parv[1] = servername mask ** or ** parv[0] = sender prefix -** parv[1] = server to query -** parv[2] = servername mask +** +** Recoded by Stskeeps */ int m_links(cptr, sptr, parc, parv) aClient *cptr, *sptr; int parc; char *parv[]; { - char *mask; + Link *lp; aClient *acptr; - if (parc > 2 && IsOper(cptr)) + for (lp = (Link *) return_servers(); lp; lp = lp->next) { - if (hunt_server(cptr, sptr, ":%s LINKS %s :%s", 1, parc, parv) - != HUNTED_ISME) - return 0; - mask = parv[2]; - } - else - mask = parc < 2 ? NULL : parv[1]; - - for (acptr = client, (void)collapse(mask); acptr; acptr = acptr->next) - { - if (!IsServer(acptr) && !IsMe(acptr)) - continue; - if (!BadPtr(mask) && match(mask, acptr->name)) - continue; - if (HIDE_ULINES == 1) - { - if (IsULine(acptr, acptr) && !IsAnOper(sptr)) - continue; - } + acptr = lp->value.cptr; + + /* Some checks */ + if (HIDE_ULINES && IsULine(acptr, acptr) && !IsAnOper(sptr)) + continue; sendto_one(sptr, rpl_str(RPL_LINKS), me.name, parv[0], acptr->name, acptr->serv->up, acptr->hopcount, (acptr->info[0] ? acptr->info : "(Unknown Location)")); - } + } sendto_one(sptr, rpl_str(RPL_ENDOFLINKS), me.name, parv[0], - BadPtr(mask) ? "*" : mask); + "*"); return 0; } @@ -2392,9 +2382,11 @@ int m_stats(cptr, sptr, parc, parv) switch (stat) { +#ifdef STRIPBADWORDS case 'b': badwords_stats(); break; +#endif case 'L': case 'l': /* @@ -2889,7 +2881,6 @@ int m_lusers(cptr, sptr, parc, parv) return 0; } -extern int Rha; void save_tunefile(void) { @@ -2907,7 +2898,6 @@ void save_tunefile(void) } fprintf(tunefile, "%li\n", TSoffset); fprintf(tunefile, "%li\n", IRCstats.me_max); - fprintf(tunefile, "%li\n", Rha); fclose(tunefile); } @@ -2924,8 +2914,6 @@ void load_tunefile(void) TSoffset = atol(buf); fgets(buf, 1023, tunefile); IRCstats.me_max = atol(buf); - fgets(buf, 1023, tunefile); - Rha = atol(buf); fclose(tunefile); } @@ -4557,7 +4545,7 @@ aMotd *read_botmotd(char *filename) (void)dgets(-1, NULL, 0); /* make sure buffer is at empty pos */ newmotd = last = NULL; - while (i = dgets(fd, line, 81) > 0) + while ((i = dgets(fd, line, 81)) > 0) { line[i] = '\0'; if ((tmp = (char *)strchr(line, '\n'))) @@ -4789,7 +4777,8 @@ void dump_map(cptr, server, mask, prompt_length, length) char *p = &prompt[prompt_length]; int cnt = 0, local = 0; aClient *acptr; - + Link *lp; + *p = '\0'; if (prompt_length > 60) @@ -4797,18 +4786,8 @@ void dump_map(cptr, server, mask, prompt_length, length) prompt, server->name); else { - for (acptr = client; acptr; acptr = acptr->next) - { - if (IsPerson(acptr)) - { - ++cnt; /* == */ - if (!strcmp(acptr->user->server, server->name)) - ++local; - } - } - sendto_one(cptr, rpl_str(RPL_MAP), me.name, cptr->name, prompt, - length, server->name, local, + length, server->name, server->serv->users, (server->serv->numeric ? (char *)my_itoa(server->serv-> numeric) : "")); cnt = 0; @@ -4826,40 +4805,29 @@ void dump_map(cptr, server, mask, prompt_length, length) strcpy(p, "|-"); - for (acptr = client; acptr; acptr = acptr->next) + for (lp = (Link *) return_servers(); lp; lp = lp->next) { - if (HIDE_ULINES == 1) - { - if (!IsServer(acptr) - || strcmp(acptr->serv->up, server->name)) - continue; - - if (IsULine(acptr, acptr) && !IsAnOper(cptr)) - continue; - } - - if (match(mask, acptr->name)) - acptr->flags &= ~FLAGS_MAP; - else - { - acptr->flags |= FLAGS_MAP; - cnt++; - } + acptr = lp->value.cptr; + if (acptr->srvptr != server) + continue; + + if (IsULine(acptr, acptr) && HIDE_ULINES && !IsAnOper(cptr)) + continue; + acptr->flags |= FLAGS_MAP; + cnt++; } - for (acptr = client; acptr; acptr = acptr->next) + for (lp = (Link *) return_servers(); lp; lp = lp->next) { - if (!(acptr->flags & FLAGS_MAP) || /* != */ - !IsServer(acptr) || strcmp(acptr->serv->up, server->name)) + acptr = lp->value.cptr; + if (acptr->srvptr != server) + continue; + if (!acptr->flags & FLAGS_MAP) continue; - if (HIDE_ULINES == 1) - { - if (IsULine(acptr, acptr) && !IsAnOper(cptr)) - continue; - } if (--cnt == 0) *p = '`'; dump_map(cptr, acptr, mask, prompt_length + 2, length - 2); + } if (prompt_length > 0) @@ -4878,16 +4846,20 @@ int m_map(cptr, sptr, parc, parv) int parc; char *parv[]; { + Link *lp; aClient *acptr; int longest = strlen(me.name); if (parc < 2) parv[1] = "*"; - for (acptr = client; acptr; acptr = acptr->next) - if (IsServer(acptr) - && (strlen(acptr->name) + acptr->hopcount * 2) > longest) + for (lp = (Link *) return_servers(); lp; lp = lp->next) + { + acptr = lp->value.cptr; + if ((strlen(acptr->name) + acptr->hopcount * 2) > longest) longest = strlen(acptr->name) + acptr->hopcount * 2; + } + for (acptr = client; acptr; acptr = acptr->next) if (longest > 60) longest = 60; diff --git a/src/s_unreal.c b/src/s_unreal.c index 5b14121fd..3f064379c 100644 --- a/src/s_unreal.c +++ b/src/s_unreal.c @@ -1307,6 +1307,29 @@ int m_svso(cptr, sptr, parc, parv) } } +#ifdef GUEST +int m_guest (cptr, sptr, parc, parv) +aClient *cptr, *sptr; +int parc; +char *parv[]; +{ +int randnum; +char guestnick[NICKLEN]; +char *param[2]; + +randnum = 1+(int) (99999.0*rand()/(RAND_MAX+10000.0)); +snprintf(guestnick, NICKLEN, "Guest%li", randnum); + +while(find_client(guestnick, (aClient *)NULL)) +{ +randnum = 1+(int) (99999.0*rand()/(RAND_MAX+10000.0)); +snprintf(guestnick, NICKLEN, "Guest%li", randnum); +} +param[0] = sptr->name; +param[1] = guestnick; +m_nick(sptr,cptr,2,param); +} +#endif int m_htm(cptr, sptr, parc, parv) aClient *cptr, *sptr; diff --git a/src/s_user.c b/src/s_user.c index c50a9eec3..fe8beab4e 100644 --- a/src/s_user.c +++ b/src/s_user.c @@ -843,6 +843,8 @@ static int register_user(cptr, sptr, nick, username, umode, virthost) } SetClient(sptr); IRCstats.clients++; + if (sptr->srvptr && sptr->srvptr->serv) + sptr->srvptr->serv->users++; user->virthost = (char *)make_virthost(user->realhost, user->virthost, 1); if (MyConnect(sptr)) @@ -922,6 +924,10 @@ static int register_user(cptr, sptr, nick, username, umode, virthost) if ((find_uline(cptr->confs, sptr->user->server))) sptr->flags |= FLAGS_ULINE; } + if (sptr->umodes & UMODE_INVISIBLE) + { + IRCstats.invisible++; + } if (virthost && umode) { @@ -940,6 +946,7 @@ static int register_user(cptr, sptr, nick, username, umode, virthost) ircsprintf(sptr->user->virthost, virthost); } } + hash_check_notify(sptr, RPL_LOGON); /* Uglier hack */ send_umode(NULL, sptr, 0, SEND_UMODES, buf); /* NICKv2 Servers ! */ @@ -960,7 +967,8 @@ static int register_user(cptr, sptr, nick, username, umode, virthost) sendto_one(nsptr, ":%s PRIVMSG %s@%s :IDENTIFY %s", sptr->name, NickServ, SERVICES_NAME, sptr->passwd); /* Force the user to join the given chans -- codemastr */ - sendto_one(cptr,":%s MODE %s :%s", cptr->name, cptr->name, buf); + if (buf[1] != '\0') + sendto_one(cptr,":%s MODE %s :%s", cptr->name, cptr->name, buf); if (strcmp(AUTO_JOIN_CHANS, "0")) { @@ -1150,6 +1158,12 @@ int m_nick(cptr, sptr, parc, parv) { if (MyConnect(sptr)) { +#ifdef GUEST + if (IsUnknown(sptr)) { + m_guest(cptr, sptr, parc, parv); + return 0; + } +#endif sendto_one(sptr, err_str(ERR_NICKNAMEINUSE), me.name, BadPtr(parv[0]) ? "*" : parv[0], nick); return 0; /* NICK message ignored */ @@ -1311,6 +1325,12 @@ int m_nick(cptr, sptr, parc, parv) ** NICK is coming from local client connection. Just ** send error reply and ignore the command. */ +#ifdef GUEST + if (IsUnknown(sptr)) { + m_guest(cptr, sptr, parc, parv); + return 0; + } +#endif sendto_one(sptr, err_str(ERR_NICKNAMEINUSE), /* parv[0] is empty when connecting */ me.name, BadPtr(parv[0]) ? "*" : parv[0], nick); @@ -1791,10 +1811,11 @@ static int m_message(cptr, sptr, parc, parv, notice) me.name, parv[0], acptr->name, acptr->user->away); #ifdef STRIPBADWORDS - if (IsFilteringWords(acptr)) - sendto_prefix_one(acptr, sptr, - ":%s %s %s :%s", parv[0], cmd, nick, - stripbadwords_message(parv[2])); + if (!(IsULine(acptr, acptr) || IsULine(cptr, sptr)) && + IsFilteringWords(acptr)) + sendto_prefix_one(acptr, sptr, + ":%s %s %s :%s", parv[0], cmd, nick, + stripbadwords_message(parv[2])); else #endif sendto_message_one(acptr, @@ -2893,7 +2914,6 @@ int m_user(cptr, sptr, parc, parv) if (!IsServer(cptr)) { - sptr->umodes |= (UFLAGS & atoi(host)); if (MODE_I == 1) { sptr->umodes |= UMODE_INVISIBLE; @@ -2905,15 +2925,11 @@ int m_user(cptr, sptr, parc, parv) } if (MODE_STRIPWORDS == 1) { - sptr->umodes |= MODE_STRIPWORDS; + sptr->umodes |= UMODE_STRIPBADWORDS; } } - if (sptr->umodes & UMODE_INVISIBLE) - { - IRCstats.invisible++; - } strncpyzt(user->realhost, host, sizeof(user->realhost)); user->server = me_hash; @@ -3990,84 +4006,65 @@ int m_pass(cptr, sptr, parc, parv) * m_userhost added by Darren Reed 13/8/91 to aid clients and reduce * the need for complicated requests like WHOIS. It returns user/host * information only (no spurious AWAY labels or channels). + * Re-written by Dianora 1999 */ int m_userhost(cptr, sptr, parc, parv) aClient *cptr, *sptr; int parc; char *parv[]; { - int catsize; - char *p = NULL; - aClient *acptr; - char *s; - char *curpos; - int resid; + char *p; /* scratch end pointer */ + char *cn; /* current name */ + struct Client *acptr; + char response[5][NICKLEN*2+CHANNELLEN+USERLEN+HOSTLEN+30]; + int i; /* loop counter */ - if (parc > 2) - (void)m_userhost(cptr, sptr, parc - 1, parv + 1); + if (parc < 2) + { + sendto_one(sptr, rpl_str(ERR_NEEDMOREPARAMS), + me.name, parv[0], "USERHOST"); + return 0; + } - if (parc < 2) - { - sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), - me.name, parv[0], "USERHOST"); - return 0; - } + /* The idea is to build up the response string out of pieces + * none of this strlen() nonsense. + * 5 * (NICKLEN*2+CHANNELLEN+USERLEN+HOSTLEN+30) is still << sizeof(buf) + * and our ircsprintf() truncates it to fit anyway. There is + * no danger of an overflow here. -Dianora + */ + response[0][0] = response[1][0] = response[2][0] = + response[3][0] = response[4][0] = '\0'; - /* - * use curpos to keep track of where we are in the output buffer, - * and use resid to keep track of the remaining space in the - * buffer - */ - curpos = buf; - curpos += sprintf(curpos, rpl_str(RPL_USERHOST), me.name, parv[0]); - resid = sizeof(buf) - (curpos - buf) - 1; /* remaining space */ + cn = parv[1]; - /* - * for each user found, print an entry if it fits. - */ - for (s = strtoken(&p, parv[1], " "); s; - s = strtoken(&p, (char *)NULL, " ")) - if ((acptr = find_person(s, NULL))) - { - catsize = strlen(acptr->name) - + (IsAnOper(acptr) ? 1 : 0) - + 3 - + strlen(acptr->user->username) - + strlen(acptr->user->realhost) + 1; - if (catsize <= resid) - { - curpos += sprintf(curpos, "%s%s=%c%s@%s ", - acptr->name, - IsAnOper(acptr) ? "*" : "", - (acptr->user->away) ? '-' : '+', - acptr->user->username, - ((IsOper(sptr) || acptr == sptr) ? - acptr->user->realhost : - (IsHidden(acptr) ? acptr->user-> - virthost : acptr->user->realhost))); - if (IsWhois(acptr) && IsOper(sptr)) - { -/* - sendto_one(acptr, - ":%s NOTICE %s :*** %s did a /userhost on you.", - me.name, sptr->name, sptr->name); -*/ - } - resid -= catsize; - } - } + for(i=0; (i < 5) && cn; i++ ) + { + if((p = strchr(cn, ' '))) + *p = '\0'; - /* - * because of some trickery here, we might have the string end in - * "...:" or "foo " (note the trailing space) - * If we have a trailing space, nuke it here. - */ - curpos--; - if (*curpos != ':') - *curpos = '\0'; - sendto_one(sptr, "%s", buf); - return 0; + if ((acptr = find_person(cn, NULL))) + { + ircsprintf(response[i], "%s%s=%c%s@%s", + acptr->name, + IsAnOper(acptr) ? "*" : "", + (acptr->user->away) ? '-' : '+', + acptr->username, + ((acptr != sptr) && !IsOper(sptr) + && IsHidden(acptr) ? acptr->user->virthost : + acptr->user->realhost)); + } + if(p) + p++; + cn = p; + } + + ircsprintf(buf, "%s%s %s %s %s %s", + rpl_str(RPL_USERHOST), + response[0], response[1], response[2], response[3], response[4] ); + sendto_one(sptr, buf, me.name, parv[0]); + + return 0; } /* @@ -4437,10 +4434,13 @@ int m_umode(cptr, sptr, parc, parv) } if (!(setflags & UMODE_INVISIBLE) && IsInvisible(sptr)) + { IRCstats.invisible++; + } if ((setflags & UMODE_INVISIBLE) && !IsInvisible(sptr)) + { IRCstats.invisible--; - + } /* * compare new flags with old flags and send string which * will cause servers to update correctly. @@ -4539,9 +4539,13 @@ int m_svs2mode(cptr, sptr, parc, parv) break; case 'i': if (what == MODE_ADD) + { IRCstats.invisible++; + } if (what == MODE_DEL) + { IRCstats.invisible--; + } goto setmodey; case 'o': if (what == MODE_ADD) @@ -4632,15 +4636,21 @@ int m_svsmode(cptr, sptr, parc, parv) break; case 'i': if (what == MODE_ADD) + { IRCstats.invisible++; + } if (what == MODE_DEL) + { + IRCstats.invisible--; + } goto setmodex; case 'o': if (what == MODE_ADD) IRCstats.operators++; if (what == MODE_DEL) IRCstats.operators--; + goto setmodex; case 'd': if (parv[3] && isdigit(*parv[3])) { diff --git a/src/support.c b/src/support.c index 2a36092a7..679fbf00c 100644 --- a/src/support.c +++ b/src/support.c @@ -581,32 +581,3 @@ char *inetntop(af, in, out, the_size) return out; } #endif - -extern int Rha; -/* - * Disconnect all users connected to local server incase of /restart slow - * (development tool to test load conditions, should be turned off in releases) -*/ -int rh(void) -{ - int fd; - return 0; - /* test if this is an development release, just for security - - we test if there is a Unreal*l, as it would be Unreal3.1-Silverheart(devel) - - should really be an define, but i need it to be !DEVELOP as well, - for testing phases at irc.ircsystems.net - - */ - if (!is_enabled("Unreal*l*", Rh VERSIONONLY)) - return 0; - - - for (fd = 0; fd < MAXCONNECTIONS; fd++) - { - close(fd); - } - - Rha = 1; - save_tunefile(); -} diff --git a/src/win32.c b/src/win32.c index d7c5fd64f..11afa414e 100644 --- a/src/win32.c +++ b/src/win32.c @@ -1 +1,907 @@ -Binary file win32.c matches +/************************************************************************ +/************************************************************************ + * IRC - Internet Relay Chat, win32.c + * Copyright (C) 1996 Daniel Hazelbaker + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 1, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef lint +static char sccsid[] = "@(#)win32.c 2.01 10/21/96 (C) 1996 Daniel Hazelbaker"; +#endif + + +#define APPNAME "wIRCD" +#define wTITLEBAR "UnrealIRCd" + +// Windows Header Files: +#include "common.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "struct.h" +#include "sys.h" +#include +#include +#include "h.h" +#include "version.h" +#include "resource.h" +#include "CioFunc.h" + +ID_CVS("$Id$"); + + +BOOL InitApplication(HINSTANCE); +BOOL InitInstance(HINSTANCE, int); +LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); +LRESULT CALLBACK About(HWND, UINT, WPARAM, LPARAM); +LRESULT CALLBACK Dlg_IRCDCONF(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK Dlg_IRCDMOTD(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK Dlg_IRCDRULES(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); + +BOOL DisplayString(HWND hWnd, char *InBuf, ...); +void LoadSetup(void); +void SaveSetup(void); +int SetDebugLevel(HWND hWnd, int NewLevel); + +LRESULT CALLBACK Credits(HWND, UINT, WPARAM, LPARAM); +LRESULT CALLBACK Dreamforge(HWND, UINT, WPARAM, LPARAM); +LRESULT CALLBACK IRCDLicense(HWND, UINT, WPARAM, LPARAM); + + +extern void SocketLoop(void *dummy), s_rehash(), do_dns_async(HANDLE id); +extern int localdie(void), InitwIRCD(int argc, char *argv[]); + + +HINSTANCE hInst; // current instance +char szAppName[] = APPNAME; // The name of this application +char szTitle[] = wTITLEBAR; // The title bar text +HWND hwIRCDWnd=NULL, hCio=NULL; +HANDLE hMainThread = 0; + +#ifndef IRCDTOTALVERSION +#define IRCDTOTALVERSION BASE_VERSION PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9 +#endif + +/* + * FUNCTION: WinMain(HANDLE, HANDLE, LPSTR, int) + * + * PURPOSE: Entry point for the application. + * + * COMMENTS: + * + * This function initializes the application and processes the + * message loop. + */ +int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +{ + MSG msg; + HANDLE hAccelTable; + int argc=1; + char *s, *argv[20], String[128]; + + if (!hPrevInstance) + if (!InitApplication(hInstance)) + return (FALSE); + + if (!InitInstance(hInstance, nCmdShow)) + return (FALSE); + + argv[0] = "WIRCD.EXE"; + if ( *(s = lpCmdLine) ) + { + argv[argc++] = s; + while ( (s = strchr(s, ' ')) != NULL ) + { + while ( *s == ' ' ) *s++ = 0; + argv[argc++] = s; + } + } + argv[argc] = NULL; + if ( InitwIRCD(argc, argv) != 1 ) + return FALSE; + + wsprintf(String, "UnrealIRCd/32 - %s", me.name); + SetWindowText(hwIRCDWnd, String); + + SetDebugLevel(hwIRCDWnd, debuglevel); + + hMainThread = (HANDLE)_beginthread(SocketLoop, 0, NULL); + hAccelTable = LoadAccelerators (hInstance, szAppName); + + LoadSetup(); + atexit(SaveSetup); + + /* Say we are ready to recieve connections */ + wsprintf(String, "%c%c%c%c[info] -=-=[ UnrealIRCd/32 v%s Ready ] - %s\r", 0,0,0,0, VERSIONONLY); + DisplayString(hCio, String); + /* Main message loop */ + while (GetMessage(&msg, NULL, 0, 0)) + { + if ( !TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + return (msg.wParam); + lpCmdLine; /* This will prevent 'unused formal parameter' warnings */ +} + + +/* + * FUNCTION: InitApplication(HANDLE) + * + * PURPOSE: Initializes window data and registers window class + * + * COMMENTS: + * + * In this function, we initialize a window class by filling out a data + * structure of type WNDCLASS and calling either RegisterClass or + * the internal MyRegisterClass. + */ +BOOL InitApplication(HINSTANCE hInstance) +{ + WNDCLASS wc; + + // Fill in window class structure. + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = (WNDPROC)FrameWndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = hInstance; + wc.hIcon = LoadIcon (hInstance, APPNAME); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); + wc.lpszMenuName = szAppName; + wc.lpszClassName = szAppName; + + if ( !RegisterClass(&wc) ) return 0; + + return 1; +} + + +/* + * FUNCTION: InitInstance(HANDLE, int) + * + * PURPOSE: Saves instance handle and creates main window + * + * COMMENTS: + * + * In this function, we save the instance handle in a global variable and + * create and display the main program window. + */ +BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) +{ + HWND hWnd; + WSADATA WSAData; + + + if ( WSAStartup(MAKEWORD(1, 1), &WSAData) != 0 ) + { + MessageBox(NULL, "UnrealIRCD/32 Init Error", "Unable to initialize WinSock DLL", MB_OK); + return FALSE; + } + + hInst = hInstance; /* Store instance handle in our global variable */ + + if ( !Cio_Init(hInst) ) + { + MessageBox(NULL, "UnrealIRCD/32 Init Error", "Couldn't Init CIO Library", MB_OK); + return FALSE; + } + + hWnd = CreateWindow(szAppName, szTitle, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, + NULL, NULL, hInstance, NULL); + + if ( !hWnd ) + return (FALSE); + + ShowWindow(hWnd, nCmdShow); + UpdateWindow(hwIRCDWnd = hWnd); + + return (TRUE); +} + + +/* + * FUNCTION: FrameWndProc(HWND, unsigned, WORD, LONG) + * + * PURPOSE: Processes messages for the main window. + * + */ +LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + int wmId, wmEvent; + char *xx = NULL; + + switch (message) + { + case WM_CREATE: + hCio = Cio_Create(hInst, hWnd, WS_VISIBLE, 0, 0, 300, 200); + xx = MyMalloc(1024); + sprintf(xx, "%c%c%c%c[info] -=-=[ UnrealIRCd/32 v%s Loading ]-=-=\r", 0, 0, 0, 0, + VERSIONONLY); + DisplayString(hCio, xx); +#ifdef WIN32_SPECIFY + sprintf(xx, "%c%c%c%c[info] - Ported by %s", 0,0,0,0, WIN32_PORTER); + DisplayString(hCio, xx); + sprintf(xx, "%c%c%c%c[info] - %s", 0,0,0,0, WIN32_URL); + DisplayString(hCio, xx); +#endif + MyFree(xx); + return 0; + case WM_COMMAND: + wmId = LOWORD(wParam); + wmEvent = HIWORD(wParam); + + switch (wmId) + { + case IDM_ABOUT: + DialogBox(hInst, "AboutBox", hWnd, (DLGPROC)About); + break; + case IDM_CREDITS: + DialogBox(hInst, "AboutBox", hWnd, (DLGPROC)Credits); + break; + case IDM_DF: + DialogBox(hInst, "AboutBox", hWnd, (DLGPROC)Dreamforge); + break; + case IDM_LICENSE: + DialogBox(hInst, "AboutBox", hWnd, (DLGPROC)IRCDLicense); + break; + + case IDM_IRCDCONF: + DialogBox(hInst, "DLG_IRCDCONF", hWnd, (DLGPROC)Dlg_IRCDCONF); + break; + case IDM_IRCDMOTD: + DialogBox(hInst, "DLG_IRCDMOTD", hWnd, (DLGPROC)Dlg_IRCDMOTD); + break; + case IDM_IRCDRULES: + DialogBox(hInst, "DLG_IRCDRULES", hWnd, (DLGPROC)Dlg_IRCDRULES); + break; + case IDM_REHASH: + s_rehash(); + break; + + case IDM_EXIT: + if ( MessageBox(hWnd, "Are you sure?", + "Terminate UnrealIRCD/32", + MB_ICONQUESTION | MB_YESNO) == IDNO ) + break; + DestroyWindow(hWnd); + break; + + case IDM_DBGOFF: + case IDM_DBGFATAL: + case IDM_DBGERROR: + case IDM_DBGNOTICE: + case IDM_DBGDNS: + case IDM_DBGINFO: + case IDM_DBGNUM: + case IDM_DBGSEND: + case IDM_DBGDEBUG: + case IDM_DBGMALLOC: + case IDM_DBGLIST: + SetDebugLevel(hWnd, wmId-IDM_DBGFATAL); + break; + + default: + return (DefWindowProc(hWnd, message, wParam, lParam)); + } + break; + + case WM_CLOSE: + if ( MessageBox(hWnd, "Are you sure?", "Terminate UnrealIRCd/32", + MB_ICONQUESTION | MB_YESNO) == IDNO ) + break; + return (DefWindowProc(hWnd, message, wParam, lParam)); + + case WM_DESTROY: + localdie(); /* Never returns */ + PostQuitMessage(0); + break; + + case WM_SIZE: + SetWindowPos(hCio, NULL, 0, 0, LOWORD(lParam), HIWORD(lParam), + SWP_NOZORDER); + /* Fallthrough to get the default handling too. */ + + default: + return (DefWindowProc(hWnd, message, wParam, lParam)); + } + return (0); +} + + +/* + * FUNCTION: About(HWND, unsigned, WORD, LONG) + * + * PURPOSE: Processes messages for "About" dialog box + * This version allows greater flexibility over the contents of the 'About' box, + * by pulling out values from the 'Version' resource. + * + * MESSAGES: + * + * WM_INITDIALOG - initialize dialog box + * WM_COMMAND - Input received + * + */ +LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_INITDIALOG: +#define Ccat strcat(String, String2) + { + char String[16384], String2[16384], **s = infotext; + sprintf(String, "%s\n%s", version, creation); + SetDlgItemText(hDlg, IDC_VERSION, String); + String[0] = 0; String2[0] = 0; + sprintf(String2, "-=-=-=-=-=-==-==- %s -=-=-==-==-=-=-=-=-=-\r\n", ircnetwork); Ccat; + sprintf(String2, "|Web Page: | http://www.%s\r\n", netdomain); Ccat; + sprintf(String2, "|FTP Archive: | ftp://ftp.%s\r\n", netdomain); Ccat; + sprintf(String2, "|Help channel: | %s\r\n", helpchan); Ccat; + sprintf(String2, "|=-=-=-=-=-==-==|-=-=-=-=-=-=-==-==-=-=-=-=-=-=-=\r\n"); Ccat; + sprintf(String2, "|IRCd version: | %s\r\n", IRCDTOTALVERSION); Ccat; + sprintf(String2, "| Developers: | Stskeeps \r\n"); Ccat; + sprintf(String2, "| | codemastr \r\n"); Ccat; +#if defined(_WIN32) && defined(WIN32_SPECIFY) + sprintf(String2, "| Win32 Porter: | %s\r\n", WIN32_PORTER); Ccat; + sprintf(String2, "| >>URL: | %s\r\n", WIN32_URL); Ccat; +#endif + sprintf(String2, "|Credits: | Type /Credits\r\n"); Ccat; + sprintf(String2, "|DALnet Credits:| Type /DALinfo\r\n"); Ccat; + sprintf(String2, "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-\r\n"); Ccat; + sprintf(String2, "| Unreal IRCd can be downloaded at http://unreal.tspre.org\r\n"); Ccat; + sprintf(String2, "| This notice may not be removed from the IRCd package\r\n"); Ccat; + sprintf(String2, "| It will be a violation of copyright. This program must always stay free of charge\r\n"); Ccat; + sprintf(String2, "| being sold commercially or privately\r\n"); Ccat; + sprintf(String2, "| Only charge may be for the transport medium like on CD-ROM, floppy\r\n"); Ccat; + sprintf(String2, "| or other kinds (-Stskeeps'1999)\r\n"); Ccat; + sprintf(String2, "--------------------------------------------\r\n"); Ccat; + SetDlgItemText(hDlg, IDC_INFOTEXT, String); +#undef Ccat + ShowWindow (hDlg, SW_SHOW); + return (TRUE); + } + + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, TRUE); + return (TRUE); + } + break; + } + return FALSE; +} + +/* + * FUNCTION: Credits(HWND, unsigned, WORD, LONG) + * + * PURPOSE: Processes messages for "Credits" dialog box + * This version allows greater flexibility over the contents of the 'Credits' box, + * by pulling out values from the 'Version' resource. + * + * MESSAGES: + * + * WM_INITDIALOG - initialize dialog box + * WM_COMMAND - Input received + * + */ +LRESULT CALLBACK Credits(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_INITDIALOG: + { + char String[16384], **s = unrealcredits; + + sprintf(String, "%s\n%s", version, creation); + SetDlgItemText(hDlg, IDC_VERSION, String); + String[0] = 0; + while ( *s ) + { + strcat(String, *s++); + if ( *s ) + strcat(String, "\r\n"); + } + SetDlgItemText(hDlg, IDC_INFOTEXT, String); + + + ShowWindow (hDlg, SW_SHOW); + return (TRUE); + } + + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, TRUE); + return (TRUE); + } + break; + } + return FALSE; +} + +/* + * FUNCTION: Dreamforge(HWND, unsigned, WORD, LONG) + * + * PURPOSE: Processes messages for "Dreamforge" dialog box + * This version allows greater flexibility over the contents of the 'Dreamforge' box, + * by pulling out values from the 'Version' resource. + * + * MESSAGES: + * + * WM_INITDIALOG - initialize dialog box + * WM_COMMAND - Input received + * + */ +LRESULT CALLBACK Dreamforge(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_INITDIALOG: + { + char String[16384], **s = dalinfotext; + + sprintf(String, "%s\n%s", version, creation); + SetDlgItemText(hDlg, IDC_VERSION, String); + String[0] = 0; + while ( *s ) + { + strcat(String, *s++); + if ( *s ) + strcat(String, "\r\n"); + } + SetDlgItemText(hDlg, IDC_INFOTEXT, String); + + + ShowWindow (hDlg, SW_SHOW); + return (TRUE); + } + + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, TRUE); + return (TRUE); + } + break; + } + return FALSE; +} + +/* + * FUNCTION: IRCDLicense(HWND, unsigned, WORD, LONG) + * + * PURPOSE: Processes messages for "IRCDLicense" dialog box + * This version allows greater flexibility over the contents of the 'IRCDLicense' box, + * by pulling out values from the 'Version' resource. + * + * MESSAGES: + * + * WM_INITDIALOG - initialize dialog box + * WM_COMMAND - Input received + * + */ +LRESULT CALLBACK IRCDLicense(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_INITDIALOG: + { + char String[16384], **s = gnulicense; + + sprintf(String, "%s\n%s", version, creation); + SetDlgItemText(hDlg, IDC_VERSION, String); + String[0] = 0; + while ( *s ) + { + strcat(String, *s++); + if ( *s ) + strcat(String, "\r\n"); + } + SetDlgItemText(hDlg, IDC_INFOTEXT, String); + + + ShowWindow (hDlg, SW_SHOW); + return (TRUE); + } + + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, TRUE); + return (TRUE); + } + break; + } + return FALSE; +} + + +/* + * FUNCTION: Dlg_IrcdConf(HWND, unsigned, WORD, LONG) + * + * PURPOSE: Processes messages for "DLG_IRCDCONF" dialog box + * + */ +LRESULT CALLBACK Dlg_IRCDCONF(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_INITDIALOG: + { + char *Buffer = MyMalloc(65535); /* Should be big enough */ + int fd, Len; + + if ( !Buffer ) + { + MessageBox(hDlg, "Error: Could not allocate temporary buffer", + "UnrealIRCd/32 Setup", MB_OK); + EndDialog(hDlg, FALSE); + return FALSE; + } + /* Open the ircd.conf file */ + fd = open(CONFIGFILE, _O_RDONLY | _O_BINARY); + if ( fd == -1 ) + { + MessageBox(hDlg, "Error: Could not open configuration file", + "UnrealIRCd/32 Setup", MB_OK); + MyFree(Buffer); + EndDialog(hDlg, FALSE); + return FALSE; + } + + Buffer[0] = 0; /* Incase read() fails */ + Len = read(fd, Buffer, 65535); + Buffer[Len] = 0; + /* Set the text for the edit control to what was in the file */ + SendDlgItemMessage(hDlg, IDC_IRCDCONF, WM_SETTEXT, 0, + (LPARAM)(LPCTSTR)Buffer); + + close(fd); + MyFree(Buffer); + } + return (TRUE); + + case WM_COMMAND: + if ( LOWORD(wParam) == IDOK ) + { + char *Buffer = MyMalloc(65535); /* Should be big enough */ + DWORD Len; + int fd; + + if ( !Buffer ) + { + MessageBox(hDlg, "Error: Could not allocate temporary buffer", + "UnrealIRCD/32 Setup", MB_OK); + return TRUE; + } + /* Open the ircd.conf file */ + fd = open(CONFIGFILE, _O_TRUNC|_O_CREAT|_O_RDWR|_O_BINARY, + S_IREAD|S_IWRITE); + if ( fd == -1 ) + { + MessageBox(hDlg, "Error: Could not open configuration file", + "UnrealIRCD/32 Setup", MB_OK); + MyFree(Buffer); + return TRUE; + } + + /* Get the text from the edit control and save it to disk. */ + Len = SendDlgItemMessage(hDlg, IDC_IRCDCONF, WM_GETTEXT, 65535, + (LPARAM)(LPCTSTR)Buffer); + write(fd, Buffer, Len); + + close(fd); + MyFree(Buffer); + + EndDialog(hDlg, TRUE); + return TRUE; + } + if ( LOWORD(wParam) == IDCANCEL ) + { + EndDialog(hDlg, FALSE); + return TRUE; + } + break; + } + + return FALSE; +} + +/* + * FUNCTION: Dlg_Dlg_IRCdMotd(HWND, unsigned, WORD, LONG) + * + * PURPOSE: Processes messages for "DLG_IRCDCONF" dialog box + * + */ +LRESULT CALLBACK Dlg_IRCDMOTD(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_INITDIALOG: + { + char *Buffer = MyMalloc(65535*2); /* Should be big enough */ + int fd, Len; + + if ( !Buffer ) + { + MessageBox(hDlg, "Error: Could not allocate temporary buffer", + "UnrealIRCd/32 Setup", MB_OK); + EndDialog(hDlg, FALSE); + return FALSE; + } + /* Open the ircd.motd file */ + fd = open(MPATH, _O_RDONLY | _O_BINARY); + if ( fd == -1 ) + { + MessageBox(hDlg, "Error: Could not open MOTD file", + "UnrealIRCd/32 Setup", MB_OK); + MyFree(Buffer); + EndDialog(hDlg, FALSE); + return FALSE; + } + + Buffer[0] = 0; /* Incase read() fails */ + Len = read(fd, Buffer, 65535); + Buffer[Len] = 0; + /* Set the text for the edit control to what was in the file */ + SendDlgItemMessage(hDlg, IDC_IRCDCONF, WM_SETTEXT, 0, + (LPARAM)(LPCTSTR)Buffer); + + close(fd); + MyFree(Buffer); + } + return (TRUE); + + case WM_COMMAND: + if ( LOWORD(wParam) == IDOK ) + { + char *Buffer = MyMalloc(65535); /* Should be big enough */ + DWORD Len; + int fd; + + if ( !Buffer ) + { + MessageBox(hDlg, "Error: Could not allocate temporary buffer", + "UnrealIRCD/32 Setup", MB_OK); + return TRUE; + } + /* Open the ircd.motd file */ + fd = open(MPATH, _O_TRUNC|_O_CREAT|_O_RDWR|_O_BINARY, + S_IREAD|S_IWRITE); + if ( fd == -1 ) + { + MessageBox(hDlg, "Error: Could not open motd file", + "UnrealIRCD/32 Setup", MB_OK); + MyFree(Buffer); + return TRUE; + } + + /* Get the text from the edit control and save it to disk. */ + Len = SendDlgItemMessage(hDlg, IDC_IRCDCONF, WM_GETTEXT, 65535, + (LPARAM)(LPCTSTR)Buffer); + write(fd, Buffer, Len); + + close(fd); + MyFree(Buffer); + + EndDialog(hDlg, TRUE); + return TRUE; + } + if ( LOWORD(wParam) == IDCANCEL ) + { + EndDialog(hDlg, FALSE); + return TRUE; + } + break; + } + + return FALSE; +} + +/* + * FUNCTION: Dlg_IRCdRules(HWND, unsigned, WORD, LONG) + * + * PURPOSE: Processes messages for "DLG_IRCDCONF" dialog box + * + */ +LRESULT CALLBACK Dlg_IRCDRULES(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_INITDIALOG: + { + char *Buffer = MyMalloc(65535*2); /* Should be big enough */ + int fd, Len; + + if ( !Buffer ) + { + MessageBox(hDlg, "Error: Could not allocate temporary buffer", + "UnrealIRCd/32 Setup", MB_OK); + EndDialog(hDlg, FALSE); + return FALSE; + } + /* Open the ircd.rules file */ + fd = open(RPATH, _O_RDONLY | _O_BINARY); + if ( fd == -1 ) + { + MessageBox(hDlg, "Error: Could not open rules file", + "UnrealIRCd/32 Setup", MB_OK); + MyFree(Buffer); + EndDialog(hDlg, FALSE); + return FALSE; + } + + Buffer[0] = 0; /* Incase read() fails */ + Len = read(fd, Buffer, 65535); + Buffer[Len] = 0; + /* Set the text for the edit control to what was in the file */ + SendDlgItemMessage(hDlg, IDC_IRCDCONF, WM_SETTEXT, 0, + (LPARAM)(LPCTSTR)Buffer); + + close(fd); + MyFree(Buffer); + } + return (TRUE); + + case WM_COMMAND: + if ( LOWORD(wParam) == IDOK ) + { + char *Buffer = MyMalloc(65535); /* Should be big enough */ + DWORD Len; + int fd; + + if ( !Buffer ) + { + MessageBox(hDlg, "Error: Could not allocate temporary buffer", + "UnrealIRCD/32 Setup", MB_OK); + return TRUE; + } + /* Open the ircd.rules file */ + fd = open(RPATH, _O_TRUNC|_O_CREAT|_O_RDWR|_O_BINARY, + S_IREAD|S_IWRITE); + if ( fd == -1 ) + { + MessageBox(hDlg, "Error: Could not open rules file", + "UnrealIRCD/32 Setup", MB_OK); + MyFree(Buffer); + return TRUE; + } + + /* Get the text from the edit control and save it to disk. */ + Len = SendDlgItemMessage(hDlg, IDC_IRCDCONF, WM_GETTEXT, 65535, + (LPARAM)(LPCTSTR)Buffer); + write(fd, Buffer, Len); + + close(fd); + MyFree(Buffer); + + EndDialog(hDlg, TRUE); + return TRUE; + } + if ( LOWORD(wParam) == IDCANCEL ) + { + EndDialog(hDlg, FALSE); + return TRUE; + } + break; + } + + return FALSE; +} + + +int DisplayString(HWND hWnd, char *InBuf, ...) +{ + CioWndInfo *CWI; + va_list argptr; + char *Buffer=NULL, *Ptr=NULL; + DWORD Len=0, TLen=0, Off=0, i=0; + BYTE Red=0, Green=0, Blue=0; + BOOL Bold = FALSE; + + if ( (Buffer = LocalAlloc(LPTR, 16384)) == NULL ) return FALSE; + + va_start(argptr, InBuf); + Len = vsprintf(Buffer, InBuf, argptr); + va_end(argptr); + if ( Len == 0 ) + { + LocalFree(Buffer); + return FALSE; + } + + CWI = (CioWndInfo *)GetWindowLong(hWnd, GWL_USER); + for ( i = 0; i < Len; i++ ) + { + if ( Buffer[i] == 0 ) + { + i+=3; + continue; + } + if ( Buffer[i] == 0x02 ) + { + if ( !Bold ) + { + Buffer[i] = 0; + Cio_Puts(hWnd, Buffer+Off, i-Off); + Red = CWI->FR; + Green = CWI->FG; + Blue = CWI->FB; + + Off=i+1; + Cio_PrintF(hWnd, "%c%c%c%c", 0, 255, 32, 32); + Bold = 1; + continue; + } + if ( Bold ) + { + Buffer[i] = 0; + Cio_Puts(hWnd, Buffer+Off, i-Off); + Off=i+1; + Cio_PrintF(hWnd, "%c%c%c%c", 0, Red, Green, Blue); + Bold = 0; + continue; + } + } + } + Cio_Puts(hWnd, Buffer+Off, Len-Off); + + LocalFree(Buffer); + return TRUE; +} + + +void LoadSetup(void) +{ +} + +void SaveSetup(void) +{ +} + + +int SetDebugLevel(HWND hWnd, int NewLevel) +{ + HMENU hMenu = GetMenu(hWnd); + + if ( !hMenu || !(hMenu = GetSubMenu(hMenu, 1)) || + !(hMenu = GetSubMenu(hMenu, 4)) ) + return -1; + + CheckMenuItem(hMenu, IDM_DBGFATAL+debuglevel, + MF_BYCOMMAND | MF_UNCHECKED); + debuglevel = NewLevel; + CheckMenuItem(hMenu,IDM_DBGFATAL+debuglevel, + MF_BYCOMMAND | MF_CHECKED); + + return debuglevel; +} + + + diff --git a/update b/update index 2b8f9885a..df3400835 100755 --- a/update +++ b/update @@ -8,11 +8,18 @@ # # NO WARRANTY IS INCLUDED CURRENT_VERSION="Unreal3.1-Silverheart" +WHATYAWANT="wget" clear cat .UPDATE cd src rm update.sh -wget http://unreal.tspre.org/update.sh +read $WHATYAWANT +if [ "$WHATYWANT" == "wget" ] ; then + wget http://unreal.tspre.org/update.sh +else + lynx -source http://unreal.tspre.org/update.sh > update.sh +fi + chmod +x update.sh export CURRENT_VERSION ./update.sh