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

+Mon Oct  9 17:20:57 CEST 2006 (tk)

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

+  * libclamav: apply w32 patches from NJH

+

 Mon Oct  9 11:19:20 BST 2006 (njh)

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

   * libclamav/js.c:	Don't create a main() function

@@ -27,7 +27,9 @@

 #include <sys/types.h>

 #include <sys/stat.h>

 #include <fcntl.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <string.h>

 #if defined(HAVE_ATTRIB_PACKED) || defined(HAVE_PRAGMA_PACK)

@@ -55,6 +57,10 @@

 #pragma pack(1)

 #endif

+#ifndef	O_BINARY

+#define	O_BINARY	0

+#endif

+

 #define CHM_ITSF_MIN_LEN (0x60)

 typedef struct itsf_header_tag

 {

@@ -831,7 +837,7 @@ static int chm_decompress_stream(int fd, const char *dirname, itsf_header_t *its

 	mf_in.name = strdup("input");

 	snprintf(filename, 1024, "%s/clamav-unchm.bin", dirname);

-	mf_out.desc = open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU);

+	mf_out.desc = open(filename, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU);

 	if (!mf_out.desc) {

 		cli_dbgmsg("open failed\n", filename);

 		free(mf_in.name);

@@ -920,7 +926,7 @@ static int chm_decompress_stream(int fd, const char *dirname, itsf_header_t *its

 	mf_out.fh = NULL;

 	/* Reopen the file for reading */

-	mf_out.desc = open(filename, O_RDONLY);

+	mf_out.desc = open(filename, O_RDONLY|O_BINARY);

 	if (mf_out.desc < 0) {

 		cli_dbgmsg("re-open output failed\n");

 		goto abort;

@@ -942,7 +948,7 @@ static int chm_decompress_stream(int fd, const char *dirname, itsf_header_t *its

 		}

 		snprintf(filename, 1024, "%s/%d-%llu.chm", dirname, count, entry->offset);

-		ofd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU);

+		ofd = open(filename, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU);

 		if (ofd < 0) {

 			entry = entry->next;

 			continue;

@@ -22,7 +22,6 @@

 #include <sys/types.h>

 #include <sys/stat.h>

-#include <unistd.h>

 #ifdef __cplusplus

 extern "C"

@@ -29,9 +29,12 @@

 #include <sys/types.h>

 #include <sys/stat.h>

 #include <fcntl.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

-#include <zlib.h>

+#endif

+#include "zlib.h"

 #include <time.h>

+#include <errno.h>

 #include "clamav.h"

 #include "others.h"

@@ -53,7 +56,7 @@ int cli_untgz(int fd, const char *destdir)

     cli_dbgmsg("in cli_untgz()\n");

     if((infile = gzdopen(fd, "rb")) == NULL) {

-	cli_errmsg("Can't gzdopen() descriptor %d\n", fd);

+	cli_errmsg("Can't gzdopen() descriptor %d, errno = %d\n", fd, errno);

 	return -1;

     }

@@ -403,10 +406,12 @@ int cli_cvdload(FILE *fs, struct cl_engine **engine, unsigned int *signo, short

     }

     if(cli_untgz(fd, dir)) {

+	close(fd);

 	cli_errmsg("cli_cvdload(): Can't unpack CVD file.\n");

 	free(dir);

 	return CL_ECVDEXTR;

     }

+    close(fd);

     /* load extracted directory */

     ret = cl_load(dir, engine, signo, options);

@@ -27,7 +27,9 @@

 #include <sys/stat.h>

 #include <fcntl.h>

 #include <sys/stat.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <time.h>

 #include "cltypes.h"

@@ -203,7 +203,7 @@ static char internat[256] = {

     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1   /* 0xfX */

 };

-cli_file_t cli_filetype(const char *buf, size_t buflen)

+cli_file_t cli_filetype(const unsigned char *buf, size_t buflen)

 {

 	int i, ascii = 1, len;

@@ -70,7 +70,7 @@ struct cli_matched_type {

     struct cli_matched_type *next;

 };

-cli_file_t cli_filetype(const char *buf, size_t buflen);

+cli_file_t cli_filetype(const unsigned char *buf, size_t buflen);

 cli_file_t cli_filetype2(int desc);

 int cli_addtypesigs(struct cl_engine *engine);

@@ -22,8 +22,14 @@

  *  MA 02110-1301, USA.

  */

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

 #include <stdio.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <sys/types.h>

 #include <sys/stat.h>

 #include <fcntl.h>

@@ -32,10 +38,6 @@

 #include <stdio.h>

 #include <ctype.h>

-#if HAVE_CONFIG_H

-#include "clamav-config.h"

-#endif

-

 #if HAVE_MMAP

 #if HAVE_SYS_MMAN_H

 #include <sys/mman.h>

@@ -29,7 +29,9 @@

 #include <stdio.h>

 #include <string.h>

 #include <stdlib.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include "clamav.h"

 #include "others.h"

@@ -292,7 +294,7 @@ inline static int cli_findpos(const char *buffer, unsigned int depth, unsigned i

     return 1;

 }

-int cli_ac_scanbuff(const char *buffer, unsigned int length, const char **virname, const struct cli_matcher *root, int *partcnt, unsigned short otfrec, unsigned long int offset, unsigned long int *partoff, unsigned short ftype, int fd, struct cli_matched_type **ftoffset)

+int cli_ac_scanbuff(const unsigned char *buffer, unsigned int length, const char **virname, const struct cli_matcher *root, int *partcnt, unsigned short otfrec, unsigned long int offset, unsigned long int *partoff, unsigned short ftype, int fd, struct cli_matched_type **ftoffset)

 {

 	struct cli_ac_node *current;

 	struct cli_ac_patt *pt;

@@ -27,7 +27,7 @@

 #define AC_DEFAULT_DEPTH 2

 int cli_ac_addpatt(struct cli_matcher *root, struct cli_ac_patt *pattern);

-int cli_ac_scanbuff(const char *buffer, unsigned int length, const char **virname, const struct cli_matcher *root, int *partcnt, unsigned short otfrec, unsigned long int offset, unsigned long int *partoff, unsigned short ftype, int fd, struct cli_matched_type **ftoffset);

+int cli_ac_scanbuff(const unsigned char *buffer, unsigned int length, const char **virname, const struct cli_matcher *root, int *partcnt, unsigned short otfrec, unsigned long int offset, unsigned long int *partoff, unsigned short ftype, int fd, struct cli_matched_type **ftoffset);

 int cli_ac_buildtrie(struct cli_matcher *root);

 void cli_ac_free(struct cli_matcher *root);

 void cli_ac_setdepth(unsigned int depth);

@@ -25,7 +25,9 @@

 #include <ctype.h>

 #include <sys/types.h>

 #include <sys/stat.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include "clamav.h"

 #include "others.h"

@@ -396,7 +398,7 @@ int cli_validatesig(unsigned short ftype, const char *offstr, unsigned long int

 	}

 	if(fileoff != (unsigned long int) off) {

-	    cli_dbgmsg("Virus offset: %d, expected: %d (%s)\n", fileoff, off, virname);

+	    cli_dbgmsg("Virus offset: %ld, expected: %ld (%s)\n", fileoff, off, virname);

 	    return 0;

 	}

     }

@@ -24,7 +24,9 @@

 #include <stdio.h>

 #include <stdlib.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <string.h>

 #if HAVE_CONFIG_H

@@ -127,7 +127,9 @@ extern "C" {

 #endif

 #include <sys/types.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 /**

  * System self-test function, to ensure both library and calling program

@@ -40,6 +40,7 @@ extern int mspack_sys_filelen(struct mspack_system *system,

 extern int mspack_valid_system(struct mspack_system *sys);

 /* inline memcmp() */

+#ifndef	C_WINDOWS

 static inline int memcmp(const void *s1, const void *s2, size_t n) {

   unsigned char *c1 = (unsigned char *) s1;

   unsigned char *c2 = (unsigned char *) s2;

@@ -54,5 +55,6 @@ static inline size_t strlen(const char *s) {

   while (*e) e++;

   return e - s;

 }

+#endif

 #endif

@@ -30,10 +30,12 @@

 #include <fcntl.h>

 #include <stdio.h>

 #include <string.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <ctype.h>

 #include <stdlib.h>

-#include <clamav.h>

+#include "clamav.h"

 #if HAVE_MMAP

 #if HAVE_SYS_MMAN_H

@@ -58,6 +60,10 @@

 #pragma pack(1)

 #endif

+#ifndef	O_BINARY

+#define	O_BINARY	0

+#endif

+

 typedef struct ole2_header_tag

 {

 	unsigned char magic[8] __attribute__ ((packed));		/* should be: 0xd0cf11e0a1b11ae1 */

@@ -135,7 +141,7 @@ static char *get_property_name(char *name, int size)

 	j=0;

 	/* size-2 to ignore trailing NULL */

 	for (i=0 ; i < size-2; i+=2) {

-		if (isprint(name[i])) {

+		if((!(name[i]&0x80)) && isprint(name[i])) {

 			newname[j++] = name[i];

 		} else {

 			if (name[i] < 10 && name[i] >= 0) {

@@ -587,8 +593,8 @@ static int handler_writefile(int fd, ole2_header_t *hdr, property_t *prop, const

 #ifdef  C_DARWIN

                         *newname &= '\177';

 #endif

-#if     defined(MSDOS) || defined(C_CYGWIN) || defined(WIN32) || defined(C_OS2)

-                        if(strchr("/*?<>|\"+=,;: ", *newname))

+#if     defined(MSDOS) || defined(C_CYGWIN) || defined(WIN32) || defined(C_OS2) || defined(C_WINDOWS)

+                        if(strchr("/*?<>|\"+=,;:\\ ", *newname))

 #else

                         if(*newname == '/')

 #endif

@@ -602,10 +608,11 @@ static int handler_writefile(int fd, ole2_header_t *hdr, property_t *prop, const

 		free(name);

 		return FALSE;

 	}

+

 	sprintf(newname, "%s/%s", dir, name);

 	free(name);

-	ofd = open(newname, O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU);

+	ofd = open(newname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU);

 	if (ofd < 0) {

 		cli_errmsg("ERROR: failed to create file: %s\n", newname);

 		free(newname);

@@ -100,8 +100,13 @@ typedef struct {

 #define ROL(a,b) a = ( a << (b % (sizeof(a)<<3) ))  |  (a >> (  (sizeof(a)<<3)  -  (b % (sizeof(a)<<3 )) ) )

 #define ROR(a,b) a = ( a >> (b % (sizeof(a)<<3) ))  |  (a << (  (sizeof(a)<<3)  -  (b % (sizeof(a)<<3 )) ) )

+#ifndef	FALSE

 #define FALSE (0)

+#endif

+

+#ifndef	TRUE

 #define TRUE (1)

+#endif

 #ifndef MIN

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

@@ -25,16 +25,24 @@

 #include <stdlib.h>

 #include <string.h>

 #include <ctype.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

+#ifndef	C_WINDOWS

 #include <dirent.h>

+#endif

 #include <sys/types.h>

 #include <sys/stat.h>

+#ifdef	HAVE_SYS_PARAM_H

 #include <sys/param.h>

+#endif

 #include <fcntl.h>

 #include "clamav.h"

 #include "cvd.h"

-#include "strings.h"

+#ifdef	HAVE_STRINGS_H

+#include <strings.h>

+#endif

 #include "matcher-ac.h"

 #include "matcher-bm.h"

 #include "others.h"

@@ -1221,7 +1229,7 @@ static int cli_loaddbdir(const char *dirname, struct cl_engine **engine, unsigne

 #else

     while((dent = readdir(dd))) {

 #endif

-#ifndef C_INTERIX

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

 	if(dent->d_ino)

 #endif

 	{

@@ -1342,7 +1350,7 @@ int cl_statinidir(const char *dirname, struct cl_stat *dbstat)

 #else

     while((dent = readdir(dd))) {

 #endif

-#ifndef C_INTERIX

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

 	if(dent->d_ino)

 #endif

 	{

@@ -1421,7 +1429,7 @@ int cl_statchkdir(const struct cl_stat *dbstat)

 #else

     while((dent = readdir(dd))) {

 #endif

-#ifndef C_INTERIX

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

 	if(dent->d_ino)

 #endif

 	{

@@ -26,12 +26,17 @@

 #include <stdlib.h>

 #include <sys/types.h>

 #include <sys/stat.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

+#ifdef	HAVE_SYS_PARAM_H

 #include <sys/param.h>

+#endif

 #include <fcntl.h>

+#ifndef	C_WINDOWS

 #include <dirent.h>

 #include <netinet/in.h>

-

+#endif

 #if HAVE_MMAP

 #if HAVE_SYS_MMAN_H

@@ -43,6 +48,10 @@

 #include <mspack.h>

+#ifndef	O_BINARY

+#define	O_BINARY	0

+#endif

+

 extern short cli_leavetemps_flag;

 #include "clamav.h"

@@ -868,7 +877,7 @@ int cli_scandir(const char *dirname, cli_ctx *ctx)

 #else

 	while((dent = readdir(dd))) {

 #endif

-#ifndef C_INTERIX

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

 	    if(dent->d_ino)

 #endif

 	    {

@@ -930,7 +939,7 @@ static int cli_vba_scandir(const char *dirname, cli_ctx *ctx)

 	for(i = 0; i < vba_project->count; i++) {

 	    fullname = (char *) cli_malloc(strlen(vba_project->dir) + strlen(vba_project->name[i]) + 2);

 	    sprintf(fullname, "%s/%s", vba_project->dir, vba_project->name[i]);

-	    fd = open(fullname, O_RDONLY);

+	    fd = open(fullname, O_RDONLY|O_BINARY);

 	    if(fd == -1) {

 		cli_dbgmsg("VBADir: Can't open file %s\n", fullname);

 		free(fullname);

@@ -975,7 +984,7 @@ static int cli_vba_scandir(const char *dirname, cli_ctx *ctx)

     	for (i = 0; i < vba_project->count; i++) {

 		fullname = (char *) cli_malloc(strlen(vba_project->dir) + strlen(vba_project->name[i]) + 2);

 		sprintf(fullname, "%s/%s", vba_project->dir, vba_project->name[i]);

-		fd = open(fullname, O_RDONLY);

+		fd = open(fullname, O_RDONLY|O_BINARY);

 		if(fd == -1) {

 			cli_dbgmsg("VBADir: Can't open file %s\n", fullname);

 			free(fullname);

@@ -1019,7 +1028,7 @@ static int cli_vba_scandir(const char *dirname, cli_ctx *ctx)

     /* Check directory for embedded OLE objects */

     fullname = (char *) cli_malloc(strlen(dirname) + 16);

     sprintf(fullname, "%s/_1_Ole10Native", dirname);

-    fd = open(fullname, O_RDONLY);

+    fd = open(fullname, O_RDONLY|O_BINARY);

     free(fullname);

     if (fd >= 0) {

     	ofd = cli_decode_ole_object(fd, dirname);

@@ -1040,7 +1049,7 @@ static int cli_vba_scandir(const char *dirname, cli_ctx *ctx)

 #else

 	while((dent = readdir(dd))) {

 #endif

-#ifndef C_INTERIX

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

 	    if(dent->d_ino)

 #endif

 	    {

@@ -1088,7 +1097,7 @@ static int cli_scanhtml(int desc, cli_ctx *ctx)

     html_normalise_fd(desc, tempname, NULL);

     snprintf(fullname, 1024, "%s/comment.html", tempname);

-    fd = open(fullname, O_RDONLY);

+    fd = open(fullname, O_RDONLY|O_BINARY);

     if (fd >= 0) {

         ret = cli_scandesc(fd, ctx, 0, CL_TYPE_HTML, NULL);

 	close(fd);

@@ -1103,7 +1112,7 @@ static int cli_scanhtml(int desc, cli_ctx *ctx)

     if (ret == CL_CLEAN) {

 	snprintf(fullname, 1024, "%s/nocomment.html", tempname);

-	fd = open(fullname, O_RDONLY);

+	fd = open(fullname, O_RDONLY|O_BINARY);

 	if (fd >= 0) {

 	    ret = cli_scandesc(fd, ctx, 0, CL_TYPE_HTML, NULL);

 	    close(fd);

@@ -1119,7 +1128,7 @@ static int cli_scanhtml(int desc, cli_ctx *ctx)

     if (ret == CL_CLEAN) {

 	snprintf(fullname, 1024, "%s/script.html", tempname);

-	fd = open(fullname, O_RDONLY);

+	fd = open(fullname, O_RDONLY|O_BINARY);

 	if (fd >= 0) {

 	    ret = cli_scandesc(fd, ctx, 0, CL_TYPE_HTML, NULL);

 	    close(fd);

@@ -1357,7 +1366,7 @@ static int cli_scancryptff(int desc, cli_ctx *ctx)

     free(src);

     tempfile = cli_gentemp(NULL);

-    if((ndesc = open(tempfile, O_RDWR|O_CREAT|O_TRUNC, S_IRWXU)) < 0) {

+    if((ndesc = open(tempfile, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU)) < 0) {

 	cli_errmsg("CryptFF: Can't create file %s\n", tempfile);

 	free(dest);

 	free(tempfile);

@@ -1848,7 +1857,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)) == -1)

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

 	return CL_EOPEN;

     ret = cli_magic_scandesc(fd, ctx);

@@ -1862,7 +1871,7 @@ int cl_scanfile(const char *filename, const char **virname, unsigned long int *s

 	int fd, ret;

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

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

 	return CL_EOPEN;

     ret = cl_scandesc(fd, virname, scanned, engine, limits, options);

@@ -29,7 +29,9 @@

 #include <sys/stat.h>

 #include <fcntl.h>

 #include <sys/stat.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <time.h>

 #include <zlib.h>

@@ -17,13 +17,21 @@

  *  MA 02110-1301, USA.

  */

+#ifdef	_MSC_VER

+#include <windows.h>

+#endif

+

 #include "clamav-config.h"

 #include <sys/types.h>

 #include <sys/stat.h>

 #include <fcntl.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

+#ifndef	C_WINDOWS

 #include <netinet/in.h>

+#endif

 #include <string.h>

 #include "clamav.h"

@@ -25,7 +25,9 @@

 #define UNRAR_H 1

 #include <sys/types.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 /*	#define RAR_DEBUG */

 /*	#define RAR_HIGH_DEBUG */

@@ -108,6 +110,14 @@ typedef struct mark_header_tag

 	unsigned char mark[SIZEOF_MARKHEAD];

 } mark_header_t;

+#ifndef HAVE_ATTRIB_PACKED

+#define __attribute__(x)

+#endif

+

+#ifdef HAVE_PRAGMA_PACK

+#pragma pack(1)

+#endif

+

 typedef struct main_header_tag

 {

 	uint16_t head_crc __attribute__ ((packed));

@@ -503,4 +503,5 @@ int rar_unpack15(int fd, int solid, unpack_data_t *unpack_data)

 		}

 	}

 	unp_write_buf_old(unpack_data);

+	return TRUE;

 }

@@ -20,8 +20,14 @@

  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

  *  MA 02110-1301, USA.

  */

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include "unrar.h"

 #include "unrarfilter.h"

@@ -319,7 +319,7 @@ static unsigned int filter_itanium_getbits(unsigned char *data, int bit_pos, int

 {

 	int in_addr=bit_pos/8;

 	int in_bit=bit_pos&7;

-	unsigned int bit_field=(uint)data[in_addr++];

+	unsigned int bit_field=(unsigned int)data[in_addr++];

 	bit_field|=(unsigned int)data[in_addr++] << 8;

 	bit_field|=(unsigned int)data[in_addr++] << 16;

 	bit_field|=(unsigned int)data[in_addr] << 24;

@@ -34,6 +34,13 @@

 #include "cltypes.h"

+#ifndef HAVE_ATTRIB_PACKED

+#define __attribute__(x)

+#endif

+

+#ifdef HAVE_PRAGMA_PACK

+#pragma pack(1)

+#endif

 /******** Zip format structures *********/

@@ -23,7 +23,9 @@

 #include <stdio.h>

 #include <string.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <sys/types.h>

 #include <sys/stat.h>

 #include <fcntl.h>

@@ -40,6 +42,10 @@

 #include "vba_extract.h"

 #include "others.h"

+#ifndef	O_BINARY

+#define	O_BINARY	0

+#endif

+

 typedef struct vba_version_tag {

 	unsigned char signature[4];

 	const char *name;

@@ -264,7 +270,7 @@ vba_project_t *vba56_dir_read(const char *dir)

 		return NULL;

 	}

 	sprintf(fullname, "%s/_VBA_PROJECT", dir);

-        fd = open(fullname, O_RDONLY);

+        fd = open(fullname, O_RDONLY|O_BINARY);

         if (fd == -1) {

                 cli_dbgmsg("Can't open %s\n", fullname);

@@ -744,7 +750,7 @@ int cli_decode_ole_object(int fd, const char *dir)

 	}

 	fullname = cli_malloc(strlen(dir) + 18);

 	sprintf(fullname, "%s/_clam_ole_object", dir);

-	ofd = open(fullname, O_RDWR|O_CREAT|O_TRUNC, 0600);

+	ofd = open(fullname, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, 0600);

 	free(fullname);

         if (ofd < 0) {

 		return -1;

@@ -814,7 +820,7 @@ static int ppt_unlzw(const char *dir, int fd, uint32_t length)

 	}

 	sprintf(fullname, "%s/ppt%.8lx.doc", dir, lseek(fd, 0, SEEK_CUR));

-	ofd = open(fullname, O_WRONLY|O_CREAT|O_TRUNC, 0600);

+	ofd = open(fullname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0600);

 	free(fullname);

         if (ofd == -1) {

                 cli_dbgmsg("ppt_unlzw Open outfile failed\n");

@@ -946,7 +952,7 @@ char *ppt_vba_read(const char *dir)

 		return NULL;

 	}

 	sprintf(fullname, "%s/PowerPoint Document", dir);

-	fd = open(fullname, O_RDONLY);

+	fd = open(fullname, O_RDONLY|O_BINARY);

 	free(fullname);

 	if (fd == -1) {

 		cli_dbgmsg("Open  PowerPoint Document failed\n");

@@ -1529,7 +1535,7 @@ vba_project_t *wm_dir_read(const char *dir)

 		return NULL;

 	}

 	sprintf(fullname, "%s/WordDocument", dir);

-	fd = open(fullname, O_RDONLY);

+	fd = open(fullname, O_RDONLY|O_BINARY);

 	free(fullname);

 	if (fd == -1) {

 		cli_dbgmsg("Open WordDocument failed\n");