@@ -113,6 +113,7 @@ Ed Phillips <ed*UDel.Edu>

 Andreas Piesk <Andreas.Piesk*heise.de>

 Ant La Porte <ant*dvere.net>

 Thomas Quinot <thomas*cuivre.fr.eu.org>

+Brian A. Reiter <breiter*wolfereiter.com>

 Hector M. Rulot Segovia <Hector.Rulot*uv.es>

 David Santinoli <david*santinoli.com>

 Vijay Sarvepalli <vssarvep*office.uncg.edu>

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

+Sun Jun 27 09:12:29 CEST 2004 (tk)

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

+  * support Windows SFU (thanks to Brian A. Reiter <breiter*wolfereiter.com>)

+

 Sat Jun 26 14:17:11 BST 2004 (njh)

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

   * libclamav/message.c:	Added missing newline from the end of the

@@ -52,7 +56,7 @@ Tue Jun 22 05:09:54 BST 2004 (njh)

 	emails

 			Optimise handling of blank lines in emails

 			Trialing Andrey J. Melnikoff (TEMHOTA)

-	<temnota@kmv.ru>'s patch to print stack trace on SIGSEGV. Tidied,

+	<temnota*kmv.ru>'s patch to print stack trace on SIGSEGV. Tidied,

 	optimised and applied the patch. Comments welcome.

 Tue Jun 22 00:35:38 EDT 2004 (tk)

@@ -46,7 +46,7 @@ while test $# -gt 0; do

 	;;

     --version)

-	echo devel-20040622

+	echo devel-20040627

 	exit 0

 	;;

@@ -45,6 +45,9 @@

 /* os is hpux */

 #undef C_HPUX

+/* os is interix */

+#undef C_INTERIX

+

 /* os is irix */

 #undef C_IRIX

@@ -35,6 +35,12 @@

 #include <sys/types.h>

 #endif

+/* submitted by breiter@wolfereiter.com: do not use poll(2) on Interix */

+#ifdef C_INTERIX

+#undef HAVE_POLL

+#undef HAVE_POLL_H

+#endif

+

 #if HAVE_POLL

 #if HAVE_POLL_H

 #include <poll.h>

@@ -90,7 +90,10 @@ int dirscan(const char *dirname, const char **virname, unsigned long int *scanne

 		closedir(dd);

 		return 1;

 	    }

-	    if(dent->d_ino) {

+#ifndef C_INTERIX

+	    if(dent->d_ino)

+#endif

+	    {

 		if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) {

 		    /* build the full name */

 		    fname = (char *) mcalloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char));

@@ -57,7 +57,10 @@ int treewalk(const char *dirname, struct cl_node *root, const struct passwd *use

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

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

-	    if(dent->d_ino) {

+#ifndef C_INTERIX

+	    if(dent->d_ino)

+#endif

+	    {

 		if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) {

 		    /* build the full name */

 		    fname = mcalloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char));

@@ -103,7 +106,10 @@ int rmdirs(const char *dirname)

 	    if(!rmdir(dirname)) break;

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

-		if(dent->d_ino) {

+#ifndef C_INTERIX

+		if(dent->d_ino)

+#endif

+		{

 		    if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) {

 			fname = mcalloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char));

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

@@ -201,7 +207,10 @@ int fixperms(const char *dirname)

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

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

-	    if(dent->d_ino) {

+#ifndef C_INTERIX

+	    if(dent->d_ino)

+#endif

+	    {

 		if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) {

 		    /* build full name */

 		    fname = mcalloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char));

@@ -244,7 +253,10 @@ int du(const char *dirname, struct s_du *n)

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

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

-	    if(dent->d_ino) {

+#ifndef C_INTERIX

+	    if(dent->d_ino)

+#endif

+	    {

 		if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) {

 		    n->files++;

@@ -11309,7 +11309,32 @@ cat >>confdefs.h <<\_ACEOF

 _ACEOF

     ;;

+interix*)

+cat >>confdefs.h <<\_ACEOF

+#define C_INTERIX 1

+_ACEOF

+

+    if test "$test_clamav" = "yes"; then

+	if test ! -r /etc/passwd; then

+	   test_clamav="no"

+	fi

+    fi

+    if test "$have_pthreads" = "yes"; then

+	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

+	TH_SAFE="-thread-safe"

+

+cat >>confdefs.h <<\_ACEOF

+#define CL_THREAD_SAFE 1

+_ACEOF

+

+

+cat >>confdefs.h <<\_ACEOF

+#define _REENTRANT 1

+_ACEOF

+

+    fi

+    ;;

 *)

     ;;

 esac

@@ -356,7 +356,20 @@ irix*)

     fi

     AC_DEFINE(C_IRIX,1,[os is irix])

     ;;

-

+interix*)

+    AC_DEFINE(C_INTERIX,1,[os is interix])

+    if test "$test_clamav" = "yes"; then

+	if test ! -r /etc/passwd; then

+	   test_clamav="no"

+	fi

+    fi

+    if test "$have_pthreads" = "yes"; then

+	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

+	TH_SAFE="-thread-safe"

+	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])

+	AC_DEFINE(_REENTRANT,1,[thread safe])

+    fi

+    ;;

 *)

     ;;

 esac

@@ -351,7 +351,10 @@ int cli_rmdirs(const char *dirname)

 	    if(!rmdir(dirname)) break;

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

-		if(dent->d_ino) {

+#ifndef C_INTERIX

+		if(dent->d_ino)

+#endif

+		{

 		    if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) {

 			fname = cli_calloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char));

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

@@ -239,7 +239,10 @@ int cl_loaddbdir(const char *dirname, struct cl_node **root, int *virnum)

     cli_dbgmsg("Loading databases from %s\n", dirname);

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

-	if(dent->d_ino) {

+#ifndef C_INTERIX

+	if(dent->d_ino)

+#endif

+	{

 	    if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..") &&

 	    (cli_strbcasestr(dent->d_name, ".db")  ||

 	     cli_strbcasestr(dent->d_name, ".db2") ||

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

     cli_dbgmsg("Stat()ing files in %s\n", dirname);

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

-	if(dent->d_ino) {

+#ifndef C_INTERIX

+	if(dent->d_ino)

+#endif

+	{

 	    if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..") && (cli_strbcasestr(dent->d_name, ".db") || cli_strbcasestr(dent->d_name, ".db2") || cli_strbcasestr(dent->d_name, ".cvd"))) {

 		dbstat->no++;

@@ -331,7 +337,10 @@ int cl_statchkdir(const struct cl_stat *dbstat)

     cli_dbgmsg("Stat()ing files in %s\n", dbstat->dir);

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

-	if(dent->d_ino) {

+#ifndef C_INTERIX

+	if(dent->d_ino)

+#endif

+	{

 	    if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..") && (cli_strbcasestr(dent->d_name, ".db") || cli_strbcasestr(dent->d_name, ".db2") || cli_strbcasestr(dent->d_name, ".cvd"))) {

                 fname = cli_calloc(strlen(dbstat->dir) + strlen(dent->d_name) + 2, sizeof(char));

@@ -780,7 +780,10 @@ static int cli_scandir(const char *dirname, const char **virname, long int *scan

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

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

-	    if(dent->d_ino) {

+#ifndef C_INTERIX

+	    if(dent->d_ino)

+#endif

+	    {

 		if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) {

 		    /* build the full name */

 		    fname = cli_calloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char));

@@ -911,7 +914,10 @@ static int cli_vba_scandir(const char *dirname, const char **virname, long int *

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

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

-	    if(dent->d_ino) {

+#ifndef C_INTERIX

+	    if(dent->d_ino)

+#endif

+	    {

 		if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..")) {

 		    /* build the full name */

 		    fname = cli_calloc(strlen(dirname) + strlen(dent->d_name) + 2, sizeof(char));

@@ -978,7 +978,10 @@ int listdir(const char *dirname)

     }

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

-	if(dent->d_ino) {

+#ifndef C_INTERIX

+	if(dent->d_ino)

+#endif

+	{

 	    if(strcmp(dent->d_name, ".") && strcmp(dent->d_name, "..") &&

 	    (cli_strbcasestr(dent->d_name, ".db")  ||

 	     cli_strbcasestr(dent->d_name, ".db2") ||