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

+Thu Sep 24 16:22:25 CEST 2009 (acab)

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

+ * merge initial set of win32 patches from Gianluigi Tiesi <sherpya*netfarm.it>

+

 Thu Sep 24 01:14:50 CEST 2009 (acab)

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

  * clamav-milter: Add option ReportHostname to mangle the host name in X headers

@@ -33,10 +33,10 @@

 #include <sys/stat.h>

 #include <fcntl.h>

 #include <time.h>

-#ifdef C_WINDOWS

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

-#else

+#ifdef HAVE_PWD_H

 #include <pwd.h>

+#endif

+#ifdef HAVE_GRP_H

 #include <grp.h>

 #endif

 #include <signal.h>

@@ -114,7 +114,7 @@ static int isremote(const struct optstruct *opts) {

     testsock.sin_port = htons(INADDR_ANY);

     if(!(s = socket(testsock.sin_family, SOCK_STREAM, 0))) return 0;

     ret = (bind(s, (struct sockaddr *)&testsock, sizeof(testsock)) != 0);

-    close(s);

+    closesocket(s);

     return ret;

 }

@@ -173,7 +173,7 @@ int get_clamd_version(const struct optstruct *opts)

     recvlninit(&rcv, sockd);

     if(sendln(sockd, "zVERSION", 9)) {

-	close(sockd);

+	closesocket(sockd);

 	return 2;

     }

@@ -185,7 +185,7 @@ int get_clamd_version(const struct optstruct *opts)

 	printf("%s\n", buff);

     }

-    close(sockd);

+    closesocket(sockd);

     return 0;

 }

@@ -201,16 +201,16 @@ int reload_clamd_database(const struct optstruct *opts)

     recvlninit(&rcv, sockd);

     if(sendln(sockd, "zRELOAD", 8)) {

-	close(sockd);

+	closesocket(sockd);

 	return 2;

     }

     if(!(len = recvln(&rcv, &buff, NULL)) || len < 10 || memcmp(buff, "RELOADING", 9)) {

 	logg("!Clamd did not reload the database\n");

-	close(sockd);

+	closesocket(sockd);

 	return 2;

     }

-    close(sockd);

+    closesocket(sockd);

     return 0;

 }

@@ -265,7 +265,7 @@ int client(const struct optstruct *opts, int *infected)

 	    *infected = ret;

 	else

 	    errors = 1;

-	if(sockd >= 0) close(sockd);

+	if(sockd >= 0) closesocket(sockd);

     } else if(opts->filename || optget(opts, "file-list")->enabled) {

 	if(opts->filename && optget(opts, "file-list")->enabled)

 	    logg("^Only scanning files from --file-list (files passed at cmdline are ignored)\n");

@@ -64,7 +64,7 @@ int dconnect() {

     }

     if(connect(sockd, (struct sockaddr *)mainsa, mainsasz) < 0) {

-	close(sockd);

+	closesocket(sockd);

 	logg("!Can't connect to clamd: %s\n", strerror(errno));

 	return -1;

     }

@@ -162,7 +162,7 @@ static int send_stream(int sockd, const char *filename) {

     unsigned long int todo = maxstream;

     if(filename) {

-	if((fd = open(filename, O_RDONLY))<0) {

+	if((fd = open(filename, O_RDONLY | O_BINARY))<0) {

 	    logg("~%s: Access denied. ERROR\n", filename);

 	    return 0;

 	}

@@ -361,7 +361,7 @@ static int serial_callback(struct stat *sb, char *filename, const char *path, en

     }

     ret = dsresult(sockd, c->scantype, f, &c->printok);

     if(filename) free(filename);

-    close(sockd);

+    closesocket(sockd);

     if(ret < 0) return CL_EOPEN;

     c->infected += ret;

     if(reason == visit_directory_toplev)

@@ -553,7 +553,7 @@ int parallel_client_scan(char *file, int scantype, int *infected, int maxlevel,

 	return 1;

     if(sendln(cdata.sockd, "zIDSESSION", 11)) {

-	close(cdata.sockd);

+	closesocket(cdata.sockd);

 	return 1;

     }

@@ -568,13 +568,13 @@ int parallel_client_scan(char *file, int scantype, int *infected, int maxlevel,

     if(ftw != CL_SUCCESS) {

 	*infected += cdata.infected;

-	close(cdata.sockd);

+	closesocket(cdata.sockd);

 	return 1;

     }

     sendln(cdata.sockd, "zEND", 5);

     while(cdata.ids && !dspresult(&cdata));

-    close(cdata.sockd);

+    closesocket(cdata.sockd);

     *infected += cdata.infected;

@@ -68,15 +68,6 @@

 dev_t procdev;

 #endif

-#ifdef C_WINDOWS

-#undef P_tmpdir

-#define P_tmpdir    "C:\\WINDOWS\\TEMP"

-#endif

-

-#ifndef	O_BINARY

-#define	O_BINARY    0

-#endif

-

 static int scanfile(const char *filename, struct cl_engine *engine, const struct optstruct *opts, unsigned int options)

 {

   int ret = 0, fd, included, printclean = 1, fsize;

@@ -272,17 +263,9 @@ static int scanstdin(const struct cl_engine *engine, const struct optstruct *opt

     if(optget(opts, "tempdir")->enabled) {

 	tmpdir = optget(opts, "tempdir")->strarg;

-    } else {

+    } else

 	/* check write access */

-	tmpdir = getenv("TMPDIR");

-

-	if(tmpdir == NULL)

-#ifdef P_tmpdir

-	    tmpdir = P_tmpdir;

-#else

-	    tmpdir = "/tmp";

-#endif

-    }

+	tmpdir = cli_gettmpdir();

     if(checkaccess(tmpdir, CLAMAVUSER, W_OK) != 1) {

 	logg("!Can't write to temporary directory\n");

@@ -35,8 +35,10 @@

 #endif

 #include <sys/stat.h>

 #include <fcntl.h>

-#ifndef	C_WINDOWS

+#ifdef	HAVE_PWD_H

 #include <pwd.h>

+#endif

+#ifdef HAVE_GRP_H

 #include <grp.h>

 #endif

@@ -675,11 +675,7 @@ int submitstats(const char *clamdcfg, const struct optstruct *opts)

 	*pt2 = 0;

 	pt2 += 2;

-#ifdef C_WINDOWS

-	if((pt = strrchr(pt, '\\')))

-#else

-	if((pt = strrchr(pt, '/')))

-#endif

+	if((pt = strrchr(pt, *PATHSEP)))

 	    *pt++ = 0;

 	if(!pt)

 	    pt = (char*) "NOFNAME";

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

 #include "shared/output.h"

-#ifndef O_BINARY

-#define O_BINARY    0

-#endif

-

 #ifndef HAVE_GETADDRINFO

 #ifndef AF_INET6

 #define AF_INET6    0xbeef  /* foo */

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

 #include <unistd.h>

 #endif

 #include <sys/types.h>

-#ifndef	C_WINDOWS

+#ifndef	_WIN32

 #include <sys/socket.h>

 #include <sys/un.h>

 #include <netinet/in.h>

@@ -37,10 +37,6 @@

 #include "7z/Archive/7z/7zIn.h"

 #include "7z/Archive/7z/7zExtract.h"

-#ifndef O_BINARY

-#define O_BINARY 0

-#endif

-

 static ISzAlloc allocImp = { __lzma_wrap_alloc, __lzma_wrap_free}, allocTempImp = { __lzma_wrap_alloc, __lzma_wrap_free};

 int cli_7unz (int fd, cli_ctx *ctx) {

@@ -35,10 +35,6 @@

 #include <unistd.h>

 #endif

-#ifndef O_BINARY

-#define O_BINARY        0

-#endif

-

 #include "others.h"

 #include "scanners.h"

 #include "autoit.h"

@@ -13,6 +13,10 @@

  * Tom St Denis, tomstdenis@gmail.com, http://math.libtomcrypt.com

  */

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

 /* Start: bn_error.c */

 #include <bignum.h>

 #include "others.h"

@@ -44,14 +44,6 @@

 #define LTM_ALL /* FIXME: tk: limit to the above class */

 #include "bignum_class.h"

-#ifndef MIN

-   #define MIN(x,y) ((x)<(y)?(x):(y))

-#endif

-

-#ifndef MAX

-   #define MAX(x,y) ((x)>(y)?(x):(y))

-#endif

-

 #ifdef __cplusplus

 extern "C" {

@@ -48,10 +48,6 @@ static	char	const	rcsid[] = "$Id: blob.c,v 1.64 2007/02/12 22:25:14 njh Exp $";

 #include "scanners.h"

 #include "filetypes.h"

-#ifndef	O_BINARY

-#define	O_BINARY	0

-#endif

-

 #include <assert.h>

 /* Scehduled for rewite in 0.94 (bb#804). Disabling for now */

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

 #define EC32(x) le32_to_host(x) /* Convert little endian to host */

 #define EC16(x) le16_to_host(x)

-#ifndef O_BINARY

-#define O_BINARY        0

-#endif

-

 /* hard limits */

 #define CAB_FOLDER_LIMIT    5000

 #define CAB_FILE_LIMIT	    5000

@@ -63,10 +63,6 @@

 #pragma pack 1

 #endif

-#ifndef	O_BINARY

-#define	O_BINARY	0

-#endif

-

 #define CHM_CHUNK_HDR_LEN (0x14)

 #define CHM_CONTROL_LEN (0x18)

@@ -45,10 +45,6 @@

 #define TAR_BLOCKSIZE 512

-#ifndef	O_BINARY

-#define	O_BINARY	0

-#endif

-

 static int cli_untgz(int fd, const char *destdir)

 {

 	char *path, osize[13], name[101], type;

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

 #include "others.h"

 #include "ishield.h"

-#ifndef O_BINARY

-#define O_BINARY 0

-#endif

-

 #ifndef LONG_MAX

 #define LONG_MAX ((-1UL)>>1)

 #endif

@@ -495,11 +495,6 @@ static int match_parameters(const yystype *tokens, const char ** param_names, si

 static const char *de_packer_3[] = {"p","a","c","k","e","r"};

 static const char *de_packer_2[] = {"p","a","c","k","e","d"};

-

-#ifndef MAX

-#define MAX(a, b) ((a)>(b) ? (a) : (b))

-#endif

-

 static inline char *textbuffer_done(yyscan_t scanner)

 {

 	/* free unusued memory */

@@ -1390,10 +1385,6 @@ static inline int parseId(YYSTYPE *lvalp, yyscan_t scanner)

 	return 0;

 }

-#ifndef MIN

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

-#endif

-

 static int parseOperator(YYSTYPE *lvalp, yyscan_t scanner)

 {

 	size_t len = MIN(5, scanner->insize - scanner->pos);

@@ -32,6 +32,7 @@ CLAMAV_PUBLIC {

 };

 CLAMAV_PRIVATE {

   global:

+    cli_gettmpdir;

     cli_strtok;

     cli_strtokenize;

     cli_cvdunpack;

@@ -136,6 +136,7 @@ typedef	enum {

 #include "phishcheck.h"

 #ifndef	_WIN32

+#include <sys/time.h>

 #include <netdb.h>

 #include <sys/socket.h>

 #include <netinet/in.h>

@@ -145,19 +146,7 @@ typedef	enum {

 #endif

 #endif

-

 #include <fcntl.h>

-#ifndef	C_WINDOWS

-#include <sys/time.h>

-#endif

-

-#ifndef HAVE_IN_PORT_T

-typedef	unsigned	short	in_port_t;

-#endif

-

-#ifndef HAVE_IN_ADDR_T

-typedef	unsigned	int	in_addr_t;

-#endif

 /*

  * Use CL_SCAN_PARTIAL_MESSAGE to handle messages covered by section 7.3.2 of RFC1341.

@@ -311,10 +300,6 @@ static	const	struct tableinit {

 static	pthread_mutex_t	tables_mutex = PTHREAD_MUTEX_INITIALIZER;

 #endif

-#ifndef	O_BINARY

-#define	O_BINARY	0

-#endif

-

 #ifdef	NEW_WORLD

 #include "matcher.h"

@@ -3666,22 +3651,7 @@ rfc1341(message *m, const char *dir)

 	if(id == NULL)

 		return -1;

-/* do we need this for C_WINDOWS?

-#ifdef  C_CYGWIN

-	if((tmpdir = getenv("TEMP")) == (char *)NULL)

-		if((tmpdir = getenv("TMP")) == (char *)NULL)

-			if((tmpdir = getenv("TMPDIR")) == (char *)NULL)

-				tmpdir = "C:\\";

-#else

-*/

-	if((tmpdir = getenv("TMPDIR")) == (char *)NULL)

-		if((tmpdir = getenv("TMP")) == (char *)NULL)

-			if((tmpdir = getenv("TEMP")) == (char *)NULL)

-#ifdef	P_tmpdir

-				tmpdir = P_tmpdir;

-#else

-				tmpdir = "/tmp";

-#endif

+	tmpdir = cli_gettmpdir();

 	snprintf(pdir, sizeof(pdir) - 1, "%s/clamav-partial", tmpdir);

@@ -47,10 +47,6 @@

 #include "scanners.h"

 #include "nulsft.h" /* SHUT UP GCC -Wextra */

-#ifndef O_BINARY

-#define O_BINARY 0

-#endif

-

 #define EC32(x) le32_to_host(x)

 enum {

@@ -65,11 +65,6 @@

 #pragma pack 1

 #endif

-#ifndef	O_BINARY

-#define	O_BINARY	0

-#endif

-

-

 typedef struct ole2_header_tag

 {

 	unsigned char magic[8];		/* should be: 0xd0cf11e0a1b11ae1 */

@@ -33,21 +33,18 @@

 #endif

 #include <sys/types.h>

 #include <sys/stat.h>

-#ifndef	C_WINDOWS

+#include <dirent.h>

+#ifndef	_WIN32

 #include <sys/wait.h>

 #include <sys/time.h>

-#include <dirent.h>

 #endif

 #include <time.h>

 #include <fcntl.h>

-#ifndef	C_WINDOWS

+#ifdef HAVE_PWD_H

 #include <pwd.h>

 #endif

 #include <errno.h>

 #include "target.h"

-#ifndef	C_WINDOWS

-#include <sys/time.h>

-#endif

 #ifdef	HAVE_SYS_PARAM_H

 #include <sys/param.h>

 #endif

@@ -70,15 +67,6 @@

 #include "default.h"

 #include "scanners.h"

-#ifndef	O_BINARY

-#define	O_BINARY	0

-#endif

-

-#ifdef        C_WINDOWS

-#undef        P_tmpdir

-#define       P_tmpdir        "C:\\WINDOWS\\TEMP"

-#endif

-

 int (*cli_unrar_open)(int fd, const char *dirname, unrar_state_t *state);

 int (*cli_unrar_extract_next_prepare)(unrar_state_t *state, const char *dirname);

 int (*cli_unrar_extract_next)(unrar_state_t *state, const char *dirname);

@@ -382,6 +382,7 @@ char *cli_md5file(const char *filename);

 int cli_unlink(const char *pathname);

 int cli_readn(int fd, void *buff, unsigned int count);

 int cli_writen(int fd, const void *buff, unsigned int count);

+const char *cli_gettmpdir(void);

 char *cli_gentemp(const char *dir);

 int cli_gentempfd(const char *dir, char **name, int *fd);

 unsigned int cli_rndnum(unsigned int max);

@@ -33,21 +33,18 @@

 #endif

 #include <sys/types.h>

 #include <sys/stat.h>

-#ifndef	C_WINDOWS

+#include <dirent.h>

+#ifndef	_WIN32

 #include <sys/wait.h>

 #include <sys/time.h>

-#include <dirent.h>

 #endif

 #include <time.h>

 #include <fcntl.h>

-#ifndef	C_WINDOWS

+#ifdef	HAVE_PWD_H

 #include <pwd.h>

 #endif

 #include <errno.h>

 #include "target.h"

-#ifndef	C_WINDOWS

-#include <sys/time.h>

-#endif

 #ifdef	HAVE_SYS_PARAM_H

 #include <sys/param.h>

 #endif

@@ -64,10 +61,6 @@

 #include "matcher-ac.h"

 #include "md5.h"

-#ifndef	O_BINARY

-#define	O_BINARY	0

-#endif

-

 static unsigned char name_salt[16] = { 16, 38, 97, 12, 8, 4, 72, 196, 217, 144, 33, 124, 18, 11, 17, 253 };

 #ifdef CL_NOTHREADS

@@ -115,9 +108,11 @@ void cli_dbgmsg_internal(const char *str, ...)

 int cli_matchregex(const char *str, const char *regex)

 {

 	regex_t reg;

-	int match;

-

-    if(cli_regcomp(&reg, regex, REG_EXTENDED | REG_NOSUB) == 0) {

+	int match, flags = REG_EXTENDED | REG_NOSUB;

+#ifdef _WIN32

+    flags |= REG_ICASE;

+#endif

+    if(cli_regcomp(&reg, regex, flags) == 0) {

 	match = (cli_regexec(&reg, str, 0, NULL, 0) == REG_NOMATCH) ? 0 : 1;

 	cli_regfree(&reg);

 	return match;

@@ -337,6 +332,10 @@ int cli_writen(int fd, const void *buff, unsigned int count)

 int cli_filecopy(const char *src, const char *dest)

 {

+

+#ifdef _WIN32

+    return (!CopyFileA(src, dest, 0));

+#else

 	char *buffer;

 	int s, d, bytes;

@@ -362,7 +361,16 @@ int cli_filecopy(const char *src, const char *dest)

     close(s);

     return close(d);

+#endif

 }

+

+#ifndef _WIN32

+static const char tmpdir[] = "/tmp";

+const char *cli_gettmpdir(void) {

+    return tmpdir;

+}

+#endif /* _WIN32 */

+

 struct dirent_data {

     char *filename;

     const char *dirname;

@@ -742,18 +750,12 @@ char *cli_gentemp(const char *dir)

         const char *mdir;

 	unsigned char salt[16 + 32];

 	int i;

+    size_t len;

-    if(!dir) {

-	if((mdir = getenv("TMPDIR")) == NULL)

-#ifdef P_tmpdir

-	    mdir = P_tmpdir;

-#else

-	    mdir = "/tmp";

-#endif

-    } else

-	mdir = dir;

+    mdir = dir ? dir : cli_gettmpdir();

-    name = (char *) cli_calloc(strlen(mdir) + 1 + 32 + 1 + 7, sizeof(char));

+    len = strlen(mdir) + 42;

+    name = (char *) cli_calloc(len, sizeof(char));

     if(!name) {

 	cli_dbgmsg("cli_gentemp('%s'): out of memory\n", mdir);

 	return NULL;

@@ -780,12 +782,7 @@ char *cli_gentemp(const char *dir)

 	return NULL;

     }

-#ifdef	C_WINDOWS

-	sprintf(name, "%s\\clamav-", mdir);

-#else

-	sprintf(name, "%s/clamav-", mdir);

-#endif

-    strncat(name, tmp, 32);

+	snprintf(name, len, "%s"PATHSEP"clamav-%s", mdir, tmp);

     free(tmp);

     return(name);

@@ -59,10 +59,6 @@ static	char	const	rcsid[] = "$Id: pdf.c,v 1.61 2007/02/12 20:46:09 njh Exp $";

 #include "scanners.h"

 #include "str.h"

-#ifndef	O_BINARY

-#define	O_BINARY	0

-#endif

-

 #ifdef	CL_DEBUG

 /*#define	SAVE_TMP	

  *Save the file being worked on in tmp */

@@ -59,10 +59,6 @@

 #include "special.h"

 #include "ishield.h"

-#ifndef	O_BINARY

-#define	O_BINARY	0

-#endif

-

 #define DCONF ctx->dconf->pe

 #define IMAGE_DOS_SIGNATURE	    0x5a4d	    /* MZ */

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

 		    return CL_EMEM;

 		}

-#if defined(C_INTERIX) || defined(C_OS2)

+#if defined(C_INTERIX) || defined(C_OS2) || defined(_WIN32)

 		dbstat->statdname = (char **) cli_realloc2(dbstat->statdname, dbstat->entries * sizeof(char *));

 		if(!dbstat->statdname) {

 		    cl_statfree(dbstat);

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

 		    return CL_EMEM;

 		}

 		sprintf(fname, "%s/%s", dirname, dent->d_name);

-#if defined(C_INTERIX) || defined(C_OS2)

+#if defined(C_INTERIX) || defined(C_OS2) || defined(_WIN32)

 		dbstat->statdname[dbstat->entries - 1] = (char *) cli_malloc(strlen(dent->d_name) + 1);

 		if(!dbstat->statdname[dbstat->entries - 1]) {

 		    cl_statfree(dbstat);

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

 		found = 0;

 		for(i = 0; i < dbstat->entries; i++)

-#if defined(C_INTERIX) || defined(C_OS2)

+#if defined(C_INTERIX) || defined(C_OS2) || defined(_WIN32)

 		    if(!strcmp(dbstat->statdname[i], dent->d_name)) {

 #else

 		    if(dbstat->stattab[i].st_ino == sb.st_ino) {

@@ -1957,7 +1957,7 @@ int cl_statfree(struct cl_stat *dbstat)

     if(dbstat) {

-#if defined(C_INTERIX) || defined(C_OS2)

+#if defined(C_INTERIX) || defined(C_OS2) || defined(_WIN32)

 	    int i;

 	if(dbstat->statdname) {

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

 #endif

 #endif

-#ifndef	O_BINARY

-#define	O_BINARY	0

-#endif

-

 #define DCONF_ARCH  ctx->dconf->archive

 #define DCONF_DOC   ctx->dconf->doc

 #define DCONF_MAIL  ctx->dconf->mail

@@ -46,11 +46,6 @@

 #define EC32(x) le32_to_host(x)

 #define EC16(x) le16_to_host(x)

-#ifndef O_BINARY

-#define O_BINARY 0

-#endif

-

-

 static int real_scansis(FILE *, cli_ctx *, const char *);

 static int real_scansis9x(FILE *, cli_ctx *, const char *);

@@ -182,11 +182,7 @@ cli_tnef(const char *dir, int desc, cli_ctx *ctx)

 					char buffer[BUFSIZ];

 					if(filename)

-#ifdef	O_BINARY

 						fout = open(filename, O_WRONLY|O_CREAT|O_EXCL|O_TRUNC|O_BINARY, 0600);

-#else

-						fout = open(filename, O_WRONLY|O_CREAT|O_EXCL|O_TRUNC, 0600);

-#endif

 					if(fout >= 0) {

 						int count;

@@ -81,10 +81,6 @@

 #define NPT NP

 #endif

-#ifndef MIN

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

-#endif

-

 #define GARBLE_FLAG     0x01

 #ifndef HAVE_ATTRIB_PACKED

@@ -99,10 +95,6 @@

 #pragma pack 1

 #endif

-#ifndef O_BINARY

-#define O_BINARY        0

-#endif

-

 typedef struct arj_main_hdr_tag {

 	uint8_t first_hdr_size;		/* must be 30 bytes */

 	uint8_t version;

@@ -45,10 +45,6 @@ static	char	const	rcsid[] = "$Id: untar.c,v 1.35 2007/02/12 20:46:09 njh Exp $";

 #define BLOCKSIZE 512

-#ifndef	O_BINARY

-#define	O_BINARY	0

-#endif

-

 static int

 octal(const char *str)

 {

@@ -58,11 +58,6 @@

 #define UNZIP_PRIVATE

 #include "unzip.h"

-#ifndef O_BINARY

-#define O_BINARY 0

-#endif

-

-

 static int wrap_inflateinit2(void *a, int b) {

   return inflateInit2(a, b);

 }

@@ -44,10 +44,6 @@

 #endif

 #include "blob.h"

-#ifndef	O_BINARY

-#define	O_BINARY	0

-#endif

-

 #define PPT_LZW_BUFFSIZE 8192

 #define VBA_COMPRESSION_WINDOW 4096

 #define	MIDDLE_SIZE	20

@@ -14,6 +14,10 @@

  *  not be used to develop a RAR (WinRAR) compatible archiver.

  */

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

 #include <stdio.h>

 #include <string.h>

@@ -26,7 +30,6 @@

 static void rar_dbgmsg(const char* fmt,...){}

 #endif

-#define MAX(a,b)    (((a) > (b)) ? (a) : (b))

 #define MAX_O 64

 const unsigned int UNIT_SIZE=MAX(sizeof(struct ppm_context), sizeof(struct rar_mem_blk_tag));

@@ -50,10 +50,6 @@ static uint32_t unrar_endian_convert_32(uint32_t v)

 }

 #endif

-#ifndef O_BINARY

-#define O_BINARY    0

-#endif

-

 /* FIXME: allow this to be controlled from unrar_open or so */

 #ifdef RAR_DEBUG_MODE

 #define unrar_dbgmsg printf

@@ -19,3 +19,18 @@

 #ifndef MAX

 #define MAX(a,b)	(((a) > (b)) ? (a) : (b))

 #endif

+

+#ifndef HAVE_IN_PORT_T

+typedef	unsigned	short	in_port_t;

+#endif

+

+#ifndef HAVE_IN_ADDR_T

+typedef	unsigned	int	in_addr_t;

+#endif

+

+#ifdef _WIN32

+#define PATHSEP "\\"

+#else

+#define PATHSEP "/"

+#endif

+

@@ -47,10 +47,6 @@

 #include "libclamav/version.h"

 #include "shared/misc.h"

-#ifndef	O_BINARY

-#define	O_BINARY	0

-#endif

-

 #ifndef REPO_VERSION

 #define REPO_VERSION "exported"

 #endif

@@ -198,7 +194,9 @@ const char *filelist(const struct optstruct *opts, int *err)

 int filecopy(const char *src, const char *dest)

 {

-#ifdef C_DARWIN

+#ifdef _WIN32

+    return (!CopyFileA(src, dest, 0));

+#elif defined(C_DARWIN)

 	pid_t pid;

     /* On Mac OS X use ditto and copy resource fork, too. */

@@ -47,7 +47,6 @@

 #include "getopt.h"

 #define MAXCMDOPTS  100

-#define MAX(a,b) (a > b ? a : b)

 #define MATCH_NUMBER "^[0-9]+$"

 #define MATCH_SIZE "^[0-9]+[KM]?$"

@@ -696,7 +695,7 @@ struct optstruct *optparse(const char *cfgfile, int argc, char **argv, int verbo

     }

     if(cfgfile) {

-	if((fs = fopen(cfgfile, "rb")) == NULL) {

+	if((fs = fopen(cfgfile, "r")) == NULL) {

 	    /* don't print error messages here! */

 	    optfree(opts);