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

+Tue Feb 20 15:59:12 CET 2007 (tk)

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

+  * clamd, clamconf: merge win32 patches from NJH

+

 Tue Feb 20 11:53:47 GMT 2007 (trog)

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

   * libclamav/unrar: allow for sparc aligned access requirements (bb#304)

@@ -26,7 +26,9 @@

 #include <string.h>

 #include <sys/types.h>

 #include <sys/stat.h>

+#ifdef HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include "cfgparser.h"

 #define _GNU_SOURCE

@@ -24,9 +24,13 @@

 #include <stdio.h>

 #include <string.h>

 #include <sys/types.h>

+#ifndef	C_WINDOWS

 #include <sys/socket.h>

+#endif

 #include <sys/stat.h>

+#ifndef	C_WINDOWS

 #include <sys/un.h>

+#endif

 #include <errno.h>

 #ifdef HAVE_UNISTD_H

 #include <unistd.h>

@@ -42,7 +46,7 @@

 #include "output.h"

 #include "localserver.h"

-#ifdef        C_WINDOWS

+#ifdef C_WINDOWS

 int localserver(const struct cfgstruct *copt)

 {

     logg("!Localserver is not supported on this platform");

@@ -516,7 +516,9 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

     time(&start_time);

     for(;;) {				

-	struct stat st_buf;

+#if !defined(C_WINDOWS) && !defined(C_BEOS)

+	    struct stat st_buf;

+#endif

     	int socketd = socketds[0];

     	if(nsockets > 1) {

     	    int pollret = poll_fds(socketds, nsockets, -1);

@@ -525,7 +527,8 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

     	    } else {

     		socketd = socketds[0]; /* on a poll error use the first socket */

     	    }

-    	}    

+    	}

+#if !defined(C_WINDOWS) && !defined(C_BEOS)

 	if(fstat(socketd, &st_buf) == -1) {

 	    logg("!fstat(): socket descriptor gone\n");

 	    memmove(socketds, socketds + 1, sizeof(socketds[0]) * nsockets);

@@ -535,6 +538,7 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

 		break;

 	    }

 	}

+#endif

 	new_sd = accept(socketd, NULL, NULL);

 	if((new_sd == -1) && (errno != EINTR)) {

 	    if(progexit) {