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

+Fri May 30 11:40:56 CEST 2008 (tk)

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

+  * libclamunrar_iface, clamd, freshclam: merge win32 patches from NJH (bb#802)

+

 Wed May 28 03:49:55 CEST 2008 (acab)

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

   * docs/man: typo

@@ -35,7 +35,9 @@

 #include <sys/stat.h>

 #include <fcntl.h>

 #include <time.h>

-#ifndef	C_WINDOWS

+#ifdef C_WINDOWS

+#include <direct.h>	/* for chdir */

+#else

 #include <pwd.h>

 #include <grp.h>

 #endif

@@ -65,6 +67,9 @@

 #include "others.h"

 #include "shared.h"

+#ifndef C_WINDOWS

+#define	closesocket(s)	close(s)

+#endif

 short debug_mode = 0, logok = 0;

 short foreground = 0;

@@ -86,7 +91,9 @@ int main(int argc, char **argv)

 {

 	struct cfgstruct *copt;

 	const struct cfgstruct *cpt;

+#ifndef	C_WINDOWS

         struct passwd *user = NULL;

+#endif

 	time_t currtime;

 	struct cl_engine *engine = NULL;

 	const char *dbdir, *cfgfile;

@@ -281,8 +288,10 @@ int main(int argc, char **argv)

     logg("#clamd daemon "VERSION" (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")\n");

+#ifndef C_WINDOWS

     if(user)

 	logg("#Running as user %s (UID %u, GID %u)\n", user->pw_name, user->pw_uid, user->pw_gid);

+#endif

     if(logg_size)

 	logg("#Log file size limited to %d bytes.\n", logg_size);

@@ -366,7 +375,7 @@ int main(int argc, char **argv)

 	    logg_close();

 	    freecfg(copt);

 	    if(tcpsock)

-		close(lsockets[0]);

+		closesocket(lsockets[0]);

 	    return 1;

 	}

 	nlsockets++;

@@ -479,13 +479,13 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

     if(!bound && !portscan) {

 	logg("!ScanStream: Can't find any free port.\n");

 	mdprintf(odesc, "Can't find any free port. ERROR\n");

-	close(sockfd);

+	closesocket(sockfd);

 	return -1;

     } else {

 	listen(sockfd, 1);

 	if(mdprintf(odesc, "PORT %u\n", port) <= 0) {

 	    logg("!ScanStream: error transmitting port.\n");

-	    close(sockfd);

+	    closesocket(sockfd);

 	    return -1;

 	}

     }

@@ -494,17 +494,17 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

 	case 0: /* timeout */

 	    mdprintf(odesc, "Accept timeout. ERROR\n");

 	    logg("!ScanStream %u: accept timeout.\n", port);

-	    close(sockfd);

+	    closesocket(sockfd);

 	    return -1;

 	case -1:

 	    mdprintf(odesc, "Accept poll. ERROR\n");

 	    logg("!ScanStream %u: accept poll failed.\n", port);

-	    close(sockfd);

+	    closesocket(sockfd);

 	    return -1;

     }

     if((acceptd = accept(sockfd, NULL, NULL)) == -1) {

-	close(sockfd);

+	closesocket(sockfd);

 	mdprintf(odesc, "accept() ERROR\n");

 	logg("!ScanStream %u: accept() failed.\n", port);

 	return -1;

@@ -514,8 +514,8 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

     if(cli_gentempfd(NULL, &tmpname, &tmpd)) {

 	shutdown(sockfd, 2);

-	close(sockfd);

-	close(acceptd);

+	closesocket(sockfd);

+	closesocket(acceptd);

 	mdprintf(odesc, "cli_gentempfd() failed. ERROR\n");

 	logg("!ScanStream %u: Can't create temporary file.\n", port);

 	return -1;

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

 		client_conn->socketds = socketds;

 		client_conn->nsockets = nsockets;

 		if (!thrmgr_dispatch(thr_pool, client_conn)) {

-		    close(client_conn->sd);

+		    closesocket(client_conn->sd);

 		    free(client_conn);

 		    logg("!thread dispatch failed\n");

 		}

@@ -596,9 +596,12 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

 	pthread_mutex_lock(&exit_mutex);

 	if(progexit) {

-	    if (new_sd >= 0) {

+#ifdef C_WINDOWS

+	    closesocket(new_sd);

+#else

+  	    if(new_sd >= 0)

 		close(new_sd);

-	    }

+#endif

 	    pthread_mutex_unlock(&exit_mutex);

 	    break;

 	}

@@ -622,8 +625,12 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

 	    engine = reload_db(engine, dboptions, copt, FALSE, &ret);

 	    if(ret) {

 		logg("Terminating because of a fatal error.\n");

+#ifdef C_WINDOWS

+		closesocket(new_sd);

+#else

 		if(new_sd >= 0)

 		    close(new_sd);

+#endif

 		break;

 	    }

 	    pthread_mutex_lock(&reload_mutex);

@@ -51,6 +51,10 @@

 #include "server.h"

 #include "tcpserver.h"

+#ifndef	C_WINDOWS

+#define	closesocket(s)	close(s)

+#endif

+

 int tcpserver(const struct cfgstruct *copt)

 {

 	struct sockaddr_in server;

@@ -87,7 +91,7 @@ int tcpserver(const struct cfgstruct *copt)

     if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_in)) == -1) {

 	estr = strerror(errno);

 	logg("!TCP: bind() error: %s\n", estr);

-	close(sockfd);

+	closesocket(sockfd);

 	return -1;

     } else {

 	if(taddr->enabled)

@@ -102,7 +106,7 @@ int tcpserver(const struct cfgstruct *copt)

     if(listen(sockfd, backlog) == -1) {

 	estr = strerror(errno);

 	logg("!TCP: listen() error: %s\n", estr);

-	close(sockfd);

+	closesocket(sockfd);

 	return -1;

     }

@@ -1,442 +1,3 @@

-*** /home/njh/src/clamav-devel/trunk/./clamscan/clamscan.c	2008-02-15 09:45:55.000000000 +0000

-***************

-*** 260,265 ****

-  	return 72;

-      }

-  #endif

-+ #ifdef        _DEBUG

-+ 	_CrtDumpMemoryLeaks();

-+ #endif

-  

-      return ret;

-  }

-*** /home/njh/src/clamav-devel/trunk/./clamscan/manager.h	2007-12-06 18:32:26.000000000 +0000

-***************

-*** 34,37 ****

-  

-  int scanfile(const char *filename, struct cl_engine *engine, const struct passwd *user, const struct optstruct *opt, const struct cl_limits *limits, unsigned int options);

-  

-+ #ifdef	_DEBUG

-+ /* breaks mspack/qtmd.c :-( */

-+ #define	free(p)	_free_dbg(p, _NORMAL_BLOCK)

-+ #endif

-+ 

-  #endif

-*** /home/njh/src/clamav-devel/trunk/./clamscan/others.c	2008-02-19 14:17:17.000000000 +0000

-***************

-*** 77,83 ****

-  /* FIXME: Handle users correctly */

-  int checkaccess(const char *path, const char *username, int mode)

-  {

-!     return !_access(path, mode);

-  }

-  #else

-  int checkaccess(const char *path, const char *username, int mode)

-  /* FIXME: Handle users correctly */

-  int checkaccess(const char *path, const char *username, int mode)

-  {

-! 	return _access(path, mode) == 0;

-  }

-  #else

-  int checkaccess(const char *path, const char *username, int mode)

-*** /home/njh/src/clamav-devel/trunk/./freshclam/manager.c	2008-02-25 15:41:07.000000000 +0000

-***************

-*** 49,55 ****

-  #include <time.h>

-  #include <fcntl.h>

-  #include <sys/stat.h>

-+ #ifndef	C_WINDOWS

-  #include <dirent.h>

-+ #endif

-  #include <errno.h>

-  #include <zlib.h>

-  

-***************

-*** 212,218 ****

-  		break;

-  	}

-          logg("%cCan't get information about %s: %s\n", logerr ? '!' : '^', hostpt, herr);

-! 	close(socketfd);

-  	return -1;

-      }

-  

-  		break;

-  	}

-          logg("%cCan't get information about %s: %s\n", logerr ? '!' : '^', hostpt, herr);

-! 	closesocket(socketfd);

-  	return -1;

-      }

-  

-***************

-*** 244,250 ****

-  	if(connect(socketfd, (struct sockaddr *) &name, sizeof(struct sockaddr_in)) == -1) {

-  #endif

-  	    logg("Can't connect to port %d of host %s (IP: %s)\n", port, hostpt, ipaddr);

-! 	    close(socketfd);

-  	    if((socketfd = getclientsock(localip)) == -1)

-  		return -1;

-  

-  	if(connect(socketfd, (struct sockaddr *) &name, sizeof(struct sockaddr_in)) == -1) {

-  #endif

-  	    logg("Can't connect to port %d of host %s (IP: %s)\n", port, hostpt, ipaddr);

-! 	    closesocket(socketfd);

-  	    if((socketfd = getclientsock(localip)) == -1)

-  		return -1;

-  

-***************

-*** 255,261 ****

-  	}

-      }

-  

-!     close(socketfd);

-      return -2;

-  }

-  

-  	}

-      }

-  

-!     closesocket(socketfd);

-      return -2;

-  }

-  

-***************

-*** 918,924 ****

-      }

-  

-      while((dent = readdir(dir))) {

-! #ifndef C_INTERIX

-  	if(dent->d_ino)

-  #endif

-  	{

-      }

-  

-      while((dent = readdir(dir))) {

-! #if	(!defined(C_INTERIX)) && (!defined(C_WINDOWS))

-  	if(dent->d_ino)

-  #endif

-  	{

-*** /home/njh/src/clamav-devel/trunk/./freshclam/freshclam.c	2008-01-23 11:58:35.000000000 +0000

-***************

-*** 419,424 ****

-  #endif

-  

-      /* change the current working directory */

-+     if(opt_check(opt, "datadir"))

-+ 	newdir = opt_arg(opt, "datadir");

-+     else

-+ 	newdir = cfgopt(copt, "DatabaseDirectory")->strarg;

-+ 

-      if(chdir(newdir)) {

-  	logg("Can't change dir to %s\n", newdir);

-  	opt_free(opt);

-***************

-*** 493,499 ****

-  		opt_free(opt);

-  		freecfg(copt);

-  		return 70; /* FIXME */

-! 	    }

-              foreground = 0;

-  	    mprintf_disabled = 1;

-          }

-  		opt_free(opt);

-  		freecfg(copt);

-  		return 70; /* FIXME */

-! 	   }

-              foreground = 0;

-  	    mprintf_disabled = 1;

-          }

-*** /home/njh/src/clamav-devel/trunk/./clamd/scanner.c	2008-02-15 09:45:21.000000000 +0000

-***************

-*** 440,452 ****

-      if(!bound && !portscan) {

-  	logg("!ScanStream: Can't find any free port.\n");

-  	mdprintf(odesc, "Can't find any free port. ERROR\n");

-! 	close(sockfd);

-  	return -1;

-      } else {

-  	listen(sockfd, 1);

-  	if(mdprintf(odesc, "PORT %u\n", port) <= 0) {

-  	    logg("!ScanStream: error transmitting port.\n");

-! 	    close(sockfd);

-  	    return -1;

-  	}

-      }

-      if(!bound && !portscan) {

-  	logg("!ScanStream: Can't find any free port.\n");

-  	mdprintf(odesc, "Can't find any free port. ERROR\n");

-! 	closesocket(sockfd);

-  	return -1;

-      } else {

-  	listen(sockfd, 1);

-  	if(mdprintf(odesc, "PORT %u\n", port) <= 0) {

-  	    logg("!ScanStream: error transmitting port.\n");

-! 	    closesocket(sockfd);

-  	    return -1;

-  	}

-      }

-***************

-*** 455,471 ****

-  	case 0: /* timeout */

-  	    mdprintf(odesc, "Accept timeout. ERROR\n");

-  	    logg("!ScanStream %u: accept timeout.\n", port);

-! 	    close(sockfd);

-  	    return -1;

-  	case -1:

-  	    mdprintf(odesc, "Accept poll. ERROR\n");

-  	    logg("!ScanStream %u: accept poll failed.\n", port);

-! 	    close(sockfd);

-  	    return -1;

-      }

-  

-      if((acceptd = accept(sockfd, NULL, NULL)) == -1) {

-! 	close(sockfd);

-  	mdprintf(odesc, "accept() ERROR\n");

-  	logg("!ScanStream %u: accept() failed.\n", port);

-  	return -1;

-  	case 0: /* timeout */

-  	    mdprintf(odesc, "Accept timeout. ERROR\n");

-  	    logg("!ScanStream %u: accept timeout.\n", port);

-! 	    closesocket(sockfd);

-  	    return -1;

-  	case -1:

-  	    mdprintf(odesc, "Accept poll. ERROR\n");

-  	    logg("!ScanStream %u: accept poll failed.\n", port);

-! 	    closesocket(sockfd);

-  	    return -1;

-      }

-  

-      if((acceptd = accept(sockfd, NULL, NULL)) == -1) {

-! 	closesocket(sockfd);

-  	mdprintf(odesc, "accept() ERROR\n");

-  	logg("!ScanStream %u: accept() failed.\n", port);

-  	return -1;

-***************

-*** 475,482 ****

-  

-      if(cli_gentempfd(NULL, &tmpname, &tmpd)) {

-  	shutdown(sockfd, 2);

-! 	close(sockfd);

-! 	close(acceptd);

-  	mdprintf(odesc, "cli_gentempfd() failed. ERROR\n");

-  	logg("!ScanStream %u: Can't create temporary file.\n", port);

-  	return -1;

-  

-      if(cli_gentempfd(NULL, &tmpname, &tmpd)) {

-  	shutdown(sockfd, 2);

-! 	closesocket(sockfd);

-! 	closesocket(acceptd);

-  	mdprintf(odesc, "cli_gentempfd() failed. ERROR\n");

-  	logg("!ScanStream %u: Can't create temporary file.\n", port);

-  	return -1;

-*** /home/njh/src/clamav-devel/trunk/./clamd/clamd.c	2008-02-18 16:35:00.000000000 +0000

-***************

-*** 35,41 ****

-  #include <sys/stat.h>

-  #include <fcntl.h>

-  #include <time.h>

-! #ifndef	C_WINDOWS

-  #include <pwd.h>

-  #include <grp.h>

-  #endif

-  #include <sys/stat.h>

-  #include <fcntl.h>

-  #include <time.h>

-! #ifdef	C_WINDOWS

-! #include <direct.h>	/* for chdir */

-! #else

-  #include <pwd.h>

-  #include <grp.h>

-  #endif

-***************

-*** 65,70 ****

-  #include "others.h"

-  #include "shared.h"

-  

-+ #ifndef	C_WINDOWS

-+ #define	closesocket(s)	close(s)

-+ #endif

-  

-  short debug_mode = 0, logok = 0;

-  short foreground = 0;

-***************

-*** 86,92 ****

-  {

-  	struct cfgstruct *copt;

-  	const struct cfgstruct *cpt;

-+ #ifndef	C_WINDOWS

-          struct passwd *user = NULL;

-+ #endif

-  	time_t currtime;

-  	struct cl_engine *engine = NULL;

-  	const char *dbdir, *cfgfile;

-***************

-*** 281,288 ****

-  

-      logg("#clamd daemon "VERSION" (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")\n");

-  

-+ #ifndef	C_WINDOWS

-      if(user)

-  	logg("#Running as user %s (UID %u, GID %u)\n", user->pw_name, user->pw_uid, user->pw_gid);

-+ #endif

-  

-      if(logg_size)

-  	logg("#Log file size limited to %d bytes.\n", logg_size);

-***************

-*** 366,372 ****

-  	    logg_close();

-  	    freecfg(copt);

-  	    if(tcpsock)

-! 		close(lsockets[0]);

-  	    return 1;

-  	}

-  	nlsockets++;

-  	    logg_close();

-  	    freecfg(copt);

-  	    if(tcpsock)

-! 		closesocket(lsockets[0]);

-  	    return 1;

-  	}

-  	nlsockets++;

-*** /home/njh/src/clamav-devel/trunk/./clamd/server-th.c	2008-02-25 15:44:06.000000000 +0000

-***************

-*** 573,579 ****

-  		client_conn->socketds = socketds;

-  		client_conn->nsockets = nsockets;

-  		if (!thrmgr_dispatch(thr_pool, client_conn)) {

-! 		    close(client_conn->sd);

-  		    free(client_conn);

-  		    logg("!thread dispatch failed\n");

-  		}

-  		client_conn->socketds = socketds;

-  		client_conn->nsockets = nsockets;

-  		if (!thrmgr_dispatch(thr_pool, client_conn)) {

-! 		    closesocket(client_conn->sd);

-  		    free(client_conn);

-  		    logg("!thread dispatch failed\n");

-  		}

-***************

-*** 581,589 ****

-  

-  	pthread_mutex_lock(&exit_mutex);

-  	if(progexit) {

-! 	    if (new_sd >= 0) {

-! 		close(new_sd);

-! 	    }

-  	    pthread_mutex_unlock(&exit_mutex);

-  	    break;

-  	}

-  

-  	pthread_mutex_lock(&exit_mutex);

-  	if(progexit) {

-! #ifdef	C_WINDOWS

-! 	    closesocket(new_sd);

-! #else

-!   	    if (new_sd >= 0)

-! 		closesocket(new_sd);

-! #endif

-  	    pthread_mutex_unlock(&exit_mutex);

-  	    break;

-  	}

-***************

-*** 607,614 ****

-  	    engine = reload_db(engine, dboptions, copt, FALSE, &ret);

-  	    if(ret) {

-  		logg("Terminating because of a fatal error.\n");

-! 		if(new_sd >= 0)

-! 		    close(new_sd);

-  		break;

-  	    }

-  	    pthread_mutex_lock(&reload_mutex);

-  	    engine = reload_db(engine, dboptions, copt, FALSE, &ret);

-  	    if(ret) {

-  		logg("Terminating because of a fatal error.\n");

-! #ifdef	C_WINDOWS

-! 		closesocket(new_sd);

-! #else

-! 		if (new_sd >= 0)

-! 			closesocket(new_sd);

-! #endif

-  		break;

-  	    }

-  	    pthread_mutex_lock(&reload_mutex);

-*** /home/njh/src/clamav-devel/trunk/./clamd/tcpserver.c	2008-02-18 16:35:00.000000000 +0000

-***************

-*** 51,56 ****

-  #include "server.h"

-  #include "tcpserver.h"

-  

-+ #ifndef	C_WINDOWS

-+ #define	closesocket(s)	close(s)

-+ #endif

-+ 

-  int tcpserver(const struct cfgstruct *copt)

-  {

-  	struct sockaddr_in server;

-***************

-*** 87,93 ****

-      if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_in)) == -1) {

-  	estr = strerror(errno);

-  	logg("!TCP: bind() error: %s\n", estr);

-! 	close(sockfd);

-  	return -1;

-      } else {

-  	if(taddr->enabled)

-      if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_in)) == -1) {

-  	estr = strerror(errno);

-  	logg("!TCP: bind() error: %s\n", estr);

-! 	closesocket(sockfd);

-  	return -1;

-      } else {

-  	if(taddr->enabled)

-***************

-*** 102,108 ****

-      if(listen(sockfd, backlog) == -1) {

-  	estr = strerror(errno);

-  	logg("!TCP: listen() error: %s\n", estr);

-! 	close(sockfd);

-  	return -1;

-      }

-  

-      if(listen(sockfd, backlog) == -1) {

-  	estr = strerror(errno);

-  	logg("!TCP: listen() error: %s\n", estr);

-! 	closesocket(sockfd);

-  	return -1;

-      }

-  

 *** /home/njh/src/clamav-devel/trunk/./clamdscan/client.c	2008-01-23 16:19:16.000000000 +0000

 --- ./clamdscan/client.c	2008-02-25 15:57:20.000000000 +0000

 ***************

@@ -1006,31 +567,3 @@

       exit(ret);

   }

-*** /home/njh/src/clamav-devel/trunk/./libclamunrar_iface/unrar_iface.c	2007-12-26 13:58:50.000000000 +0000

-***************

-*** 542,544 ****

-      free(state->unpack_data);

-      free(state->comment_dir);

-  }

-+ 

-+ #ifdef	C_WINDOWS

-+ /*

-+  * A copy is needed here to avoid a cyclic dependancy libclamunrar_iface<->libclamav

-+  * e.g. see the comment in bug 775 about dropping the old internal snprintf

-+  * which didn't have this problem and bug 785

-+  */

-+ #include <stdarg.h>

-+ static int

-+ snprintf(char *str, size_t size, const char *format, ...)

-+ {

-+ 	int ret;

-+ 

-+ 	va_list args;

-+ 	va_start(args, format);

-+ 	ret = _vsnprintf_s(str, size, _TRUNCATE, format, args);

-+ 	va_end(args);

-+ 	return ret;

-+ }

-+ #endif

@@ -32,24 +32,26 @@

 #include <stdio.h>

 #include <stdlib.h>

-#ifdef	HAVE_UNISTD_H

+#ifdef HAVE_UNISTD_H

 #include <unistd.h>

 #endif

 #include <string.h>

 #include <ctype.h>

-#ifndef	C_WINDOWS

+#ifndef C_WINDOWS

 #include <netinet/in.h>

 #include <netdb.h>

 #endif

 #include <sys/types.h>

-#ifndef	C_WINDOWS

+#ifndef C_WINDOWS

 #include <sys/socket.h>

 #include <sys/time.h>

 #endif

 #include <time.h>

 #include <fcntl.h>

 #include <sys/stat.h>

+#ifndef C_WINDOWS

 #include <dirent.h>

+#endif

 #include <errno.h>

 #include <zlib.h>

@@ -76,7 +78,7 @@

 #define	O_BINARY	0

 #endif

-#ifndef	C_WINDOWS

+#ifndef C_WINDOWS

 #define	closesocket(s)	close(s)

 #endif

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

 		break;

 	}

         logg("%cCan't get information about %s: %s\n", logerr ? '!' : '^', hostpt, herr);

-	close(socketfd);

+	closesocket(socketfd);

 	return -1;

     }

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

 	if(connect(socketfd, (struct sockaddr *) &name, sizeof(struct sockaddr_in)) == -1) {

 #endif

 	    logg("Can't connect to port %d of host %s (IP: %s)\n", port, hostpt, ipaddr);

-	    close(socketfd);

+	    closesocket(socketfd);

 	    if((socketfd = getclientsock(localip)) == -1)

 		return -1;

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

 	}

     }

-    close(socketfd);

+    closesocket(socketfd);

     return -2;

 }

@@ -918,7 +920,7 @@ static int buildcld(const char *tmpdir, const char *dbname, const char *newfile,

     }

     while((dent = readdir(dir))) {

-#ifndef C_INTERIX

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

 	if(dent->d_ino)

 #endif

 	{

@@ -542,3 +542,23 @@ void unrar_close(unrar_state_t *state)

     free(state->unpack_data);

     free(state->comment_dir);

 }

+

+#ifdef	C_WINDOWS

+/*

+ * A copy is needed here to avoid a cyclic dependancy libclamunrar_iface<->libclamav

+ * e.g. see the comment in bug 775 about dropping the old internal snprintf

+ * which didn't have this problem and bug 785

+ */

+#include <stdarg.h>

+static int

+snprintf(char *str, size_t size, const char *format, ...)

+{

+	int ret;

+

+	va_list args;

+	va_start(args, format);

+	ret = _vsnprintf_s(str, size, _TRUNCATE, format, args);

+	va_end(args);

+	return ret;

+}

+#endif