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

+Mon May 10 14:11:51 CEST 2010 (acab)

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

+ * win32: simulate gai_strerror

+

 Mon May 10 03:43:43 CEST 2010 (acab)

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

  * libclamav: Use mpool in win32 (well, sort of) as the mighty crt allocator

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

 	ret = getaddrinfo(addr, port, &hints, &res);

 	if(ret) {

-	    /* logg("^Clamd was NOT notified: Can't resolve hostname %s (%s)\n", addr ? addr : "", (ret == EAI_SYSTEM) ? strerror(errno) : gai_strerror(ret)); */

+	    logg("^Clamd was NOT notified: Can't resolve hostname %s (%s)\n", addr ? addr : "", (ret == EAI_SYSTEM) ? strerror(errno) : gai_strerror(ret));

 	    optfree(opts);

 	    return 1;

 	}

@@ -286,7 +286,9 @@ struct servent *w32_getservbyname(const char *name, const char *proto) {

 }

 int w32_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res) {

-    return getaddrinfo(node, service, hints, res);

+    int ret = getaddrinfo(node, service, hints, res);

+    if(ret) wsock2errno();

+    return ret;

 }

 void w32_freeaddrinfo(struct addrinfo *res) {

@@ -53,6 +53,7 @@ char *strptime(const char *s, const char *format, struct tm *tm);

 #define closesocket w32_closesocket

 #define getservbyname w32_getservbyname

 #define getaddrinfo w32_getaddrinfo

+#define gai_strerror w32_strerror

 #define freeaddrinfo w32_freeaddrinfo

 #define inet_ntop w32_inet_ntop

 #define gethostbyname w32_gethostbyname

@@ -64,8 +65,9 @@ char *strptime(const char *s, const char *format, struct tm *tm);

 #define getpid GetCurrentProcessId

 #define PATH_MAX 32767

-

 #define SEARCH_LIBDIR ""

+#define WORDS_BIGENDIAN 0

+#define EAI_SYSTEM 0

 #ifndef MIN

 #define MIN(a, b)	(((a) < (b)) ? (a) : (b))

@@ -108,4 +110,4 @@ int real_main(int, char**);

 #define main main(int argc, char **argv) { _setmode(_fileno(stdin), _O_BINARY); w32_glob(&argc, &argv); return real_main(argc, argv); }; int real_main

 #endif /* __PLATFORM_H */

-#define WORDS_BIGENDIAN 0

+