@@ -1,3 +1,8 @@

+Fri Sep 25 00:31:29 CEST 2009 (acab)

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

+ * fix several problems introduced by the win32 commits

+   many thanks edwin and sherpya

+

 Thu Sep 24 19:43:50 CEST 2009 (acab)

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

  * libclamav/others_common.c: Accept "/" as an absolute path

@@ -37,6 +37,7 @@

 #include "shared/optparser.h"

 #include "shared/output.h"

+#include "shared/misc.h"

 #include "connpool.h"

 #include "netcode.h"

@@ -103,8 +103,11 @@ static	char	const	rcsid[] = "$Id: binhex.c,v 1.23 2007/02/12 20:46:08 njh Exp $"

 #include <stdio.h>

 #include <memory.h>

 #include <sys/stat.h>

-#include "others.h"

+#if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H)

+#include <sys/mman.h>

+#endif

+#include "others.h"

 #include "mbox.h"

 #include "binhex.h"

@@ -31,6 +31,9 @@

 #ifdef	HAVE_UNISTD_H

 #include <unistd.h>

 #endif

+#if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H)

+#include <sys/mman.h>

+#endif

 #include <string.h>

 #include "others.h"

@@ -39,6 +39,9 @@

 #include <errno.h>

 #include <stdio.h>

 #include <ctype.h>

+#if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H)

+#include <sys/mman.h>

+#endif

 #include "others.h"

 #include "htmlnorm.h"

@@ -39,6 +39,9 @@

 #if HAVE_STRINGS_H

 #include <strings.h>

 #endif

+#if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H)

+#include <sys/mman.h>

+#endif

 #include <zlib.h>

 #include "scanners.h"

@@ -33,7 +33,6 @@ CLAMAV_PUBLIC {

 CLAMAV_PRIVATE {

   global:

     cli_gettmpdir;

-    cli_is_abspath;

     cli_strtok;

     cli_strtokenize;

     cli_cvdunpack;

@@ -35,6 +35,9 @@

 #if HAVE_STRING_H

 #include <string.h>

 #endif

+#if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H)

+#include <sys/mman.h>

+#endif

 #include <stddef.h>

 #include "others.h"

@@ -30,6 +30,9 @@

 #ifdef HAVE_UNISTD_H

 #include <unistd.h>

 #endif

+#if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H)

+#include <sys/mman.h>

+#endif

 #include "others.h"

 #include "cltypes.h"

@@ -34,6 +34,9 @@

 #endif

 #include <ctype.h>

 #include <stdlib.h>

+#if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H)

+#include <sys/mman.h>

+#endif

 #include "clamav.h"

 #include "cltypes.h"

@@ -398,7 +398,6 @@ int cli_updatelimits(cli_ctx *, unsigned long);

 unsigned long cli_getsizelimit(cli_ctx *, unsigned long);

 int cli_matchregex(const char *str, const char *regex);

 void cli_qsort(void *basep, size_t nelems, size_t size, int (*comp)(const void *, const void *));

-int cli_is_abspath(const char *path);

 /* symlink behaviour */

 #define CLI_FTW_FOLLOW_FILE_SYMLINK 0x01

@@ -910,13 +910,3 @@ void cli_qsort(void *basep, size_t nelems, size_t size, int (*comp)(const void *

 	}

     }

 }

-

-int cli_is_abspath(const char *path) {

-#ifdef _WIN32

-    int len = strlen(path);

-    return (len > 2 && path[0] == '\\' && path[1] == '\\') || (len > 3 && path[1] == ':' && path[2] == '\\');

-#else

-    return *path == '/';

-#endif

-}

-

@@ -41,7 +41,9 @@ static	char	const	rcsid[] = "$Id: pdf.c,v 1.61 2007/02/12 20:46:09 njh Exp $";

 #ifdef	HAVE_UNISTD_H

 #include <unistd.h>

 #endif

-

+#if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H)

+#include <sys/mman.h>

+#endif

 #include <zlib.h>

 #include "clamav.h"

@@ -30,6 +30,7 @@

 #endif

 #include <string.h>

 #include <ctype.h>

+#include <netinet/in.h>

 #include "clamav.h"

 #include "others.h"

 #include "cltypes.h"

@@ -35,6 +35,9 @@

 #endif

 #include <stdlib.h>

 #include <stdio.h>

+#if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H)

+#include <sys/mman.h>

+#endif

 #include <zlib.h>

 #include "inflate64.h"

@@ -33,7 +33,3 @@ typedef	unsigned	int	in_addr_t;

 #else

 #define PATHSEP "/"

 #endif

-

-#if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H)

-#include <sys/mman.h>

-#endif

@@ -316,3 +316,11 @@ int cfg_tcpsock(const struct optstruct *opts, struct sockaddr_in *tcpsock, in_ad

     return 0;

 }

+int cli_is_abspath(const char *path) {

+#ifdef _WIN32

+    int len = strlen(path);

+    return (len > 2 && path[0] == '\\' && path[1] == '\\') || (len > 3 && path[1] == ':' && path[2] == '\\');

+#else

+    return *path == '/';

+#endif

+}

@@ -54,4 +54,6 @@ int daemonize(void);

 const char *get_version(void);

 int match_regex(const char *filename, const char *pattern);

 int cfg_tcpsock(const struct optstruct *opts, struct sockaddr_in *server, in_addr_t defaultbind);

+int cli_is_abspath(const char *path);

+

 #endif