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

+Sun Feb 25 01:58:55 CET 2007 (tk)

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

+  * clamscan: merge win32 patches from NJH

+

 Sat Feb 24 22:47:28 GMT 2007 (njh)

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

   * libclamav/pdf.c:	Remove warning on FreeBSD4.11

@@ -135,6 +135,9 @@

 /* have gmp installed */

 #undef HAVE_GMP

+/* Define to 1 if you have the <grp.h> header file. */

+#undef HAVE_GRP_H

+

 /* Define to 1 if you have the <iconv.h> header file. */

 #undef HAVE_ICONV_H

@@ -192,6 +195,9 @@

 /* "pragma pack hppa/hp-ux style" */

 #undef HAVE_PRAGMA_PACK_HPPA

+/* Define to 1 if you have the <pwd.h> header file. */

+#undef HAVE_PWD_H

+

 /* readdir_r takes 2 arguments */

 #undef HAVE_READDIR_R_2

@@ -24,8 +24,14 @@

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

+#ifdef	C_WINDOWS

+#include <fcntl.h>

+#else

 #include <sys/time.h>

+#endif

 #include <time.h>

 #ifdef C_LINUX

 #include <sys/resource.h>

@@ -43,6 +49,10 @@

 void help(void);

+#if defined(C_WINDOWS) && defined(CL_DEBUG)

+#include <crtdbg.h>

+#endif

+

 struct s_info info;

 short recursion = 0, printinfected = 0, bell = 0;

@@ -51,10 +61,18 @@ int main(int argc, char **argv)

 	int ds, dms, ret;

 	double mb;

 	struct timeval t1, t2;

+#ifndef C_WINDOWS

 	struct timezone tz;

+#endif

 	struct optstruct *opt;

 	const char *pt;

+#if defined(C_WINDOWS) && defined(CL_THREAD_SAFE)

+    if(!pthread_win32_process_attach_np()) {

+	mprintf("!Can't start the win32 pthreads layer\n");

+	return 72;

+    }

+#endif

     opt = opt_parse(argc, argv, clamscan_shortopt, clamscan_longopt, NULL);

     if(!opt) {

@@ -180,11 +198,27 @@ int main(int argc, char **argv)

     memset(&info, 0, sizeof(struct s_info));

+#ifdef C_WINDOWS

+    _set_fmode(_O_BINARY);

+#ifdef CL_DEBUG

+    {

+	_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE);

+	_CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);

+    }

+#endif	

+    gettimeofday(&t1, NULL);

+#else

     gettimeofday(&t1, &tz);

+#endif

+

     ret = scanmanager(opt);

     if(!opt_check(opt, "disable-summary") && !opt_check(opt, "no-summary")) {

+#ifdef C_WINDOWS

+	gettimeofday(&t2, NULL);

+#else

 	gettimeofday(&t2, &tz);

+#endif

 	ds = t2.tv_sec - t1.tv_sec;

 	dms = t2.tv_usec - t1.tv_usec;

 	ds -= (dms < 0) ? (1):(0);

@@ -210,6 +244,14 @@ int main(int argc, char **argv)

     }

     opt_free(opt);

+

+#if defined(C_WINDOWS) && defined(CL_THREAD_SAFE)

+    if(!pthread_win32_process_detach_np()) {

+	logg("!Can't stop the win32 pthreads layer\n");

+	return 72;

+    }

+#endif

+

     return ret;

 }

@@ -29,11 +29,22 @@

 #include <ctype.h>

 #include <sys/stat.h>

 #include <sys/types.h>

+#ifdef C_WINDOWS

+#include <sys/utime.h>

+#else

 #include <sys/wait.h>

 #include <utime.h>

+#endif

+#ifdef HAVE_GRP_H

 #include <grp.h>

+#endif

+#ifdef HAVE_PWD_H

+#include <pwd.h>

+#endif

 #include <fcntl.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <sys/types.h>

 #include <signal.h>

 #include <errno.h>

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

 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 scandirs(const char *dirname, struct cl_engine *engine, const struct passwd *user, const struct optstruct *opt, const struct cl_limits *limits, int options)

 {

     return treewalk(dirname, engine, user, opt, limits, options, 1);

@@ -132,7 +152,7 @@ int scanmanager(const struct optstruct *opt)

 /* njh@bandsman.co.uk: BeOS */

-#if !defined(C_CYGWIN) && !defined(C_OS2) && !defined(C_BEOS)

+#if !defined(C_CYGWIN) && !defined(C_OS2) && !defined(C_BEOS) && !defined(C_WINDOWS)

     if(!geteuid()) {

 	if((user = getpwnam(CLAMAVUSER)) == NULL) {

 	    logg("!Can't get information about user "CLAMAVUSER"\n");

@@ -388,6 +408,15 @@ int scanmanager(const struct optstruct *opt)

  * -3 -> external signal

  * 0 -> OK

  */

+

+#ifdef C_WINDOWS

+static int clamav_unpack(const char *prog, char **args, const char *tmpdir, const struct passwd *user, const struct optstruct *opt)

+{

+    /* TODO: use spamvp(P_WAIT, prog, args); */

+    cli_errmsg("clamav_unpack is not supported under Windows yet\n");

+    return -1;

+}

+#else

 static int clamav_unpack(const char *prog, char **args, const char *tmpdir, const struct passwd *user, const struct optstruct *opt)

 {

 	pid_t pid;

@@ -495,6 +524,7 @@ static int clamav_unpack(const char *prog, char **args, const char *tmpdir, cons

     return 0;

 }

+#endif

 static void move_infected(const char *filename, const struct optstruct *opt)

 {

@@ -610,7 +640,7 @@ static int checkfile(const char *filename, const struct cl_engine *engine, const

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

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

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

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

 	return 54;

     }

@@ -671,7 +701,8 @@ static int scancompressed(const char *filename, struct cl_engine *engine, const

 	exit(63); /* critical */

     }

-#ifndef C_OS2

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

+    /* FIXME: do the correct native windows way */

     if(user)

 	chown(gendir, user->pw_uid, user->pw_gid);

 #endif

@@ -886,7 +917,7 @@ static int scandenied(const char *filename, struct cl_engine *engine, const stru

     fixperms(gendir);

-#ifndef C_OS2

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

     if(user) {

 	chown(gendir, user->pw_uid, user->pw_gid);

 	chown(tmpfile, user->pw_uid, user->pw_gid);

@@ -970,12 +1001,14 @@ int scanfile(const char *filename, struct cl_engine *engine, const struct passwd

 	return 0;

     }

+#ifndef C_WINDOWS

     if(geteuid())

 	if(checkaccess(filename, NULL, R_OK) != 1) {

 	    if(!printinfected)

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

 	    return 0;

 	}

+#endif

     info.files++;

@@ -20,7 +20,13 @@

 #ifndef __MANAGER_H

 #define __MANAGER_H

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

+#ifdef HAVE_PWD_H

 #include <pwd.h>

+#endif

 #include "libclamav/clamav.h"

 #include "shared/options.h"

@@ -26,13 +26,19 @@

 #include <stdlib.h>

 #include <string.h>

 #include <ctype.h>

+#ifdef HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <errno.h>

+#ifdef HAVE_PWD_H

 #include <pwd.h>

+#endif

 #include <sys/types.h>

 #include <sys/stat.h>

+#ifndef C_WINDOWS

 #include <sys/wait.h>

 #include <sys/time.h>

+#endif

 #include <time.h>

 #include <fcntl.h>

 #include <signal.h>

@@ -70,6 +76,13 @@ int fileinfo(const char *filename, short i)

     }

 }

+#ifdef C_WINDOWS

+/* 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)

 {

 	struct passwd *user;

@@ -114,6 +127,7 @@ int checkaccess(const char *path, const char *username, int mode)

     return ret;

 }

+#endif

 int match_regex(const char *filename, const char *pattern)

 {

@@ -24,12 +24,23 @@

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

+#ifdef	HAVE_UNISTD_H

 #include <unistd.h>

+#endif

 #include <sys/stat.h>

 #include <sys/types.h>

+#ifndef C_WINDOWS

 #include <sys/wait.h>

+#endif

+#ifdef HAVE_PWD_H

+#include <pwd.h>

+#endif

+#ifdef HAVE_GRP_H

 #include <grp.h>

+#endif

+#ifndef C_WINDOWS

 #include <dirent.h>

+#endif

 #include <errno.h>

 #include "global.h"

@@ -99,7 +110,7 @@ int treewalk(const char *dirname, struct cl_engine *engine, const struct passwd

     if((dd = opendir(dirname)) != NULL) {

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

-#ifndef C_INTERIX

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

 	    if(dent->d_ino)

 #endif

 	    {

@@ -138,6 +149,12 @@ int treewalk(const char *dirname, struct cl_engine *engine, const struct passwd

 }

+#ifdef C_WINDOWS

+int clamav_rmdirs(const char *dir)

+{

+    return cli_rmdirs(dir);

+}

+#else

 int clamav_rmdirs(const char *dir)

 {

 #ifndef C_CYGWIN

@@ -185,6 +202,7 @@ int clamav_rmdirs(const char *dir)

 		return -2;

     }

 }

+#endif

 int fixperms(const char *dirname)

 {

@@ -196,7 +214,7 @@ int fixperms(const char *dirname)

     if((dd = opendir(dirname)) != NULL) {

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

-#ifndef C_INTERIX

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

 	    if(dent->d_ino)

 #endif

 	    {

@@ -242,7 +260,7 @@ int du(const char *dirname, struct s_du *n)

     if((dd = opendir(dirname)) != NULL) {

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

-#ifndef C_INTERIX

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

 	    if(dent->d_ino)

 #endif

 	    {

@@ -20,7 +20,14 @@

 #ifndef __TREEWALK_H

 #define __TREEWALK_H

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

+#ifdef HAVE_PWD_H

 #include <pwd.h>

+#endif

+

 #include "libclamav/clamav.h"

 #include "shared/options.h"

@@ -19734,7 +19734,9 @@ fi

-for ac_header in stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h regex.h limits.h sys/filio.h sys/uio.h termios.h iconv.h stdbool.h

+

+

+for ac_header in stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h regex.h limits.h sys/filio.h sys/uio.h termios.h iconv.h stdbool.h pwd.h grp.h

 do

 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

@@ -40,7 +40,7 @@ AC_DEFINE(SCANBUFF, 131072, [scan buffer size])

 AC_DEFINE(FILEBUFF, 8192,   [file i/o buffer size])

 AC_HEADER_STDC

-AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h regex.h limits.h sys/filio.h sys/uio.h termios.h iconv.h stdbool.h)

+AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h regex.h limits.h sys/filio.h sys/uio.h termios.h iconv.h stdbool.h pwd.h grp.h)

 AC_CHECK_HEADER(syslog.h,AC_DEFINE(USE_SYSLOG,1,[use syslog]),)

 AC_TYPE_OFF_T