@@ -1,3 +1,9 @@

+Mon Oct  1 10:52:13 BST 2007 (njh)

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

+  * libclamav/mbox.c:	Increase the chance of a stack trace being printed in

+				the event of trouble.

+			Various compiler warnings removed.

+

 Sun Sep 30 23:18:11 EEST 2007 (edwin)

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

   * libclamav/phishcheck.c, regex_list.c: more improvements to the algorithm.

@@ -24,12 +30,12 @@ Wed Sep 26 23:36:06 CEST 2007 (tk)

 Tue Sep 25 10:43:35 BST 2007 (njh)

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

   * libclamav/mbox.c:	Only use strcasestr on Linux (for now, until it

-  				can be built into configure)

+				can be built into configure)

 Sun Sep 23 13:49:12 BST 2007 (njh)

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

   * libclamav/mbox.c:	MailFollowURLS: Prefer .exes for download, catches

-  				Trojan.IRC-Script-33

+				Trojan.IRC-Script-33

 Sat Sep 22 18:14:49 EEST 2007 (edwin)

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

@@ -43,7 +49,7 @@ Fri Sep 21 18:40:56 EEST 2007 (edwin)

 Fri Sep 21 00:33:37 CEST 2007 (acab)

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

   * libclamav/pe.c: Avoid variadic macroes make vc6 happy. Big thx to

-  			Gianluigi Tiesi for reporting and testing.

+			Gianluigi Tiesi for reporting and testing.

 Fri Sep 21 00:18:08 EEST 2007(edwin)

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

@@ -4005,8 +4005,8 @@ do_checkURLs(const char *dir, tag_arguments_t *hrefs)

 	 * downloaded and scanned

 	 */

 	for(i = FOLLOWURLS; (i < hrefs->count) && (n < FOLLOWURLS); i++) {

-		const char *url = (const char *)hrefs->value[i];

-		const char *ptr;

+		char *url = (char *)hrefs->value[i];

+		char *ptr;

 		if(strncasecmp("http://", url, 7) != 0)

 			continue;

@@ -4017,9 +4017,9 @@ do_checkURLs(const char *dir, tag_arguments_t *hrefs)

 		if(strcasecmp(ptr, ".exe") == 0) {

 			/* FIXME: Could be swapping with another .exe */

 			cli_dbgmsg("swap %s %s\n", hrefs->value[n], hrefs->value[i]);

-			ptr = hrefs->value[n];

-			hrefs->value[n++] = url;

-			hrefs->value[i] = ptr;

+			ptr = (char *)hrefs->value[n];

+			hrefs->value[n++] = (unsigned char *)url;

+			hrefs->value[i] = (unsigned char *)ptr;

 		}

 	}

@@ -4643,21 +4643,25 @@ print_trace(int use_syslog)

 	size_t i;

 	pid_t pid = getpid();

+	cli_errmsg("Segmentation fault, attempting to print backtrace\n");

+

 	size = backtrace(array, 10);

 	strings = backtrace_symbols(array, size);

-	if(use_syslog == 0)

-		cli_dbgmsg("Backtrace of pid %d:\n", pid);

-	else

+	cli_errmsg("Backtrace of pid %d:\n", pid);

+	if(use_syslog)

 		syslog(LOG_ERR, "Backtrace of pid %d:", pid);

-	for(i = 0; i < size; i++)

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

+		cli_errmsg("%s\n", strings[i]);

 		if(use_syslog)

 			syslog(LOG_ERR, "bt[%u]: %s", i, strings[i]);

-		else

-			cli_dbgmsg("%s\n", strings[i]);

+	}

-	/* TODO: dump the current email */

+#ifdef	SAVE_TMP

+	cli_errmsg("The errant mail file has been saved\n");

+#endif

+	/* #else TODO: dump the current email */

 	free(strings);

 }

@@ -4769,6 +4773,8 @@ isBounceStart(const char *line)

 	   (memcmp(line, ">From ", 6) == 0)) {

 		int numSpaces = 0, numDigits = 0;

+		line += 4;

+

 		do

 			if(*line == ' ')

 				numSpaces++;