@@ -1,3 +1,7 @@

+Mon Mar 29 10:33:52 BST 2004 (njh)

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

+  * libclamav:	Tidy up code and reduce shuffling of data

+

 Mon Mar 29 02:05:39 CEST 2004 (tk)

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

   * big cleanup: remove duplicated code and move it to /shared (fixes

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

  *

  * Change History:

  * $Log: mbox.c,v $

+ * Revision 1.60  2004/03/29 09:22:03  nigelhorne

+ * Tidy up code and reduce shuffling of data

+ *

  * Revision 1.59  2004/03/26 11:08:36  nigelhorne

  * Use cli_writen

  *

@@ -168,7 +171,7 @@

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

  *

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.59 2004/03/26 11:08:36 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.60 2004/03/29 09:22:03 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -391,7 +394,7 @@ cl_mbox(const char *dir, int desc)

 				cli_dbgmsg("Finished processing message\n");

 			} else

 				lastLineWasEmpty = (bool)(buffer[0] == '\0');

-			messageAddLine(m, buffer);

+			messageAddLine(m, buffer, 1);

 		} while(fgets(buffer, sizeof(buffer), fd) != NULL);

 	} else

 		/*

@@ -402,7 +405,7 @@ cl_mbox(const char *dir, int desc)

 			 * No need to preprocess such as cli_chomp() since

 			 * that'll be done by parseEmailHeaders()

 			 */

-			messageAddLine(m, buffer);

+			messageAddLine(m, buffer, 1);

 		while(fgets(buffer, sizeof(buffer), fd) != NULL);

 	fclose(fd);

@@ -444,25 +447,23 @@ parseEmailHeaders(const message *m, const table_t *rfc821Table)

 {

 	bool inContinuationHeader = FALSE;

 	bool inHeader = TRUE;

-	text *t, *msgText;

+	const text *t;

 	message *ret;

 	if(m == NULL)

 		return NULL;

-	msgText = messageToText(m);

-	if(msgText == NULL)

-		return NULL;

-

-	t = msgText;

 	ret = messageCreate();

-	do {

+	for(t = messageGetBody(m); t; t = t->t_next) {

 		char *buffer = strdup(t->t_text);

 #ifdef CL_THREAD_SAFE

 		char *strptr;

 #endif

+		if(buffer == NULL)

+			break;

+

 		cli_chomp(buffer);

 		/*

@@ -483,6 +484,7 @@ parseEmailHeaders(const message *m, const table_t *rfc821Table)

 			 */

 			for(ptr = strtok_r(buffer, ";", &strptr); ptr; ptr = strtok_r(NULL, ":", &strptr))

 				messageAddArgument(ret, ptr);

+			free(buffer);

 		} else if(inHeader) {

 			cli_dbgmsg("Deal with header %s\n", buffer);

@@ -490,21 +492,17 @@ parseEmailHeaders(const message *m, const table_t *rfc821Table)

 			 * A blank line signifies the end of the header and

 			 * the start of the text

 			 */

-			if(strstrip(buffer) == 0) {

+			if(strlen(buffer) == 0) {

 				cli_dbgmsg("End of header information\n");

 				inContinuationHeader = inHeader = FALSE;

 			} else if(parseEmailHeader(ret, buffer, rfc821Table) == CONTENT_TYPE)

 				inContinuationHeader = continuationMarker(buffer);

+			free(buffer);

 		} else {

 			/*cli_dbgmsg("Add line to body '%s'\n", buffer);*/

-			messageAddLine(ret, buffer);

+			messageAddLine(ret, buffer, 0);

 		}

-		free(buffer);

-	} while((t = t->t_next) != NULL);

-

-	cli_dbgmsg("parseEmailHeaders: calling textDestroy\n");

-

-	textDestroy(msgText);

+	}

 	cli_dbgmsg("parseEmailHeaders: return\n");

@@ -780,7 +778,7 @@ parseEmailBody(message *messageIn, blob **blobsIn, int nBlobs, text *textIn, con

 						/* t_line = NULL;*/

 						break;

 					} else {

-						messageAddLine(aMessage, line);

+						messageAddLine(aMessage, line, 1);

 						lines++;

 					}

 				} while((t_line = t_line->t_next) != NULL);

@@ -958,7 +956,7 @@ parseEmailBody(message *messageIn, blob **blobsIn, int nBlobs, text *textIn, con

 							/*

 							 * No plain text version

 							 */

-							messageAddLine(aMessage, "No plain text alternative");

+							messageAddLine(aMessage, "No plain text alternative", 1);

 						assert(messageGetBody(aMessage) != NULL);

 						break;

 					case TEXT:

@@ -998,9 +996,12 @@ parseEmailBody(message *messageIn, blob **blobsIn, int nBlobs, text *textIn, con

 						break;

 					case MESSAGE:

 						cli_dbgmsg("Found message inside multipart\n");

-						if(encodingLine(aMessage) == NULL)

+						if(encodingLine(aMessage) == NULL) {

+							assert(aMessage == messages[i]);

+							messageDestroy(messages[i]);

+							messages[i] = NULL;

 							continue;

-

+						}

 						body = parseEmailHeaders(aMessage, rfc821Table);

 						/*

 						 * We've fininished with the

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

  *

  * Change History:

  * $Log: message.c,v $

+ * Revision 1.49  2004/03/29 09:22:03  nigelhorne

+ * Tidy up code and reduce shuffling of data

+ *

  * Revision 1.48  2004/03/25 22:40:46  nigelhorne

  * Removed even more calls to realloc and some duplicated code

  *

@@ -141,7 +144,7 @@

  * uuencodebegin() no longer static

  *

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.48 2004/03/25 22:40:46 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.49 2004/03/29 09:22:03 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -671,12 +674,12 @@ messageGetEncoding(const message *m)

 }

 /*

- * Add a copy of the given line to the end of the given message

- * The caller will need to free the copy

+ * Add the given line to the current message

+ * If needed a copy of the given line is taken which the caller must free

  * Line should not be terminated by a \n

  */

 void

-messageAddLine(message *m, const char *line)

+messageAddLine(message *m, const char *line, int takeCopy)

 {

 	static const char encoding[] = "Content-Transfer-Encoding";

 	static const char binhex[] = "(This file must be converted with BinHex 4.0)";

@@ -694,9 +697,14 @@ messageAddLine(message *m, const char *line)

 	m->body_last->t_next = NULL;

-	m->body_last->t_text = strdup((line) ? line : "");

+	if(takeCopy) {

+		m->body_last->t_text = strdup((line) ? line : "");

+		assert(m->body_last->t_text != NULL);

+	} else {

+		assert(line != NULL);

+		m->body_last->t_text = (char *)line;

+	}

-	assert(m->body_last->t_text != NULL);

 	assert(m->body_first != NULL);

 	/*

@@ -723,11 +731,15 @@ messageAddLine(message *m, const char *line)

 	}

 }

+/*

+ * Returns a pointer to the body of the message. Note that it does NOT return

+ * a copy of the data

+ */

 const text *

 messageGetBody(const message *m)

 {

 	assert(m != NULL);

-	return(m->body_first);

+	return m->body_first;

 }

 /*

@@ -939,9 +951,11 @@ messageToBlob(const message *m)

 					if(count == 0) {

 						c = 0x90;

 						blobAddData(u, &c, 1);

-					} else

+					} else {

+						blobGrow(u, count);

 						while(--count > 0)

 							blobAddData(u, &c, 1);

+					}

 				}

 			}

 			blobDestroy(tmp);

@@ -1070,6 +1084,7 @@ messageToBlob(const message *m)

 /*

  * Decode and transfer the contents of the message into a text area

+ * The caller must free the returned text

  */

 text *

 messageToText(const message *m)

@@ -16,6 +16,9 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  *

  * $Log: message.h,v $

+ * Revision 1.8  2004/03/29 09:22:03  nigelhorne

+ * Tidy up code and reduce shuffling of data

+ *

  * Revision 1.7  2004/03/21 17:19:49  nigelhorne

  * Handle bounce messages with no headers

  *

@@ -65,7 +68,7 @@ void	messageAddArguments(message *m, const char *arg);

 const	char	*messageFindArgument(const message *m, const char *variable);

 void	messageSetEncoding(message *m, const char *enctype);

 encoding_type	messageGetEncoding(const message *m);

-void	messageAddLine(message *m, const char *line);

+void	messageAddLine(message *m, const char *line, int takeCopy);

 const	text	*messageGetBody(const message *m);

 void	messageClean(message *m);

 blob	*messageToBlob(const message *m);