[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit 4155214d9a7518524a4922d46db120c3a9f22b6f
Author: aCaB <acab at clamav.net>
Date:   Fri Jan 29 19:34:02 2010 +0100

    fix accept

diff --git a/clamd/others.c b/clamd/others.c
index c24653a..0529704 100644
--- a/clamd/others.c
+++ b/clamd/others.c
@@ -440,9 +440,10 @@ int fds_poll_recv(struct fd_data *data, int timeout, int check_signals, void *du
 
     /* we must have at least one fd, the control fd! */
     fds_cleanup(data);
+#ifndef _WIN32
     if (!data->nfds)
 	return 0;
-
+#endif
     for (i=0;i < data->nfds;i++) {
 	data->buf[i].got_newdata = 0;
     }
diff --git a/win32/compat/net.c b/win32/compat/net.c
index bd59509..305b780 100644
--- a/win32/compat/net.c
+++ b/win32/compat/net.c
@@ -327,12 +327,12 @@ int w32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, s
 }
 
 int w32_accept(int sockfd, const struct sockaddr *addr, socklen_t *addrlen) {
-    int sock;
-    if((sock = (int)accept((SOCKET)sockfd, addr, addrlen)<0)) {
+    SOCKET s;
+    if((s = accept((SOCKET)sockfd, addr, addrlen))==INVALID_SOCKET) {
 	wsock2errno();
 	return -1;
     }
-    return sock;
+    return (int)s;
 }
 
 int w32_listen(int sockfd, int backlog) {

-- 
Debian repository for ClamAV