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

+Sat Mar 20 15:53:10 CET 2004 (tk)

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

+  * libclamav: make cli_filetype non static

+

 Sat Mar 20 13:33:49 GMT 2004 (njh)

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

   * libclamav/message.c:	More bounces added

@@ -41,6 +41,7 @@ libclamav_la_SOURCES = \

 	str.h \

 	defaults.h \

 	scanners.c \

+	scanners.h \

 	unrarlib.c \

 	unrarlib.h \

 	zziplib/zzip-conf.h \

@@ -141,6 +141,7 @@ libclamav_la_SOURCES = \

 	str.h \

 	defaults.h \

 	scanners.c \

+	scanners.h \

 	unrarlib.c \

 	unrarlib.h \

 	zziplib/zzip-conf.h \

@@ -39,16 +39,17 @@

 #include <target.h>

 #include <sys/time.h>

+#ifdef CL_THREAD_SAFE

+#  include <pthread.h>

+pthread_mutex_t cl_gentemp_mutex = PTHREAD_MUTEX_INITIALIZER;

+#endif

+

 #include "clamav.h"

 #include "others.h"

 #include "md5.h"

 #define CL_FLEVEL 1 /* don't touch it */

-#ifdef CL_THREAD_SAFE

-#  include <pthread.h>

-pthread_mutex_t cl_gentemp_mutex = PTHREAD_MUTEX_INITIALIZER;

-#endif

 int cli_debug_flag = 0;

@@ -42,6 +42,7 @@ int cli_scanrar_inuse = 0;

 #include "unrarlib.h"

 #include "ole2_extract.h"

 #include "vba_extract.h"

+#include "scanners.h"

 #ifdef HAVE_ZLIB_H

 #include <zlib.h>

@@ -58,26 +59,16 @@ int cli_scanrar_inuse = 0;

 #define DISABLE_RAR	    (options & CL_DISABLERAR)

 #define DETECT_ENCRYPTED    (options & CL_ENCRYPTED)

-typedef enum {

-    CL_UNKNOWN_TYPE = 0,

-    CL_MAILFILE,

-    CL_GZFILE,

-    CL_ZIPFILE,

-    CL_BZFILE,

-    CL_RARFILE,

-    CL_OLE2FILE

-} cl_file_t;

-

-struct cl_magic_s {

+struct cli_magic_s {

     int offset;

     const char *magic;

     size_t length;

     const char *descr;

-    cl_file_t type;

+    cli_file_t type;

 };

 #define MAGIC_BUFFER_SIZE 26

-static const struct cl_magic_s cl_magic[] = {

+static const struct cli_magic_s cli_magic[] = {

     {0,  "Rar!",			4, "RAR",	    CL_RARFILE},

     {0,  "PK\003\004",			4, "ZIP",	    CL_ZIPFILE},

     {0,  "\037\213",			2, "GZip",	    CL_GZFILE},

@@ -97,15 +88,15 @@ static const struct cl_magic_s cl_magic[] = {

     {-1, NULL,              0, NULL,              CL_UNKNOWN_TYPE}

 };

-static cl_file_t cl_filetype(const char *buf, size_t buflen)

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

 {

 	int i;

-    for (i = 0; cl_magic[i].magic; i++) {

-	if (buflen >= cl_magic[i].offset+cl_magic[i].length) {

-	    if (memcmp(buf+cl_magic[i].offset, cl_magic[i].magic, cl_magic[i].length) == 0) {

-		cli_dbgmsg("Recognized %s file\n", cl_magic[i].descr);

-		return cl_magic[i].type;

+    for (i = 0; cli_magic[i].magic; i++) {

+	if (buflen >= cli_magic[i].offset+cli_magic[i].length) {

+	    if (memcmp(buf+cli_magic[i].offset, cli_magic[i].magic, cli_magic[i].length) == 0) {

+		cli_dbgmsg("Recognized %s file\n", cli_magic[i].descr);

+		return cli_magic[i].type;

 	    }

 	}

     }

@@ -783,7 +774,7 @@ static int cli_magic_scandesc(int desc, const char **virname, long int *scanned,

 	char magic[MAGIC_BUFFER_SIZE+1];

 	int ret = CL_CLEAN;

 	int bread = 0;

-	cl_file_t type;

+	cli_file_t type;

     if(!root) {

@@ -815,7 +806,7 @@ static int cli_magic_scandesc(int desc, const char **virname, long int *scanned,

 	    return ret;

 	}

-	type = cl_filetype(magic, bread);

+	type = cli_filetype(magic, bread);

 	switch(type) {

 	    case CL_RARFILE:

new file mode 100644

@@ -0,0 +1,35 @@

+/*

+ *  Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>

+ *  With enhancements from Thomas Lamy <Thomas.Lamy@in-online.net>

+ *

+ *  This program is free software; you can redistribute it and/or modify

+ *  it under the terms of the GNU General Public License as published by

+ *  the Free Software Foundation; either version 2 of the License, or

+ *  (at your option) any later version.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

+ */

+

+#ifndef __SCANNERS_H

+#define __SCANNERS_H

+

+typedef enum {

+    CL_UNKNOWN_TYPE = 0,

+    CL_MAILFILE,

+    CL_GZFILE,

+    CL_ZIPFILE,

+    CL_BZFILE,

+    CL_RARFILE,

+    CL_OLE2FILE

+} cli_file_t;

+

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

+

+#endif