--- ./src/Makefile.am.orig	Sat Dec  9 14:53:57 2006

+++ ./src/Makefile.am	Sun Jan 14 17:51:18 2007

@@ -27,4 +27,6 @@

 endif

+BUILT_SOURCES=	version.c directories.c

+

 # what to build

 bin_PROGRAMS = bogofilter bogoutil bogolexer bogotune

@@ -44,5 +46,4 @@

 bogoutil_LDADD = $(LDADD) $(LIBDB)

 configtest_LDADD = $(LDADD) $(LIBDB)

-bogofilter_DEPENDENCIES = $(LDADD)

 if NEED_GSL

@@ -60,5 +61,5 @@

 noinst_LIBRARIES += libbf_gsl.a

 libbf_gsl_a_CPPFLAGS= -I$(top_srcdir)

-bogofilter_DEPENDENCIES += libbf_gsl.a

+BUILT_SOURCES += libbf_gsl.a

 endif

@@ -152,6 +153,4 @@

 	datastore_db.h \

 	mysetvbuf.c mysetvbuf.h

-

-BUILT_SOURCES=	version.c directories.c

 libbogofilter_a_SOURCES = \

--- ./src/Makefile.in.orig	Sun Jan 14 17:51:53 2007

+++ ./src/Makefile.in	Sun Jan 14 17:52:38 2007

@@ -233,4 +233,6 @@

 am_bogofilter_OBJECTS = bogofilter.$(OBJEXT) main.$(OBJEXT)

 bogofilter_OBJECTS = $(am_bogofilter_OBJECTS)

+bogofilter_DEPENDENCIES = $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_2) \

+	$(am__DEPENDENCIES_2)

 am__objects_5 = bogofilter.$(OBJEXT) main.$(OBJEXT)

 am_bogofilter_static_OBJECTS = $(am__objects_5)

@@ -384,5 +386,4 @@

 EXEEXT = @EXEEXT@

 EXE_EXT = @EXE_EXT@

-GREP = @GREP@

 GSL_CFLAGS = @GSL_CFLAGS@

 GSL_CONFIG = @GSL_CONFIG@

@@ -443,5 +444,8 @@

 USE_UNICODE = @USE_UNICODE@

 VERSION = @VERSION@

+ac_ct_AR = @ac_ct_AR@

 ac_ct_CC = @ac_ct_CC@

+ac_ct_RANLIB = @ac_ct_RANLIB@

+ac_ct_STRIP = @ac_ct_STRIP@

 ac_cv_enable_xmlto = @ac_cv_enable_xmlto@

 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

@@ -459,7 +463,4 @@

 build_vendor = @build_vendor@

 datadir = @datadir@

-datarootdir = @datarootdir@

-docdir = @docdir@

-dvidir = @dvidir@

 exec_prefix = @exec_prefix@

 host = @host@

@@ -468,5 +469,4 @@

 host_os = @host_os@

 host_vendor = @host_vendor@

-htmldir = @htmldir@

 includedir = @includedir@

 infodir = @infodir@

@@ -474,13 +474,10 @@

 libdir = @libdir@

 libexecdir = @libexecdir@

-localedir = @localedir@

 localstatedir = @localstatedir@

 mandir = @mandir@

 mkdir_p = @mkdir_p@

 oldincludedir = @oldincludedir@

-pdfdir = @pdfdir@

 prefix = @prefix@

 program_transform_name = @program_transform_name@

-psdir = @psdir@

 sbindir = @sbindir@

 sharedstatedir = @sharedstatedir@

@@ -503,4 +500,5 @@

 AM_CFLAGS = -DBOGOFILTER $(am__append_1)

+BUILT_SOURCES = version.c directories.c $(am__append_4)

 bin_SCRIPTS = bogoupgrade

 dist_bin_SCRIPTS = bf_copy bf_compact bf_tar

@@ -514,5 +512,4 @@

 bogoutil_LDADD = $(LDADD) $(LIBDB)

 configtest_LDADD = $(LDADD) $(LIBDB)

-bogofilter_DEPENDENCIES = $(LDADD) $(am__append_4)

 @NEED_GSL_TRUE@libbf_gsl_a_CFLAGS = $(AM_CFLAGS) -DRENAMEFILES

 @NEED_GSL_TRUE@libbf_gsl_a_SOURCES = \

@@ -600,5 +597,4 @@

 	mysetvbuf.c mysetvbuf.h

-BUILT_SOURCES = version.c directories.c

 libbogofilter_a_SOURCES = version.c $(version_sources) \

 	$(datastore_SOURCE)

Index: src/token.c

===================================================================

RCS file: /cvsroot/bogofilter/bogofilter/src/token.c,v

retrieving revision 1.153

retrieving revision 1.155

diff -u -r1.153 -r1.155

--- src/token.c	26 Nov 2006 16:34:30 -0000	1.153

+++ src/token.c	12 Jan 2007 00:20:16 -0000	1.155

@@ -1,4 +1,4 @@

-/* $Id: token.c,v 1.153 2006/11/26 16:34:30 relson Exp $ */

+/* $Id: token.c,v 1.155 2007/01/12 00:20:16 relson Exp $ */

 /*****************************************************************************

@@ -121,22 +121,17 @@

     token_set(dst, src->text, src->leng);

 }

-static void build_prefixed_token( word_t *token, word_t *prefix, 

+static void build_prefixed_token( word_t *prefix, word_t *token,

 				  word_t *temp, uint32_t temp_size )

 {

-    uint pfx_len = (prefix == NULL) ? 0 : prefix->leng;

-    uint len = token->leng + pfx_len;

+    uint len = token->leng + prefix->leng;

     if (len >= temp_size)

-	len = temp_size - pfx_len - 1;

+	len = temp_size - prefix->leng - 1;

     temp->leng = len;

-

-    /* copy prefix, if there is one */

-    if (prefix != NULL)

-	memcpy(temp->text, prefix->text, pfx_len);

-

-    memcpy(temp->text + pfx_len, token->text, len-pfx_len);

+    memmove(temp->text+prefix->leng, token->text, len-prefix->leng);

+    memcpy(temp->text, prefix->text, prefix->leng);

     Z(temp->text[temp->leng]);

     token->leng = temp->leng;

@@ -167,12 +162,11 @@

     if (token_prefix != NULL) {

 	/* IP addresses get special prefix */

 	if (save_class != IPADDR) {

-	    build_prefixed_token(token, token_prefix, &yylval, yylval_text_size);

+	    build_prefixed_token(token_prefix, token, &yylval, yylval_text_size);

 	}

 	else {

-

 	    word_t *prefix = (wordlist_version >= IP_PREFIX) ? w_ip : w_url;

-	    build_prefixed_token(token, prefix, ipsave, max_token_len);

+	    build_prefixed_token(prefix, token, &yylval, yylval_text_size);

 	}

 	/* if excessive length caused by prefix, get another token */

@@ -198,7 +192,7 @@

 	else

 	{

 	    ipsave->leng = (uint) (t - ipsave->text);

-	    token_set( &yylval, ipsave->text, ipsave->leng);

+	    token_set( token, ipsave->text, ipsave->leng);

 	    cls = save_class;

 	    done = true;

 	}