@@ -1,13 +1,16 @@

+Sun Oct 12 21:14:21 BST 2003 (njh)

+---------------------------------

+  * libclamav: mbox.c now uses NO_STRTOK_R consistently with message.c

+  		Patch by Bernd Kuhls <spiralvoice@hotmail.com>

+

 Sun Oct 12 19:46:18 CEST 2003 (tk)

 ----------------------------------

   * libclamav: Makefile: do not overwrite CFLAGS

-  * libclamav: handles Eicar found in Appledouble files, though Appledouble

-  		files are not yet handled

-

 Sun Oct 12 09:37:44 BST 2003 (njh)

 ---------------------------------

+  * libclamav: handles Eicar found in Appledouble files, though Appledouble

+  		files are not yet handled

   * clamav-milter: use VERSION info to talk to clamd not PING/PONG

   		Only close fd 0/1/2 if !Foreground

 		Sanity checking now performed on LocalSocket as well as TCPSocket

@@ -17,6 +17,9 @@

  *

  * Change History:

  * $Log: mbox.c,v $

+ * Revision 1.15  2003/10/12 20:13:49  nigelhorne

+ * Use NO_STRTOK_R consistent with message.c

+ *

  * Revision 1.14  2003/10/12 12:37:11  nigelhorne

  * Appledouble encoded EICAR now found

  *

@@ -33,7 +36,7 @@

  * Compilable under SCO; removed duplicate code with message.c

  *

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.14 2003/10/12 12:37:11 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.15 2003/10/12 20:13:49 nigelhorne Exp $";

 #ifndef	CL_DEBUG

 /*#define	NDEBUG	/* map CLAMAV debug onto standard */

@@ -66,8 +69,7 @@ static	char	const	rcsid[] = "$Id: mbox.c,v 1.14 2003/10/12 12:37:11 nigelhorne E

 #include "others.h"

 #include "defaults.h"

-/* FIXME: implement HAVE_STRTOK_R */

-#ifndef CL_THREAD_SAFE

+#if	defined(NO_STRTOK_R) || !defined(CL_THREAD_SAFE)

 #undef strtok_r

 #undef __strtok_r

 #define strtok_r(a,b,c)	strtok(a,b)