@@ -16,19 +16,29 @@

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

  *  MA 02110-1301, USA.

  */

-static	char	const	rcsid[] = "$Id: blob.c,v 1.51 2006/07/01 16:17:35 njh Exp $";

+static	char	const	rcsid[] = "$Id: blob.c,v 1.52 2006/07/25 15:09:45 njh Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

 #endif

+#ifdef	C_WINDOWS

+#include "stdafx.h"

+#endif

+

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

 #include <errno.h>

 #include <fcntl.h>

+#ifdef	C_WINDOWS

+#include <io.h>

+#endif

+

+#if	HAVE_SYS_PARAM_H

 #include <sys/param.h>	/* for NAME_MAX */

+#endif

 #ifdef	C_DARWIN

 #include <sys/types.h>

@@ -48,7 +58,7 @@ static	char	const	rcsid[] = "$Id: blob.c,v 1.51 2006/07/01 16:17:35 njh Exp $";

 #include <assert.h>

-#ifdef	C_MINGW

+#if	defined(C_MINGW) || defined(C_WINDOWS)

 #include <windows.h>

 #endif

@@ -226,7 +236,7 @@ blobGetData(const blob *b)

 	return(b->data);

 }

-unsigned long

+size_t

 blobGetDataSize(const blob *b)

 {

 	assert(b != NULL);

@@ -278,7 +288,7 @@ blobClose(blob *b)

 int

 blobcmp(const blob *b1, const blob *b2)

 {

-	unsigned long s1, s2;

+	size_t s1, s2;

 	assert(b1 != NULL);

 	assert(b2 != NULL);

@@ -409,8 +419,11 @@ fileblobSetFilename(fileblob *fb, const char *dir, const char *filename)

 	 * can return ETOOLONG even when the file name isn't too long

 	 */

 	snprintf(fullname, sizeof(fullname), "%s/clamavtmpXXXXXXXXXXXXX", dir);

+#elif	defined(C_WINDOWS)

+	sprintf_s(fullname, sizeof(fullname) - 1, "%s/%.*sXXXXXX", dir,

+		(int)(sizeof(fullname) - 9 - strlen(dir)), filename);

 #else

-	snprintf(fullname, sizeof(fullname) - 1, "%s/%.*sXXXXXX", dir,

+	sprintf(fullname, "%s/%.*sXXXXXX", dir,

 		(int)(sizeof(fullname) - 9 - strlen(dir)), filename);

 #endif

@@ -426,6 +439,18 @@ fileblobSetFilename(fileblob *fb, const char *dir, const char *filename)

 		cli_dbgmsg("fileblobSetFilename: retry as mkstemp(%s)\n", fullname);

 		fd = mkstemp(fullname);

 	}

+#elif	defined(C_WINDOWS)

+	cli_dbgmsg("fileblobSetFilename: _mktemp_s(%s)\n", fullname);

+	fd = _mktemp_s(fullname, sizeof(fullname));

+	if((fd < 0) && (errno == EINVAL)) {

+		/*

+		 * This happens with some Linux flavours when (mis)handling

+		 * filenames with foreign characters

+		 */

+		sprintf_s(fullname, sizeof(fullname), "%s/clamavtmpXXXXXXXXXXXXX", dir);

+		cli_dbgmsg("fileblobSetFilename: retry as mkstemp(%s)\n", fullname);

+		fd = _mktemp_s(fullname, sizeof(fullname));

+	}

 #else

 	cli_dbgmsg("fileblobSetFilename: mktemp(%s)\n", fullname);

 	(void)mktemp(fullname);

@@ -470,7 +495,7 @@ fileblobAddData(fileblob *fb, const unsigned char *data, size_t len)

 			return 0;

 		if(fb->ctx) {

 			if(fb->ctx->scanned)

-				*fb->ctx->scanned += len / CL_COUNT_PRECISION;

+				*fb->ctx->scanned += (unsigned long)len / CL_COUNT_PRECISION;

 			if((len > 5) && (cli_scanbuff((char *)data, len, fb->ctx->virname, fb->ctx->engine, 0) == CL_VIRUS)) {

 				cli_dbgmsg("fileblobAddData: found %s\n", *fb->ctx->virname);

@@ -26,8 +26,8 @@

 typedef struct blob {

 	char	*name;	/* filename */

 	unsigned	char	*data;	/* the stuff itself */

-	unsigned	long	len;	/* number of bytes of data so far */

-	unsigned	long	size;	/* number of bytes allocated to data so far */

+	size_t	len;	/* number of bytes of data so far */

+	size_t	size;	/* number of bytes allocated to data so far */

 	int	isClosed;

 #ifdef	CL_DEBUG

 	object_type	magic;	/* verify that this is a blob */

@@ -41,7 +41,7 @@ void	blobSetFilename(blob *b, const char *dir, const char *filename);

 const	char	*blobGetFilename(const blob *b);

 int	blobAddData(blob *b, const unsigned char *data, size_t len);

 unsigned char *blobGetData(const blob *b);

-unsigned	long	blobGetDataSize(const blob *b);

+size_t	blobGetDataSize(const blob *b);

 void	blobClose(blob *b);

 int	blobcmp(const blob *b1, const blob *b2);

 int	blobGrow(blob *b, size_t len);

@@ -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.324 2006/07/24 12:14:46 njh Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.325 2006/07/25 15:09:45 njh Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -37,13 +37,19 @@ static	char	const	rcsid[] = "$Id: mbox.c,v 1.324 2006/07/24 12:14:46 njh Exp $";

 #include <errno.h>

 #include <assert.h>

 #include <string.h>

+#ifdef	HAVE_STRINGS_H

 #include <strings.h>

+#endif

 #include <ctype.h>

 #include <time.h>

 #include <fcntl.h>

+#ifdef	HAVE_SYS_PARAM_H

 #include <sys/param.h>

-#include <clamav.h>

+#endif

+#include "clamav.h"

+#ifndef	C_WINDOWS

 #include <dirent.h>

+#endif

 #include <limits.h>

 #if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2)

@@ -178,7 +184,9 @@ typedef enum	{ FALSE = 0, TRUE = 1 } bool;

  * more than one machine you must make sure that .../partial is on a shared

  * network filesystem

  */

+#ifndef	C_WINDOWS	/* TODO: when opendir() is done */

 #define	PARTIAL_DIR

+#endif

 /*#define	NEW_WORLD*/

@@ -3098,7 +3106,7 @@ strstrip(char *s)

 	if(s == (char *)NULL)

 		return(0);

-	return(strip(s, strlen(s) + 1));

+	return(strip(s, (int)strlen(s) + 1));

 }

 static int

@@ -4539,7 +4547,7 @@ next_is_folded_header(const text *t)

 		 *	Content-Transfer-Encoding: quoted-printable

 		 */

 		return FALSE;

-	

+

 	/*

 	 * Some are broken and don't fold headers lines

 	 * correctly as per section 2.2.3 of RFC2822.

@@ -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.180 2006/07/18 14:56:04 njh Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.181 2006/07/25 15:09:45 njh Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -37,7 +37,9 @@ static	char	const	rcsid[] = "$Id: message.c,v 1.180 2006/07/18 14:56:04 njh Exp

 #endif

 #include <stdlib.h>

 #include <string.h>

+#ifdef	HAVE_STRINGS_H

 #include <strings.h>

+#endif

 #include <assert.h>

 #include <ctype.h>

 #include <stdio.h>

@@ -1028,7 +1030,7 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy

 	if((t_line = binhexBegin(m)) != NULL) {

 		unsigned char byte;

-		unsigned long newlen = 0L, len, dataforklen, resourceforklen, l;

+		size_t newlen = 0L, len, dataforklen, resourceforklen, l;

 		unsigned char *data;

 		char *ptr;

 		int bytenumber;

@@ -2506,8 +2508,8 @@ simil(const char *str1, const char *str2)

 {

 	LINK1 top = NULL;

 	unsigned int score = 0;

-	unsigned int common, total, len1;

-	unsigned int len2;

+	size_t common, total;

+	size_t len1, len2;

 	char ls1[MAX_PATTERN_SIZ], ls2[MAX_PATTERN_SIZ];

 	char *rs1 = NULL, *rs2 = NULL;

 	char *s1, *s2;

@@ -2541,7 +2543,7 @@ simil(const char *str1, const char *str2)

 		pop(&top, ls1);

 		common = compare(ls1, &rs1, ls2, &rs2);

 		if(common > 0) {

-			score += common;

+			score += (unsigned int)common;

 			len1 = strlen(ls1);

 			len2 = strlen(ls2);

@@ -31,7 +31,9 @@

 #include <stdlib.h>

 #include <string.h>

+#ifdef	HAVE_STRINGS_H

 #include <strings.h>

+#endif

 #include <assert.h>

 #include "table.h"

@@ -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.4 2006/05/19 11:02:12 njh Exp $";

+static	char	const	rcsid[] = "$Id: uuencode.c,v 1.5 2006/07/25 15:09:45 njh Exp $";

 #include "clamav.h"

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

 #include "clamav-config.h"

 #endif

+#ifdef	HAVE_STRINGS_H

 #include <strings.h>

+#endif

 #include <stdio.h>

 #include <memory.h>

 #include <sys/stat.h>

 #include "others.h"

 #include "str.h"

+#ifdef	C_WINDOWS

+#include <io.h>

+#endif

+

 #include "mbox.h"

 #include "uuencode.h"

@@ -135,4 +141,3 @@ uudecodeFile(message *m, const char *firstline, const char *dir, FILE *fin)

 	return 1;

 }

-