[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 380dff6d448341b19c713217e8bf6d24e8b6d03d
Author: aCaB <acab at clamav.net>
Date:   Thu Oct 15 13:08:14 2009 +0200

    win32: add freshclam

diff --git a/ChangeLog b/ChangeLog
index 0097bf0..297d1b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 15 13:06:33 CEST 2009 (acab)
+------------------------------------
+ * win32: add freshclam
+
 Wed Oct 14 19:03:47 CEST 2009 (acab)
 ------------------------------------
  * win32: remove stale netcode
diff --git a/win32/compat/net.c b/win32/compat/net.c
index 5bb1324..152756a 100644
--- a/win32/compat/net.c
+++ b/win32/compat/net.c
@@ -231,7 +231,7 @@ int w32_connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {
 }
 
 ssize_t w32_send(int sockfd, const void *buf, size_t len, int flags) {
-    int ret = recv((SOCKET)sockfd, (const char *)buf, (int)len, flags);
+    int ret = send((SOCKET)sockfd, (const char *)buf, (int)len, flags);
     if(ret == SOCKET_ERROR) {
 	wsock2errno();
 	return -1;
@@ -269,8 +269,22 @@ void w32_freeaddrinfo(struct addrinfo *res) {
 }
 
 const char *w32_inet_ntop(int af, const void *src, char *dst, socklen_t size) {
-    const char *ret = inet_ntoa(*(struct in_addr *)src);
-    if(!ret) wsock2errno();
+    const char *ret;
+
+    if(af != AF_INET) {
+	errno = EAFNOSUPPORT;
+	return NULL;
+    }
+    ret = inet_ntoa(*(struct in_addr *)src);
+    if(!ret) {
+	wsock2errno();
+	return NULL;
+    }
+    if(strlen(ret) >= size) {
+	errno = ENOSPC;
+	return NULL;
+    }
+    strcpy(dst, ret);
     return ret;
 }
 

-- 
Debian repository for ClamAV