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

  *

  * Change History:

  * $Log: mbox.c,v $

+ * Revision 1.204  2004/12/19 23:19:54  nigelhorne

+ * Tidy

+ *

  * Revision 1.203  2004/12/19 13:50:08  nigelhorne

  * Tidy

  *

@@ -597,7 +600,7 @@

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

  *

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.203 2004/12/19 13:50:08 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.204 2004/12/19 23:19:54 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -2333,7 +2336,6 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 				cli_dbgmsg("Mixed message with %d parts\n", multiparts);

 				for(i = 0; i < multiparts; i++) {

-					bool addAttachment = FALSE;

 					bool addToText = FALSE;

 					const char *dtype;

 #ifndef	SAVE_TO_DISC

@@ -2350,7 +2352,6 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 					switch(messageGetMimeType(aMessage)) {

 					case APPLICATION:

-						addAttachment = TRUE;

 						break;

 					case NOMIME:

 						cli_dbgmsg("No mime headers found in multipart part %d\n", i);

@@ -2400,8 +2401,8 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 						cli_dbgmsg("Mixed message text part disposition \"%s\"\n",

 							dtype);

 						if(strcasecmp(dtype, "attachment") == 0)

-							addAttachment = TRUE;

-						else if((*dtype == '\0') || (strcasecmp(dtype, "inline") == 0)) {

+							break;

+						if((*dtype == '\0') || (strcasecmp(dtype, "inline") == 0)) {

 							if(mainMessage && (mainMessage != messageIn))

 								messageDestroy(mainMessage);

 							mainMessage = NULL;

@@ -2410,7 +2411,6 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 							if(uuencodeBegin(aMessage)) {

 								cli_dbgmsg("Found uuencoded message in multipart/mixed text portion\n");

 								messageSetEncoding(aMessage, "x-uuencode");

-								addAttachment = TRUE;

 							} else if((tableFind(subtypeTable, cptr) == PLAIN) &&

 								  (messageGetEncoding(aMessage) == NOENCODING)) {

 								char *filename;

@@ -2433,14 +2433,12 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 									cli_dbgmsg("Treating %s as attachment\n",

 										filename);

 									free(filename);

-									addAttachment = TRUE;

 								}

 							} else {

 								if(options&CL_SCAN_MAILURL)

 									if(tableFind(subtypeTable, cptr) == HTML)

 										checkURLs(aMessage, dir);

 								messageAddArgument(aMessage, "filename=textportion");

-								addAttachment = TRUE;

 							}

 						} else {

 							cli_dbgmsg("Text type %s is not supported\n", dtype);

@@ -2519,7 +2517,6 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 					case AUDIO:

 					case IMAGE:

 					case VIDEO:

-						addAttachment = TRUE;

 						break;

 					default:

 						cli_warnmsg("Only text and application attachments are supported, type = %d\n",

@@ -2527,13 +2524,6 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 						continue;

 					}

-					/*

-					 * It must be either text or

-					 * an attachment. It can't be both

-					 */

-					assert(addToText || addAttachment);

-					assert(!(addToText && addAttachment));

-

 					if(addToText) {

 						cli_dbgmsg("Adding to non mime-part\n");

 						aText = textAdd(aText, messageGetBody(aMessage));

@@ -2578,7 +2568,7 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 						cli_warnmsg("Unknown encryption protocol '%s' - report to bugs@clamav.net\n");

 					free(protocol);

 				} else

-					cli_warnmsg("Encryption method missing protocol name - report to bugs@clamav.net\n");

+					cli_dbgmsg("Encryption method missing protocol name\n");

 				break;

 			default:

@@ -2668,9 +2658,9 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 			return rc;

 		case APPLICATION:

-			cptr = messageGetMimeSubtype(mainMessage);

+			/*cptr = messageGetMimeSubtype(mainMessage);

-			/*if((strcasecmp(cptr, "octet-stream") == 0) ||

+			if((strcasecmp(cptr, "octet-stream") == 0) ||

 			   (strcasecmp(cptr, "x-msdownload") == 0)) {*/

 			{

 				fb = messageToFileblob(mainMessage, dir);

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

  *

  * Change History:

  * $Log: message.c,v $

+ * Revision 1.134  2004/12/19 23:19:54  nigelhorne

+ * Tidy

+ *

  * Revision 1.133  2004/12/19 13:50:08  nigelhorne

  * Tidy

  *

@@ -396,7 +399,7 @@

  * uuencodebegin() no longer static

  *

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.133 2004/12/19 13:50:08 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.134 2004/12/19 23:19:54 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -1057,7 +1060,7 @@ messageSetEncoding(message *m, const char *enctype)

 		for(e = encoding_map; e->string; e++) {

 			int sim;

 			const char lowertype = tolower(type[0]);

-			

+

 			if((lowertype != tolower(e->string[0])) && (lowertype != 'x'))

 				/*

 				 * simil is expensive, I'm yet to encounter only

@@ -1820,15 +1823,15 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy

 			 */

 			datasize = (line) ? strlen(line) + 2 : 0;

-			if(line && (datasize >= sizeof(smallbuf)))

-				data = bigbuf = cli_malloc(datasize);

+			if(datasize >= sizeof(smallbuf))

+				data = bigbuf = (unsigned char *)cli_malloc(datasize);

 			else {

 				bigbuf = NULL;

 				data = smallbuf;

 				datasize = sizeof(smallbuf);

 			}

-			uptr = decodeLine(m, enctype, line, data, datasize); 

+			uptr = decodeLine(m, enctype, line, data, datasize);

 			if(uptr == NULL) {

 				if(data == bigbuf)

 					free(data);

@@ -2213,8 +2216,7 @@ decodeLine(message *m, encoding_type et, const char *line, unsigned char *buf, s

 {

 	size_t len;

 	bool softbreak;

-	char *p2;

-	char *copy;

+	char *p2, *copy;

 	char base64buf[RFC2045LENGTH + 1];

 	/*printf("decodeLine(et = %d buflen = %u)\n", (int)et, buflen);*/

@@ -2243,7 +2245,7 @@ decodeLine(message *m, encoding_type et, const char *line, unsigned char *buf, s

 			}

 			softbreak = FALSE;

-			while((line < (char *)&buf[buflen]) && *line) {

+			while(buflen && *line) {

 				if(*line == '=') {

 					unsigned char byte;

@@ -2269,7 +2271,8 @@ decodeLine(message *m, encoding_type et, const char *line, unsigned char *buf, s

 					*buf++ = byte;

 				} else

 					*buf++ = *line;

-				line++;

+				++line;

+				--buflen;

 			}

 			if(!softbreak)

 				/* Put the new line back in */