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

+Thu Feb 22 19:03:50 CET 2007 (tk)

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

+  * freshclam: merge win32 patches from NJH

+

 Thu Feb 22 18:12:53 CET 2007 (tk)

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

   * clamd/clamd.c: print some more information in Foreground mode (bb#317)

@@ -1,5 +1,5 @@

 /*

- *  By Per Jessen <per@computer.org>

+ *  By Per Jessen <per@computer.org> with changes by the ClamAV team

  *

  *  This program is free software; you can redistribute it and/or modify

  *  it under the terms of the GNU General Public License as published by

@@ -23,9 +23,14 @@

 #include <stdio.h>

 #include <stdlib.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <string.h>

 #include <errno.h>

+#ifdef	C_WINDOWS

+#include <process.h>

+#endif

 #include "shared/output.h"

 #include "execute.h"

@@ -36,6 +41,16 @@ int active_children;

 void execute( const char *type, const char *text )

 {

+#ifdef        C_WINDOWS

+	if(active_children < MAX_CHILDREN) {

+		if(spawnlp(P_DETACH, text, text, NULL) == -1) {

+			logg("^%s: couldn't execute \"%s\".\n", type, text);

+			return;

+		}

+		active_children++;	/* FIXME: this is never reduced */

+	} else

+		logg("^%s: already %d processes active.\n", type, active_children);

+#else

 	pid_t pid;

 	if ( active_children<MAX_CHILDREN )

@@ -56,4 +71,5 @@ void execute( const char *type, const char *text )

 	{

 		logg("^%s: already %d processes active.\n", type, active_children);

 	}

+#endif

 }

@@ -20,6 +20,10 @@

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

  *  MA 02110-1301, USA.

  */

+ 

+#ifdef	_MSC_VER

+#include <winsock.h>	/* only needed in CL_EXPERIMENTAL */

+#endif

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -27,14 +31,20 @@

 #include <stdio.h>

 #include <stdlib.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <string.h>

 #include <ctype.h>

+#ifndef	C_WINDOWS

 #include <netinet/in.h>

 #include <netdb.h>

+#endif

 #include <sys/types.h>

+#ifndef	C_WINDOWS

 #include <sys/socket.h>

 #include <sys/time.h>

+#endif

 #include <time.h>

 #include <fcntl.h>

 #include <sys/stat.h>

@@ -64,6 +74,9 @@

 #define	O_BINARY	0

 #endif

+#ifndef	C_WINDOWS

+#define	closesocket(s)	close(s)

+#endif

 static int wwwconnect(const char *server, const char *proxy, int pport, char *ip, const char *localip, int ctimeout, struct mirdat *mdat)

 {

@@ -144,7 +157,9 @@ static int wwwconnect(const char *server, const char *proxy, int pport, char *ip

 		else

 			port = 8080;

+#ifndef	C_WINDOWS

 		endservent();

+#endif

 #else

 		port = 8080;

 #endif

@@ -156,7 +171,7 @@ static int wwwconnect(const char *server, const char *proxy, int pport, char *ip

     }

     if((host = gethostbyname(hostpt)) == NULL) {

-	const char *herr;

+	char *herr;

 	switch(h_errno) {

 	    case HOST_NOT_FOUND:

 		herr = "Host not found";

@@ -376,9 +391,9 @@ static struct cl_cvd *remote_cvdhead(const char *file, const char *hostname, cha

     if(!ip[0])

 	strcpy(ip, ipaddr);

-    if(write(sd, cmd, strlen(cmd)) < 0) {

+    if(send(sd, cmd, strlen(cmd), 0) < 0) {

 	logg("!remote_cvdhead: write failed\n");

-	close(sd);

+	closesocket(sd);

 	return NULL;

     }

@@ -394,7 +409,7 @@ static struct cl_cvd *remote_cvdhead(const char *file, const char *hostname, cha

 	if(cnt <= 0)

 	    break;

     }

-    close(sd);

+    closesocket(sd);

     if(bread == -1) {

 	logg("!remote_cvdhead: Error while reading CVD header from %s\n", hostname);

@@ -525,7 +540,7 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

     if(!ip[0])

 	strcpy(ip, ipaddr);

-    if(write(sd, cmd, strlen(cmd)) < 0) {

+    if(send(sd, cmd, strlen(cmd), 0) < 0) {

 	logg("!getfile: Can't write to socket\n");

 	return 52;

     }

@@ -565,7 +580,7 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

     if((strstr(buffer, "HTTP/1.1 404")) != NULL || (strstr(buffer, "HTTP/1.0 404")) != NULL) { 

 	logg("!getfile: %s not found on remote server (IP: %s)\n", srcfile, ipaddr);

 	/* mirman_update(mdat->currip, mdat, 1); */

-	close(sd);

+	closesocket(sd);

 	return 58;

     }

@@ -573,7 +588,7 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

        !strstr(buffer, "HTTP/1.1 206") && !strstr(buffer, "HTTP/1.0 206")) {

 	logg("!getfile: Unknown response from remote server (IP: %s)\n", ipaddr);

 	mirman_update(mdat->currip, mdat, 1);

-	close(sd);

+	closesocket(sd);

 	return 58;

     }

@@ -596,7 +611,7 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

 	getcwd(currdir, sizeof(currdir));

 	logg("!getfile: Can't create new file %s in %s\n", destfile, currdir);

 	logg("Hint: The database directory must be writable for UID %d or GID %d\n", getuid(), getgid());

-	close(sd);

+	closesocket(sd);

 	return 57;

     }

@@ -609,7 +624,7 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

 	    logg("getfile: Can't write %d bytes to %s\n", bread, destfile);

 	    unlink(destfile);

 	    close(fd);

-	    close(sd);

+	    closesocket(sd);

 	    return 57; /* FIXME */

 	}

@@ -626,7 +641,7 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

             fflush(stdout);

         }

     }

-    close(sd);

+    closesocket(sd);

     close(fd);

     if(totalsize > 0)

@@ -15,6 +15,9 @@

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

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

  */

+#ifdef	_MSC_VER

+#include <winsock.h>

+#endif

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -24,14 +27,20 @@

 #include <stdio.h>

 #include <stdlib.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <string.h>

 #include <ctype.h>

+#ifndef	C_WINDOWS

 #include <netinet/in.h>

 #include <netdb.h>

+#endif

 #include <sys/types.h>

-#include <sys/socket.h>

+/*#include <sys/socket.h>	/* in nonblock.h */

+#ifndef	C_WINDOWS

 #include <sys/time.h>

+#endif

 #include <time.h>

 #include <fcntl.h>

 #include <sys/stat.h>

@@ -40,6 +49,16 @@

 #include "shared/output.h"

 #include "libclamav/clamav.h"

+#if	(!defined(EALREADY)) && (defined(WSAEALREADY))

+#define EALREADY	WSAEALREADY

+#endif

+#if	(!defined(EINPROGRESS)) && (defined(WSAEINPROGRESS))

+#define EINPROGRESS	WSAEINPROGRESS

+#endif

+#if	(!defined(EISCONN)) && (defined(WSAEISCONN))

+#define EISCONN	WSAEISCONN

+#endif

+

 #ifdef SO_ERROR

 #ifndef timercmp

@@ -229,6 +248,7 @@ static ssize_t nonblock_recv(int sock, void *buf, size_t len, int flags, int sec

 static long nonblock_fcntl(int sock)

 {

+#ifdef	F_GETFL

 	long fcntl_flags; /* Save fcntl() flags */

 	fcntl_flags = fcntl(sock, F_GETFL, 0);

@@ -242,16 +262,21 @@ static long nonblock_fcntl(int sock)

 	}

 	return fcntl_flags;

+#else

+	return 0;

+#endif

 }

 static void restore_fcntl(int sock, long fcntl_flags)

 {

+#ifdef	F_SETFL

 	if (fcntl_flags != -1) {

 		if (fcntl(sock, F_SETFL, fcntl_flags)) {

 			logg("restore_fcntl: restoring: fcntl(%d, F_SETFL): errno=%d: %s\n",

 			     sock, errno, strerror(errno));

 		}

 	}

+#endif

 }

 /*

@@ -24,7 +24,9 @@

 #endif

 #include <sys/types.h>

+#ifndef	C_WINDOWS

 #include <sys/socket.h>

+#endif

 /*

 	wait_connect(): wrapper for connect(), with explicit 'secs' timeout

@@ -16,6 +16,11 @@

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

  *  MA 02110-1301, USA.

  */

+#ifdef        _MSC_VER

+#include <windows.h>

+#include <winsock.h>

+#endif

+

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -24,23 +29,33 @@

 #ifdef BUILD_CLAMD

 #include <stdio.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <sys/types.h>

+#ifndef	C_WINDOWS

 #include <sys/socket.h>

 #include <sys/un.h>

 #include <netinet/in.h>

 #include <arpa/inet.h>

 #include <netdb.h>

+#endif

 #include <string.h>

 #include "shared/cfgparser.h"

 #include "shared/output.h"

 #include "notify.h"

+#ifndef	C_WINDOWS

+#define	closesocket(s)	close(s)

+#endif

+

 int notify(const char *cfgfile)

 {

 	char buff[20];

+#ifndef	C_WINDOWS

 	struct sockaddr_un server;

+#endif

         struct sockaddr_in server2;

 	struct hostent *he;

 	struct cfgstruct *copt, *cpt;

@@ -53,6 +68,7 @@ int notify(const char *cfgfile)

 	return 1;

     }

+#ifndef	C_WINDOWS

     if((cpt = cfgopt(copt, "LocalSocket"))->enabled) {

 	socktype = "UNIX";

 	server.sun_family = AF_UNIX;

@@ -65,13 +81,15 @@ int notify(const char *cfgfile)

 	}

 	if(connect(sockd, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) < 0) {

-	    close(sockd);

+	    closesocket(sockd);

 	    logg("^Clamd was NOT notified: Can't connect to clamd through %s\n", cpt->strarg);

 	    perror("connect()");

 	    return 1;

 	}

-    } else if((cpt = cfgopt(copt, "TCPSocket"))->enabled) {

+    } else

+#endif

+    if((cpt = cfgopt(copt, "TCPSocket"))->enabled) {

 	socktype = "TCP";

 #ifdef PF_INET

@@ -99,7 +117,7 @@ int notify(const char *cfgfile)

 	if(connect(sockd, (struct sockaddr *) &server2, sizeof(struct sockaddr_in)) < 0) {

-	    close(sockd);

+	    closesocket(sockd);

 	    logg("^Clamd was NOT notified: Can't connect to clamd on %s:%d\n",

 		    inet_ntoa(server2.sin_addr), ntohs(server2.sin_port));

 	    perror("connect()");

@@ -111,23 +129,23 @@ int notify(const char *cfgfile)

 	return 1;

     }

-    if(write(sockd, "RELOAD", 6) < 0) {

+    if(send(sockd, "RELOAD", 6, 0) < 0) {

 	logg("^Clamd was NOT notified: Could not write to %s socket\n", socktype);

 	perror("write()");

-	close(sockd);

+	closesocket(sockd);

 	return 1;

     }

     /* TODO: Handle timeout */

     memset(buff, 0, sizeof(buff));

-    if((bread = read(sockd, buff, sizeof(buff))) > 0)

+    if((bread = recv(sockd, buff, sizeof(buff), 0)) > 0)

 	if(!strstr(buff, "RELOADING")) {

 	    logg("^Clamd was NOT notified: Unknown answer from clamd: '%s'\n", buff);

-	    close(sockd);

+	    closesocket(sockd);

 	    return 1;

 	}

-    close(sockd);

+    closesocket(sockd);

     logg("Clamd successfully notified about the update.\n");

     return 0;

 }