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

+Fri May 19 12:02:28 BST 2006 (njh)

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

+  libclamav:	Mbox related files now only need to include mbox.h

+

 Fri May 19 10:56:48 BST 2006 (njh)

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

   * various:	Refer to the webpage for submitting bug reports, not just an

@@ -18,6 +18,9 @@

  *

  * Change History:

  * $Log: binhex.c,v $

+ * Revision 1.19  2006/05/19 11:02:12  njh

+ * Just include mbox.h

+ *

  * Revision 1.18  2006/04/09 19:59:27  kojm

  * update GPL headers with new address for FSF

  *

@@ -70,7 +73,7 @@

  * First draft of binhex.c

  *

  */

-static	char	const	rcsid[] = "$Id: binhex.c,v 1.18 2006/04/09 19:59:27 kojm Exp $";

+static	char	const	rcsid[] = "$Id: binhex.c,v 1.19 2006/05/19 11:02:12 njh Exp $";

 #include "clamav.h"

@@ -100,11 +103,8 @@ static	char	const	rcsid[] = "$Id: binhex.c,v 1.18 2006/04/09 19:59:27 kojm Exp $

 #include <memory.h>

 #include <sys/stat.h>

 #include "others.h"

-#include "line.h"

+

 #include "mbox.h"

-#include "table.h"

-#include "blob.h"

-#include "text.h"

 #include "binhex.h"

 int

@@ -16,7 +16,7 @@

  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

  *  MA 02110-1301, USA.

  */

-static	char	const	rcsid[] = "$Id: blob.c,v 1.47 2006/05/19 09:56:12 njh Exp $";

+static	char	const	rcsid[] = "$Id: blob.c,v 1.48 2006/05/19 11:02:12 njh Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -36,7 +36,6 @@ static	char	const	rcsid[] = "$Id: blob.c,v 1.47 2006/05/19 09:56:12 njh Exp $";

 #include "others.h"

 #include "mbox.h"

-#include "blob.h"

 #include "matcher.h"

 #ifndef	CL_DEBUG

@@ -16,7 +16,7 @@

  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

  *  MA 02110-1301, USA.

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.303 2006/05/19 09:56:12 njh Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.304 2006/05/19 11:02:12 njh Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -58,13 +58,7 @@ static	char	const	rcsid[] = "$Id: mbox.c,v 1.303 2006/05/19 09:56:12 njh Exp $";

 #include "defaults.h"

 #include "str.h"

 #include "filetypes.h"

-#include "table.h"

 #include "mbox.h"

-#include "blob.h"

-#include "line.h"

-#include "text.h"

-#include "message.h"

-#include "uuencode.h"

 #ifdef	CL_DEBUG

 #if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1

@@ -383,7 +377,7 @@ cli_mbox(const char *dir, int desc, cli_ctx *ctx)

 	struct stat statb;

 	message *m;

 	fileblob *fb;

-	int ret = CL_SUCCESS;

+	int ret = 0;

 	int wasAlloced;

 	struct scanlist *scanlist, *scanelem;

@@ -735,10 +729,8 @@ cli_mbox(const char *dir, int desc, cli_ctx *ctx)

 					if(datalen < 0)

 						break;

-					if(fileblobContainsVirus(fb)) {

-						ret = CL_VIRUS;

+					if(fileblobContainsVirus(fb))

 						break;

-					}

 					if((b64size > 0) && (*ptr == '\r')) {

 						b64start = ++ptr;

@@ -764,7 +756,7 @@ cli_mbox(const char *dir, int desc, cli_ctx *ctx)

 				if(fb)

 					fileblobDestroy(fb);

 				else

-					ret = CL_EIO;

+					ret = -1;

 				messageDestroy(m);

 				free(line);

@@ -860,12 +852,10 @@ cli_mbox(const char *dir, int desc, cli_ctx *ctx)

 				fb = messageToFileblob(m, dir);

 				messageDestroy(m);

-				if(fb) {

-					if(fileblobContainsVirus(fb))

-						ret = CL_VIRUS;

+				if(fb)

 					fileblobDestroy(fb);

-				} else

-					ret = CL_EIO;

+				else

+					ret = -1;

 			}

 		}

 	}

@@ -887,8 +877,8 @@ cli_mbox(const char *dir, int desc, cli_ctx *ctx)

 	 * FIXME: Need to run cl_scandir() here and return that value

 	 */

 	cli_dbgmsg("cli_mbox: ret = %d\n", ret);

-	if((ret == CL_SUCCESS) || (ret == CL_VIRUS))

-		return ret;

+	if(ret == 0)

+		return CL_SUCCESS;

 	cli_dbgmsg("New world - don't know what to do - fall back to old world\n");

 	/* Fall back for now */

@@ -4264,7 +4254,7 @@ getline_from_mbox(char *buffer, size_t len, FILE *fin)

 		return NULL;

 	if((len == 0) || (buffer == NULL)) {

-		cli_errmsg("Invalid call to getline_from_mbox(): refer to http://www.clamav.net/bugs.html#pagestart\n");

+		cli_errmsg("Invalid call to getline_from_mbox(). Report to bugs@clamav.net\n");

 		return NULL;

 	}

@@ -38,5 +38,12 @@ typedef enum {

 #define UNIX

 #endif

+#include "table.h"

+#include "blob.h"

+#include "line.h"

+#include "text.h"

+#include "message.h"

+#include "uuencode.h"

+

 size_t	strstrip(char *s);	/* remove trailing white space */

 int	cli_mbox(const char *dir, int desc, cli_ctx *ctx);

@@ -16,7 +16,7 @@

  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

  *  MA 02110-1301, USA.

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.169 2006/05/18 11:31:57 njh Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.170 2006/05/19 11:02:12 njh Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -49,13 +49,9 @@ static	char	const	rcsid[] = "$Id: message.c,v 1.169 2006/05/18 11:31:57 njh Exp

 #include "others.h"

 #include "str.h"

 #include "filetypes.h"

+#include "strrcpy.h"

-#include "line.h"

 #include "mbox.h"

-#include "table.h"

-#include "blob.h"

-#include "text.h"

-#include "strrcpy.h"

 /* required for AIX and Tru64 */

 #ifdef TRUE

@@ -15,7 +15,7 @@

  *  along with this program; if not, write to the Free Software

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

  */

-static	char	const	rcsid[] = "$Id: pdf.c,v 1.49 2006/04/11 20:25:40 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: pdf.c,v 1.50 2006/05/19 11:02:12 njh Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -47,11 +47,8 @@ static	char	const	rcsid[] = "$Id: pdf.c,v 1.49 2006/04/11 20:25:40 nigelhorne Ex

 #include <zlib.h>

 #endif

-#include "table.h"

 #include "mbox.h"

-#include "blob.h"

 #include "pdf.h"

-#include "md5.h"

 static	int	flatedecode(const unsigned char *buf, size_t len, int fout, const cli_ctx *ctx);

 static	int	ascii85decode(const char *buf, size_t len, unsigned char *output);

@@ -36,7 +36,7 @@

  * TODO: Remove the vcard handling

  * FIXME: The code does little error checking of OOM scenarios

  */

-static	char	const	rcsid[] = "$Id: pst.c,v 1.27 2006/05/15 10:14:54 njh Exp $";

+static	char	const	rcsid[] = "$Id: pst.c,v 1.28 2006/05/19 11:02:12 njh Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"	/* must come first */

@@ -63,7 +63,6 @@ typedef	uint32_t	u_int32_t;

 #include "pst.h"

 #include "mbox.h"

-#include "blob.h"

 #define	DWORD	unsigned int

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

  *  MA 02110-1301, USA.

  *

  * $Log: text.c,v $

+ * Revision 1.19  2006/05/19 11:02:12  njh

+ * Just include mbox.h

+ *

  * Revision 1.18  2006/05/04 10:37:03  nigelhorne

  * Speed up scanning of clean files

  *

@@ -64,7 +67,7 @@

  *

  */

-static	char	const	rcsid[] = "$Id: text.c,v 1.18 2006/05/04 10:37:03 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: text.c,v 1.19 2006/05/19 11:02:12 njh Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -91,10 +94,8 @@ static	char	const	rcsid[] = "$Id: text.c,v 1.18 2006/05/04 10:37:03 nigelhorne E

 #include <stdio.h>

 #include "others.h"

-#include "line.h"

+

 #include "mbox.h"

-#include "blob.h"

-#include "text.h"

 static	text	*textCopy(const text *t_head);

 static	void	addToFileblob(const line_t *line, void *arg);

@@ -25,7 +25,7 @@

 #include "clamav-config.h"

 #endif

-static	char	const	rcsid[] = "$Id: tnef.c,v 1.34 2006/05/19 09:56:12 njh Exp $";

+static	char	const	rcsid[] = "$Id: tnef.c,v 1.35 2006/05/19 11:02:12 njh Exp $";

 #include <stdio.h>

 #include <fcntl.h>

@@ -33,11 +33,9 @@ static	char	const	rcsid[] = "$Id: tnef.c,v 1.34 2006/05/19 09:56:12 njh Exp $";

 #include "cltypes.h"

 #include "clamav.h"

 #include "others.h"

-#include "tnef.h"

-#if	CL_DEBUG

+

 #include "mbox.h"

-#endif

-#include "blob.h"

+#include "tnef.h"

 static	int	tnef_message(FILE *fp, uint16_t type, uint16_t tag, int32_t length, off_t fsize);

 static	int	tnef_attachment(FILE *fp, uint16_t type, uint16_t tag, int32_t length, const char *dir, fileblob **fbref, off_t fsize);

@@ -16,7 +16,7 @@

  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

  *  MA 02110-1301, USA.

  */

-static	char	const	rcsid[] = "$Id: uuencode.c,v 1.3 2006/04/09 19:59:28 kojm Exp $";

+static	char	const	rcsid[] = "$Id: uuencode.c,v 1.4 2006/05/19 11:02:12 njh Exp $";

 #include "clamav.h"

@@ -29,13 +29,10 @@ static	char	const	rcsid[] = "$Id: uuencode.c,v 1.3 2006/04/09 19:59:28 kojm Exp

 #include <memory.h>

 #include <sys/stat.h>

 #include "others.h"

+#include "str.h"

+

 #include "mbox.h"

-#include "blob.h"

-#include "line.h"

-#include "text.h"

-#include "message.h"

 #include "uuencode.h"

-#include "str.h"

 /* Maximum line length according to RFC821 */

 #define	RFC2821LENGTH	1000