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

+Wed Oct 21 17:50:05 CEST 2009 (acab)

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

+ * win32: introduce safe_open() (sic!)

+

 Tue Oct 20 17:48:59 CEST 2009 (acab)

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

  * shared, win32: make hardcoded paths relocable in win32 builds

@@ -127,7 +127,7 @@ static int scanfile(const char *filename, struct cl_engine *engine, const struct

     logg("*Scanning %s\n", filename);

-    if((fd = open(filename, O_RDONLY|O_BINARY)) == -1) {

+    if((fd = safe_open(filename, O_RDONLY|O_BINARY)) == -1) {

 	logg("^Can't open file %s: %s\n", filename, strerror(errno));

 	return 54;

     }

@@ -2221,7 +2221,7 @@ static int cli_scanfile(const char *filename, cli_ctx *ctx)

 	int fd, ret;

     /* internal version of cl_scanfile with arec/mrec preserved */

-    if((fd = open(filename, O_RDONLY|O_BINARY)) == -1)

+    if((fd = safe_open(filename, O_RDONLY|O_BINARY)) == -1)

 	return CL_EOPEN;

     ret = cli_magic_scandesc(fd, ctx);

@@ -38,3 +38,6 @@ typedef	unsigned	int	in_addr_t;

 #define CONFDIR_FRESHCLAM CONFDIR PATHSEP "freshclam.conf"

 #define CONFDIR_MILTER CONFDIR PATHSEP "clamav-milter.conf"

+/* Nothing is safe in windows, not even open */

+#define safe_open open

+

@@ -19,11 +19,14 @@

  */

 #include <errno.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <fcntl.h>

+#include <io.h>

 #include "others.h"

 #include "shared/misc.h"

-

 wchar_t *uncpath(const char *path) {

     DWORD len = 0;

     wchar_t *dest = cli_malloc((PATH_MAX + 1) * sizeof(wchar_t));

@@ -69,6 +72,26 @@ wchar_t *uncpath(const char *path) {

     return dest;

 }

+int safe_open(const char *path, int flags, ... ) {

+    wchar_t *wpath = uncpath(path);

+    int ret;

+

+    if(!wpath)

+	return -1;

+

+    if(flags & O_CREAT) {

+	int mode;

+	va_list ap;

+	va_start(ap, flags);

+	mode = va_arg(ap, int);

+	va_end(ap);

+	ret = _wopen(wpath, flags, mode);

+    } else

+	ret = _wopen(wpath, flags);

+    free(wpath);

+    return ret;

+}

+

 w32_stat(const char *path, struct stat *buf) {

     int len;

@@ -40,6 +40,7 @@ int w32_stat(const char *path, struct stat *buf);

 #define stat(path, buf) w32_stat(path, buf)

 wchar_t *uncpath(const char *path);

+int safe_open(const char *path, int flags, ... );

 #endif

@@ -239,10 +239,6 @@

 					>

 				</File>

 				<File

-					RelativePath=".\compat\resolv.h"

-					>

-				</File>

-				<File

 					RelativePath=".\compat\strptime.c"

 					>

 				</File>

@@ -39,6 +39,7 @@ EXPORTS have_rar

 EXPORTS opendir

 EXPORTS readdir

 EXPORTS closedir

+EXPORTS safe_open

 EXPORTS snprintf

 EXPORTS mp_init

 EXPORTS mp_read_radix

@@ -799,10 +799,6 @@

 					RelativePath=".\compat\w32_stat.c"

 					>

 				</File>

-				<File

-					RelativePath=".\compat\w32_stat.h"

-					>

-				</File>

 			</Filter>

 		</Filter>

 		<Filter