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

  *

  * Change History:

  * $Log: binhex.c,v $

+ * Revision 1.9  2004/11/28 22:06:39  nigelhorne

+ * Tidy space only headers code

+ *

  * Revision 1.8  2004/11/28 21:05:50  nigelhorne

  * Handle headers with only spaces

  *

@@ -39,7 +42,7 @@

  * First draft of binhex.c

  *

  */

-static	char	const	rcsid[] = "$Id: binhex.c,v 1.8 2004/11/28 21:05:50 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: binhex.c,v 1.9 2004/11/28 22:06:39 nigelhorne Exp $";

 #include "clamav.h"

@@ -127,7 +130,7 @@ cli_binhex(const char *dir, int desc)

 		/*puts(line);*/

-		if(messageAddStr(m, line, 1) < 0)

+		if(messageAddStr(m, line) < 0)

 			break;

 		buf = ++ptr;

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

  *

  * Change History:

  * $Log: mbox.c,v $

+ * Revision 1.194  2004/11/28 22:06:38  nigelhorne

+ * Tidy space only headers code

+ *

  * Revision 1.193  2004/11/28 21:05:50  nigelhorne

  * Handle headers with only spaces

  *

@@ -567,7 +570,7 @@

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

  *

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.193 2004/11/28 21:05:50 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.194 2004/11/28 22:06:38 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -955,7 +958,7 @@ cli_mbox(const char *dir, int desc, unsigned int options)

 				cli_dbgmsg("Finished processing message\n");

 			} else

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

-			if(messageAddStr(m, buffer, 1) < 0)

+			if(messageAddStr(m, buffer) < 0)

 				break;

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

@@ -1011,9 +1014,9 @@ cli_mbox(const char *dir, int desc, unsigned int options)

 			 * headers, otherwise they'll be treated as the end of

 			 * header marker

 			 */

-			if(messageAddStr(m, ptr, !inHeader) < 0)

+			if(messageAddStr(m, ptr) < 0)

 				break;

-			if(*ptr == '\n')

+			if(*ptr == '\0')

 				inHeader = 0;

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

 	}

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

 							/*

 							 * No plain text version

 							 */

-							messageAddStr(aMessage, "No plain text alternative", 0);

+							messageAddStr(aMessage, "No plain text alternative");

 						assert(messageGetBody(aMessage) != NULL);

 						break;

 					case TEXT:

@@ -2966,7 +2969,7 @@ rfc2047(const char *in)

 		m = messageCreate();

 		if(m == NULL)

 			break;

-		messageAddStr(m, enctext, 0);

+		messageAddStr(m, enctext);

 		free(enctext);

 		switch(encoding) {

 			case 'q':

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

  *

  * Change History:

  * $Log: message.c,v $

+ * Revision 1.126  2004/11/28 22:06:39  nigelhorne

+ * Tidy space only headers code

+ *

  * Revision 1.125  2004/11/28 21:05:49  nigelhorne

  * Handle headers with only spaces

  *

@@ -372,7 +375,7 @@

  * uuencodebegin() no longer static

  *

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.125 2004/11/28 21:05:49 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.126 2004/11/28 22:06:39 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -1128,43 +1131,35 @@ messageAddLine(message *m, line_t *line)

  * Line must not be terminated by a \n

  */

 int

-messageAddStr(message *m, const char *data, int stripSpaces)

+messageAddStr(message *m, const char *data)

 {

 	line_t *repeat = NULL;

 	assert(m != NULL);

-#if	0	/* Not sure why this doesn't work, it would save some RAM */

 	if(data) {

-		int iswhite = 1;

-		const char *p;

-

-		for(p = data; *p != '\0'; p++)

-			if(!isspace(*p)) {

-				iswhite = 0;

-				break;

-			}

-		if(iswhite) {

-			/*cli_dbgmsg("messageAddStr: empty line: '%s'\n", data);*/

-			data = (stripSpaces) ? NULL : " ";

-		}

-	}

-#else

-	if(stripSpaces && data) {

-		int iswhite = 1;

-		const char *p;

+		if(*data == '\0')

+			data = NULL;

+		else {

+			/*

+			 * If it's only white space, just store one space to

+			 * save memory. You must store something since it may

+			 * be a header line

+			 */

+			int iswhite = 1;

+			const char *p;

-		for(p = data; *p != '\0'; p++)

-			if(!isspace(*p)) {

-				iswhite = 0;

-				break;

+			for(p = data; *p; p++)

+				if(!isspace(*p)) {

+					iswhite = 0;

+					break;

+				}

+			if(iswhite) {

+				/*cli_dbgmsg("messageAddStr: empty line: '%s'\n", data);*/

+				data = " ";

 			}

-		if(iswhite) {

-			/*cli_dbgmsg("messageAddStr: empty line: '%s'\n", data);*/

-			data = NULL;

 		}

 	}

-#endif

 	if(m->body_first == NULL)

 		m->body_last = m->body_first = (text *)cli_malloc(sizeof(text));

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

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

  *

  * $Log: message.h,v $

+ * Revision 1.24  2004/11/28 22:06:40  nigelhorne

+ * Tidy space only headers code

+ *

  * Revision 1.23  2004/11/28 21:05:50  nigelhorne

  * Handle headers with only spaces

  *

@@ -120,7 +123,7 @@ const	char	*messageFindArgument(const message *m, const char *variable);

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

 encoding_type	messageGetEncoding(const message *m);

 int	messageAddLine(message *m, line_t *line);

-int	messageAddStr(message *m, const char *data, int stripSpaces);

+int	messageAddStr(message *m, const char *data);

 int	messageAddStrAtTop(message *m, const char *data);

 const	text	*messageGetBody(const message *m);

 void	messageClean(message *m);