From 406b18004d219fc8c9836856240d4f1906e79d80 Mon Sep 17 00:00:00 2001
From: Nigel Horne <njh@clamav.net>
Date: Fri, 5 Dec 2003 09:35:30 +0000
Subject: [PATCH] Use cli_tok instead of strtok - replaced now by cli_strtok

git-svn: trunk@140
---
 clamav-devel/ChangeLog           |  4 ++++
 clamav-devel/libclamav/message.c | 35 ++++++++++++--------------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog
index 9805732fc..4e53ca827 100644
--- a/clamav-devel/ChangeLog
+++ b/clamav-devel/ChangeLog
@@ -1,3 +1,7 @@
+Fri Dec  5 09:34:44 GMT 2003 (njh)
+----------------------------------
+  * libclamav: Use cli_tok instead of strtok - replaced now by cli_strtok
+
 Fri Dec  5 02:31:24 CET 2003 (tk)
 ---------------------------------
   * clamav-milter: Makefile: link against libclamav (needed for cli_strtok())
diff --git a/clamav-devel/libclamav/message.c b/clamav-devel/libclamav/message.c
index b47d78282..92a4fdeec 100644
--- a/clamav-devel/libclamav/message.c
+++ b/clamav-devel/libclamav/message.c
@@ -17,6 +17,9 @@
  *
  * Change History:
  * $Log: message.c,v $
+ * Revision 1.12  2003/12/05 09:34:00  nigelhorne
+ * Use cli_tok instead of strtok - replaced now by cli_strtok
+ *
  * Revision 1.11  2003/11/17 07:57:12  nigelhorne
  * Prevent buffer overflow in broken uuencoded files
  *
@@ -30,15 +33,17 @@
  * uuencodebegin() no longer static
  *
  */
-static	char	const	rcsid[] = "$Id: message.c,v 1.11 2003/11/17 07:57:12 nigelhorne Exp $";
+static	char	const	rcsid[] = "$Id: message.c,v 1.12 2003/12/05 09:34:00 nigelhorne Exp $";
 
 #ifndef	CL_DEBUG
 /*#define	NDEBUG	/* map CLAMAV debug onto standard */
 #endif
 
 #ifdef CL_THREAD_SAFE
+#ifndef	_REENTRANT
 #define	_REENTRANT	/* for Solaris 2.8 */
 #endif
+#endif
 
 #if	C_DARWIN
 #include <sys/types.h>
@@ -60,12 +65,7 @@ static	char	const	rcsid[] = "$Id: message.c,v 1.11 2003/11/17 07:57:12 nigelhorn
 #include "text.h"
 #include "strrcpy.h"
 #include "others.h"
-
-#if	defined(NO_STRTOK_R) || !defined(CL_THREAD_SAFE)
-#undef strtok_r
-#undef __strtok_r
-#define strtok_r(a,b,c)	strtok(a,b)
-#endif
+#include "str.h"
 
 /* required for AIX and Tru64 */
 #ifdef TRUE
@@ -276,7 +276,7 @@ messageAddArgument(message *m, const char *arg)
 
 	if(offset == m->numberOfArguments) {
 		m->numberOfArguments++;
-		m->mimeArguments = (char **)realloc(m->mimeArguments, m->numberOfArguments * sizeof(char *));
+		m->mimeArguments = (char **)cli_realloc(m->mimeArguments, m->numberOfArguments * sizeof(char *));
 	}
 
 	m->mimeArguments[offset] = strdup(arg);
@@ -571,7 +571,7 @@ messageToBlob(const message *m)
 {
 	blob *b;
 	const text *t_line = NULL;
-	const char *filename;
+	char *filename;
 
 	assert(m != NULL);
 
@@ -583,11 +583,6 @@ messageToBlob(const message *m)
 	 * Find the filename to decode
 	 */
 	if(messageGetEncoding(m) == UUENCODE) {
-		char *copy;
-#ifdef CL_THREAD_SAFE
-		char *strptr;
-#endif
-
 		t_line = uuencodeBegin(m);
 
 		if(t_line == NULL) {
@@ -596,22 +591,18 @@ messageToBlob(const message *m)
 			return NULL;
 		}
 
-		copy = strdup(t_line->t_text);
-		(void)strtok_r(copy, " ", &strptr);
-		(void)strtok_r(NULL, " ", &strptr);
-		filename = strtok_r(NULL, "\r\n", &strptr);
+		filename = cli_strtok(t_line->t_text, 2, " ");
 
 		if(filename == NULL) {
 			cli_dbgmsg("UUencoded attachment sent with no filename\n");
 			blobDestroy(b);
-			free(copy);
 			return NULL;
 		}
+		cli_chomp(filename);
 
 		cli_dbgmsg("Set uuencode filename to \"%s\"\n", filename);
 
 		blobSetFilename(b, filename);
-		free(copy);
 		t_line = t_line->t_next;
 	} else {
 		/*
@@ -630,9 +621,9 @@ messageToBlob(const message *m)
 
 		blobSetFilename(b, filename);
 
-		free((char *)filename);
 		t_line = messageGetBody(m);
 	}
+	free((char *)filename);
 
 	/*
 	 * t_line should now point to the first (encoded) line of the message
@@ -805,7 +796,7 @@ uuencodeBegin(const message *m)
 static unsigned char *
 decodeLine(const message *m, const char *line, unsigned char *buf, size_t buflen)
 {
-	int len;
+	size_t len;
 	bool softbreak;
 	char *p2;
 	char *copy;