Sync with latest versions

git-svn: trunk@2437

clamav-devel/contrib/Windows/Projects/clamAV/libclamav/clamav-config.h

@@ -200,7 +200,7 @@
 #define HAVE_READDIR_R_3 1
 
 /* Define to 1 if you have the `recvmsg' function. */
-#define HAVE_RECVMSG 1
+/* #undef HAVE_RECVMSG */
 
 /* Define to 1 if you have the <regex.h> header file. */
 #define HAVE_REGEX_H 1
@@ -209,7 +209,7 @@
 /* #undef HAVE_RESOLV_H */
 
 /* Define to 1 if you have the `sendmsg' function. */
-#define HAVE_SENDMSG 1
+/* #undef HAVE_SENDMSG */
 
 /* Define to 1 if you have the `setgroups' function. */
 /* #define HAVE_SETGROUPS 1 */
@@ -347,7 +347,7 @@
 /* #define USE_SYSLOG 1 */
 
 /* Version number of package */
-#define VERSION "devel-20061021"
+#define VERSION "devel-20061027"
 
 /* use libcurl in mbox code */
 #ifdef	CL_EXPERIMENTAL

clamav-devel/contrib/Windows/Projects/clamAV/libclamav/compat.c

@@ -56,7 +56,7 @@ opendir(const char *dirname)
 {
 	DIR *ret = cli_calloc(1, sizeof(DIR));
 	char mask[_MAX_PATH + 3];
-	size_t k;
+	size_t i, j;
 
 	if(ret == NULL)
 		return NULL;
@@ -76,9 +76,13 @@ opendir(const char *dirname)
 		return NULL;
 	}
 
-	k = strlen(dirname);
-	if(k && dirname[k - 1] == '\\')
-		ret->dir_name[--k] = '\0';
+	j = strlen(dirname);
+	for(i = 0; i < j; i++)
+		if(ret->dir_name[i] == '/')
+			ret->dir_name[i] = '\\';
+
+	if(j && dirname[j - 1] == '\\')
+		ret->dir_name[--j] = '\0';
 
 	sprintf(mask, "%s\\*", ret->dir_name);
 

clamav-devel/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj

@@ -234,7 +234,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\js.c"
+				RelativePath=".\jscript.c"
 				>
 			</File>
 			<File
@@ -592,7 +592,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\js.h"
+				RelativePath=".\jscript.h"
 				>
 			</File>
 			<File