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

+Mon Sep 13 18:41:05 CEST 2004 (tk)

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

+  * libclamav: minor cleanup

+

 Mon Sep 13 14:17:01 BST 2004 (njh)

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

   * libclamav/mbox.c:	return with CL_EFORMAT if mail can't be parsed

@@ -155,7 +155,7 @@ void *clamukoth(void *arg)

     }

     if(cfgopt(tharg->copt, "ClamukoScanArchive")) {

-	options |= CL_ARCHIVE;

+	options |= CL_SCAN_ARCHIVE;

 	logg("Clamuko: Archive support enabled.\n");

     } else {

 	logg("Clamuko: Archive support disabled.\n");

@@ -163,7 +163,7 @@ void *clamukoth(void *arg)

     if(cfgopt(tharg->copt, "ScanOLE2")) { 

 	logg("Clamuko: OLE2 support enabled.\n");

-	options |= CL_OLE2;

+	options |= CL_SCAN_OLE2;

     } else {

 	logg("Clamuko: OLE2 support disabled.\n");

     }

@@ -293,23 +293,23 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     if(cfgopt(copt, "ScanArchive")) {

 	logg("Archive support enabled.\n");

-	options |= CL_ARCHIVE;

+	options |= CL_SCAN_ARCHIVE;

 	if(cfgopt(copt, "ScanRAR")) {

 	    logg("Archive: RAR support enabled.\n");

 	} else {

 	    logg("Archive: RAR support disabled.\n");

-	    options |= CL_DISABLERAR;

+	    options |= CL_SCAN_DISABLERAR;

 	}

 	if(cfgopt(copt, "ArchiveBlockEncrypted")) {

 	    logg("Archive: Blocking encrypted archives.\n");

-	    options |= CL_ENCRYPTED;

+	    options |= CL_SCAN_ENCRYPTED;

 	}

 	if(cfgopt(copt, "ArchiveBlockMax")) {

 	    logg("Archive: Blocking archives that exceed limits.\n");

-	    options |= CL_BLOCKMAX;

+	    options |= CL_SCAN_BLOCKMAX;

 	}

     } else {

@@ -318,11 +318,11 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     if(cfgopt(copt, "ScanPE")) {

 	logg("Portable Executable support enabled.\n");

-	options |= CL_PE;

+	options |= CL_SCAN_PE;

 	if(cfgopt(copt, "DetectBrokenExecutables")) {

 	    logg("Detection of broken executables enabled.\n");

-	    options |= CL_BROKEN;

+	    options |= CL_SCAN_BROKEN;

 	}

     } else {

@@ -331,11 +331,11 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     if(cfgopt(copt, "ScanMail")) {

 	logg("Mail files support enabled.\n");

-	options |= CL_MAIL;

+	options |= CL_SCAN_MAIL;

 	if(cfgopt(copt, "MailFollowURLs")) {

 	    logg("Mail: URL scanning enabled.\n");

-	    options |= CL_MAILURL;

+	    options |= CL_SCAN_MAILURL;

 	}

     } else {

@@ -344,14 +344,14 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     if(cfgopt(copt, "ScanOLE2")) {

 	logg("OLE2 support enabled.\n");

-	options |= CL_OLE2;

+	options |= CL_SCAN_OLE2;

     } else {

 	logg("OLE2 support disabled.\n");

     }

     if(cfgopt(copt, "ScanHTML")) {

 	logg("HTML support enabled.\n");

-	options |= CL_HTML;

+	options |= CL_SCAN_HTML;

     } else {

 	logg("HTML support disabled.\n");

     }

@@ -105,7 +105,7 @@ int command(int desc, const struct cl_node *root, const struct cl_limits *limits

 	scan(buff + strlen(CMD1) + 1, NULL, root, limits, options, copt, desc, 0);

     } else if(!strncmp(buff, CMD2, strlen(CMD2))) { /* RAWSCAN */

-	opt = options & ~CL_ARCHIVE;

+	opt = options & ~CL_SCAN_ARCHIVE;

 	scan(buff + strlen(CMD2) + 1, NULL, root, NULL, opt, copt, desc, 0);

     } else if(!strncmp(buff, CMD3, strlen(CMD3))) { /* QUIT */

@@ -163,41 +163,41 @@ int scanmanager(const struct optstruct *opt)

     /* set options */

     if(optl(opt, "disable-archive") || optl(opt, "no-archive"))

-	options &= ~CL_ARCHIVE;

+	options &= ~CL_SCAN_ARCHIVE;

     else

-	options |= CL_ARCHIVE;

+	options |= CL_SCAN_ARCHIVE;

     if(optl(opt, "detect-broken"))

-	options |= CL_BROKEN;

+	options |= CL_SCAN_BROKEN;

     if(optl(opt, "block-encrypted"))

-	options |= CL_ENCRYPTED;

+	options |= CL_SCAN_ENCRYPTED;

     if(optl(opt, "block-max"))

-	options |= CL_BLOCKMAX;

+	options |= CL_SCAN_BLOCKMAX;

     if(optl(opt, "no-pe"))

-	options &= ~CL_PE;

+	options &= ~CL_SCAN_PE;

     else

-	options |= CL_PE;

+	options |= CL_SCAN_PE;

     if(optl(opt, "no-ole2"))

-	options &= ~CL_OLE2;

+	options &= ~CL_SCAN_OLE2;

     else

-	options |= CL_OLE2;

+	options |= CL_SCAN_OLE2;

     if(optl(opt, "no-html"))

-	options &= ~CL_HTML;

+	options &= ~CL_SCAN_HTML;

     else

-	options |= CL_HTML;

+	options |= CL_SCAN_HTML;

     if(optl(opt, "no-mail")) {

-	options &= ~CL_MAIL;

+	options &= ~CL_SCAN_MAIL;

     } else {

-	options |= CL_MAIL;

+	options |= CL_SCAN_MAIL;

 	if(optl(opt, "mail-follow-urls"))

-	    options |= CL_MAILURL;

+	    options |= CL_SCAN_MAILURL;

     }

 #ifdef C_LINUX

@@ -378,7 +378,7 @@ int scanfile(const char *filename, struct cl_node *root, const struct passwd *us

      * external (if provided) when internal cannot extract data.

      */

-    if((cli_strbcasestr(filename, ".zip") || cli_strbcasestr(filename, ".rar")) && (options & CL_ARCHIVE)) {

+    if((cli_strbcasestr(filename, ".zip") || cli_strbcasestr(filename, ".rar")) && (options & CL_SCAN_ARCHIVE)) {

 	/* try to use internal archivers */

 	if((ret = checkfile(filename, root, limits, options)) == CL_VIRUS) {

 	    if(optl(opt, "remove")) {

@@ -398,7 +398,7 @@ int scanfile(const char *filename, struct cl_node *root, const struct passwd *us

 	} else if(ret == CL_CLEAN)

 	    return 0;

 	/* in other case try to continue with external archivers */

-	options &= ~CL_ARCHIVE; /* and disable decompression for the below checkfile() */

+	options &= ~CL_SCAN_ARCHIVE; /* and disable decompression for the below checkfile() */

     }

     if((cli_strbcasestr(filename, ".zip") && optl(opt, "unzip"))

@@ -74,7 +74,7 @@ int main(int argc, char **argv)

     limits.archivememlim = 0; /* disable memory limit for bzip2 scanner */

     /* scan descriptor */

-    if((ret = cl_scandesc(fd, &virname, &size, root, &limits, CL_STDOPT)) == CL_VIRUS)

+    if((ret = cl_scandesc(fd, &virname, &size, root, &limits, CL_SCAN_STDOPT)) == CL_VIRUS)

 	printf("Virus detected: %s\n", virname);

     else {

 	printf("No virus detected.\n");

@@ -27,12 +27,10 @@

 extern "C"

 {

 #endif

- 

 #define CL_COUNT_PRECISION 4096

-

 /* return codes */

 #define CL_CLEAN	0   /* virus not found */

 #define CL_VIRUS	1   /* virus found */

@@ -65,22 +63,30 @@ extern "C"

 #define CL_EIO		-12 /* general I/O error */

 #define CL_EFORMAT	-13 /* bad format or broken file */

-/* options */

-#define CL_RAW		0

-#define CL_ARCHIVE	1

-#define CL_MAIL		2

-#define CL_DISABLERAR	4

-#define CL_OLE2		8

-#define CL_ENCRYPTED    16

-#define CL_HTML		32

-#define CL_PE		64

-#define CL_BROKEN	128

-#define CL_MAILURL	256

-#define CL_BLOCKMAX	512

-

+/* scan options */

+#define CL_SCAN_RAW		0

+#define CL_SCAN_ARCHIVE		1

+#define CL_SCAN_MAIL		2

+#define CL_SCAN_DISABLERAR	4

+#define CL_SCAN_OLE2		8

+#define CL_SCAN_ENCRYPTED	16

+#define CL_SCAN_HTML		32

+#define CL_SCAN_PE		64

+#define CL_SCAN_BROKEN		128

+#define CL_SCAN_MAILURL		256

+#define CL_SCAN_BLOCKMAX	512

 /* recommended options */

-#define CL_STDOPT	(CL_ARCHIVE | CL_MAIL | CL_OLE2 | CL_HTML | CL_PE) 

+#define CL_SCAN_STDOPT		(CL_SCAN_ARCHIVE | CL_SCAN_MAIL | CL_SCAN_OLE2 | CL_SCAN_HTML | CL_SCAN_PE) 

+

+/* aliases for backward compatibility */

+#define CL_RAW		CL_SCAN_RAW

+#define CL_ARCHIVE	CL_SCAN_ARCHIVE

+#define CL_MAIL		CL_SCAN_MAIL

+#define CL_DISABLERAR	CL_SCAN_DISABLERAR

+#define CL_OLE2		CL_SCAN_OLE2

+#define CL_ENCRYPTED    CL_SCAN_ENCRYPTED

+

 struct cli_bm_patt {

     char *pattern;

@@ -158,13 +164,13 @@ struct cl_cvd {

 /* file scanning */

 extern int cl_scanbuff(const char *buffer, unsigned int length, const char **virname, const struct cl_node *root);

-extern int cl_scandesc(int desc, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options);

+extern int cl_scandesc(int desc, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options);

-extern int cl_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options);

+extern int cl_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options);

 /* database */

-extern int cl_loaddb(const char *filename, struct cl_node **root, int *virnum);

-extern int cl_loaddbdir(const char *dirname, struct cl_node **root, int *virnum);

+extern int cl_loaddb(const char *filename, struct cl_node **root, unsigned int *signo);

+extern int cl_loaddbdir(const char *dirname, struct cl_node **root, unsigned int *signo);

 extern const char *cl_retdbdir(void);

 extern int cl_retflevel(void);

@@ -328,7 +328,7 @@ int cl_cvdverify(const char *file)

     return ret;

 }

-int cli_cvdload(FILE *fd, struct cl_node **root, int *virnum)

+int cli_cvdload(FILE *fd, struct cl_node **root, unsigned int *signo)

 {

         char *dir, *tmp, *buffer;

 	struct cl_cvd cvd;

@@ -432,7 +432,7 @@ int cli_cvdload(FILE *fd, struct cl_node **root, int *virnum)

 	    /* end */

     /* load extracted directory */

-    cl_loaddbdir(dir, root, virnum);

+    cl_loaddbdir(dir, root, signo);

     cli_rmdirs(dir);

     free(dir);

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

 #include <stdio.h>

 #include "clamav.h"

-int cli_cvdload(FILE *fd, struct cl_node **root, int *virnum);

+int cli_cvdload(FILE *fd, struct cl_node **root, unsigned int *signo);

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

 #endif

@@ -49,102 +49,102 @@ static const struct cli_magic_s cli_magic[] = {

     /* Executables */

-    {0,  "MZ",				2,  "DOS/W32 executable/library/driver", CL_DOSEXE},

+    {0,  "MZ",				2,  "DOS/W32 executable/library/driver", CL_TYPE_MSEXE},

     /* Archives */

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

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

-    {0,	    "PK00PK\003\004",		4,  "ZIP",		  CL_ZIPFILE},

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

-    {0,	    "BZh",			3,  "BZip",		  CL_BZFILE},

-    {0,	    "SZDD",			4,  "compress.exe'd",	  CL_MSCFILE},

-    {0,	    "MSCF",			4,  "MS CAB",		  CL_MSCABFILE},

-    {0,	    "ITSF",			4,  "MS CHM",             CL_MSCHMFILE},

-    {257,   "ustar",			5,  "POSIX tar",	  CL_TARFILE},

-    {0,     "#@~^",			4,  "SCRENC",		  CL_SCRENC},

+    {0,	    "Rar!",			4,  "RAR",		CL_TYPE_RAR},

+    {0,	    "PK\003\004",		4,  "ZIP",		CL_TYPE_ZIP},

+    {0,	    "PK00PK\003\004",		4,  "ZIP",		CL_TYPE_ZIP},

+    {0,	    "\037\213",			2,  "GZip",		CL_TYPE_GZ},

+    {0,	    "BZh",			3,  "BZip",		CL_TYPE_BZ},

+    {0,	    "SZDD",			4,  "compress.exe'd",	CL_TYPE_MSSZDD},

+    {0,	    "MSCF",			4,  "MS CAB",		CL_TYPE_MSCAB},

+    {0,	    "ITSF",			4,  "MS CHM",           CL_TYPE_MSCHM},

+    {257,   "ustar",			5,  "POSIX tar",	CL_TYPE_TAR},

+    {0,     "#@~^",			4,  "SCRENC",		CL_TYPE_SCRENC},

     /* Mail */

-    {0,  "From ",			 5, "MBox",		  CL_MAILFILE},

-    {0,  "Received: ",			10, "Raw mail",		  CL_MAILFILE},

-    {0,  "Return-Path: ",		13, "Maildir",		  CL_MAILFILE},

-    {0,  "Return-path: ",		13, "Maildir",		  CL_MAILFILE},

-    {0,  "Delivered-To: ",		14, "Mail",		  CL_MAILFILE},

-    {0,  "X-UIDL: ",			 8, "Mail",		  CL_MAILFILE},

-    {0,  "X-Apparently-To: ",		17, "Mail",		  CL_MAILFILE},

-    {0,  "X-Envelope-From: ",		17, "Mail",		  CL_MAILFILE},

-    {0,  "X-Original-To: ",		15, "Mail",		  CL_MAILFILE},

-    {0,  "X-Symantec-",			11, "Symantec",		  CL_MAILFILE},

-    {0,  "X-EVS",			 5, "EVS mail",		  CL_MAILFILE},

-    {0,  "X-Real-To: ",                 11, "Mail",               CL_MAILFILE},

-    {0,  ">From ",			 6, "Mail",		  CL_MAILFILE},

-    {0,  "Date: ",			 6, "Mail",		  CL_MAILFILE},

-    {0,  "Message-Id: ",		12, "Mail",		  CL_MAILFILE},

-    {0,  "Message-ID: ",		12, "Mail",		  CL_MAILFILE},

-    {0,  "Envelope-to: ",		13, "Mail",		  CL_MAILFILE},

-    {0,  "Delivery-date: ",		15, "Mail",		  CL_MAILFILE},

-    {0,  "To: ",			 4, "Mail",		  CL_MAILFILE},

-    {0,  "Subject: ",			 9, "Mail",		  CL_MAILFILE},

-    {0,  "For: ",			 5, "Eserv mail",	  CL_MAILFILE},

-    {0,  "From: ",			 6, "Exim mail",	  CL_MAILFILE},

-    {0,  "v:\015\012Received: ",	14, "VPOP3 Mail (DOS)",	  CL_MAILFILE},

-    {0,  "v:\012Received: ",		13, "VPOP3 Mail (UNIX)",  CL_MAILFILE},

-    {0,  "Hi. This is the qmail-send",  26, "Qmail bounce",	  CL_MAILFILE},

+    {0,  "From ",			 5, "MBox",		  CL_TYPE_MAIL},

+    {0,  "Received: ",			10, "Raw mail",		  CL_TYPE_MAIL},

+    {0,  "Return-Path: ",		13, "Maildir",		  CL_TYPE_MAIL},

+    {0,  "Return-path: ",		13, "Maildir",		  CL_TYPE_MAIL},

+    {0,  "Delivered-To: ",		14, "Mail",		  CL_TYPE_MAIL},

+    {0,  "X-UIDL: ",			 8, "Mail",		  CL_TYPE_MAIL},

+    {0,  "X-Apparently-To: ",		17, "Mail",		  CL_TYPE_MAIL},

+    {0,  "X-Envelope-From: ",		17, "Mail",		  CL_TYPE_MAIL},

+    {0,  "X-Original-To: ",		15, "Mail",		  CL_TYPE_MAIL},

+    {0,  "X-Symantec-",			11, "Symantec",		  CL_TYPE_MAIL},

+    {0,  "X-EVS",			 5, "EVS mail",		  CL_TYPE_MAIL},

+    {0,  "X-Real-To: ",                 11, "Mail",               CL_TYPE_MAIL},

+    {0,  ">From ",			 6, "Mail",		  CL_TYPE_MAIL},

+    {0,  "Date: ",			 6, "Mail",		  CL_TYPE_MAIL},

+    {0,  "Message-Id: ",		12, "Mail",		  CL_TYPE_MAIL},

+    {0,  "Message-ID: ",		12, "Mail",		  CL_TYPE_MAIL},

+    {0,  "Envelope-to: ",		13, "Mail",		  CL_TYPE_MAIL},

+    {0,  "Delivery-date: ",		15, "Mail",		  CL_TYPE_MAIL},

+    {0,  "To: ",			 4, "Mail",		  CL_TYPE_MAIL},

+    {0,  "Subject: ",			 9, "Mail",		  CL_TYPE_MAIL},

+    {0,  "For: ",			 5, "Eserv mail",	  CL_TYPE_MAIL},

+    {0,  "From: ",			 6, "Exim mail",	  CL_TYPE_MAIL},

+    {0,  "v:\015\012Received: ",	14, "VPOP3 Mail (DOS)",	  CL_TYPE_MAIL},

+    {0,  "v:\012Received: ",		13, "VPOP3 Mail (UNIX)",  CL_TYPE_MAIL},

+    {0,  "Hi. This is the qmail-send",  26, "Qmail bounce",	  CL_TYPE_MAIL},

     /* Others */

     {0,  "\320\317\021\340\241\261\032\341",

-	                    8, "OLE2 container",  CL_OLE2FILE},

+	                    8, "OLE2 container",  CL_TYPE_MSOLE2},

     /* Ignored types */

-    {0,  "\000\000\001\263",             4, "MPEG video stream",  CL_DATAFILE},

-    {0,  "\000\000\001\272",             4, "MPEG sys stream",    CL_DATAFILE},

-    {0,  "RIFF",                         4, "RIFF",		  CL_DATAFILE},

-    {0,  "GIF",				 3, "GIF",		  CL_DATAFILE},

-    {0,  "\x89PNG",			 4, "PNG",                CL_DATAFILE},

-    {0,  "\377\330\377",		 4, "JPEG",               CL_DATAFILE},

-    {0,  "BM",				 2, "BMP",                CL_DATAFILE},

-    {0,  "OggS",                         4, "Ogg Stream",         CL_DATAFILE},

-    {0,  "ID3",				 3, "MP3",		  CL_DATAFILE},

-    {0,  "\377\373\220",		 3, "MP3",		  CL_DATAFILE},

-    {0,  "\%PDF-",			 5, "PDF document",	  CL_DATAFILE},

-    {0,  "\%!PS-Adobe-",		11, "PostScript",	  CL_DATAFILE},

-    {0,  "\060\046\262\165\216\146\317", 7, "WMA/WMV/ASF",	  CL_DATAFILE},

-    {0,  ".RMF" ,			 4, "Real Media File",	  CL_DATAFILE},

-

-    {-1, NULL,				 0, NULL,              CL_UNKNOWN_DATA_TYPE}

+    {0,  "\000\000\001\263",             4, "MPEG video stream",  CL_TYPE_DATA},

+    {0,  "\000\000\001\272",             4, "MPEG sys stream",    CL_TYPE_DATA},

+    {0,  "RIFF",                         4, "RIFF",		  CL_TYPE_DATA},

+    {0,  "GIF",				 3, "GIF",		  CL_TYPE_DATA},

+    {0,  "\x89PNG",			 4, "PNG",                CL_TYPE_DATA},

+    {0,  "\377\330\377",		 4, "JPEG",               CL_TYPE_DATA},

+    {0,  "BM",				 2, "BMP",                CL_TYPE_DATA},

+    {0,  "OggS",                         4, "Ogg Stream",         CL_TYPE_DATA},

+    {0,  "ID3",				 3, "MP3",		  CL_TYPE_DATA},

+    {0,  "\377\373\220",		 3, "MP3",		  CL_TYPE_DATA},

+    {0,  "\%PDF-",			 5, "PDF document",	  CL_TYPE_DATA},

+    {0,  "\%!PS-Adobe-",		11, "PostScript",	  CL_TYPE_DATA},

+    {0,  "\060\046\262\165\216\146\317", 7, "WMA/WMV/ASF",	  CL_TYPE_DATA},

+    {0,  ".RMF" ,			 4, "Real Media File",	  CL_TYPE_DATA},

+

+    {-1, NULL,				 0, NULL,		  CL_TYPE_UNKNOWN_DATA}

 };

 static const struct cli_smagic_s cli_smagic[] = {

     /* "\nFrom: " * "\nContent-Type: " */

-    {"0a46726f6d3a20{-2048}0a436f6e74656e742d547970653a20", "Mail file", CL_MAILFILE},

+    {"0a46726f6d3a20{-2048}0a436f6e74656e742d547970653a20", "Mail file", CL_TYPE_MAIL},

     /* "\nReceived: " * "\nContent-Type: " */

-    {"0a52656365697665643a20{-2048}0a436f6e74656e742d547970653a20", "Mail file", CL_MAILFILE},

+    {"0a52656365697665643a20{-2048}0a436f6e74656e742d547970653a20", "Mail file", CL_TYPE_MAIL},

     /* "\nReceived: " * "\nContent-type: " */

-    {"0a52656365697665643a20{-2048}0a436f6e74656e742d747970653a20", "Mail file", CL_MAILFILE},

+    {"0a52656365697665643a20{-2048}0a436f6e74656e742d747970653a20", "Mail file", CL_TYPE_MAIL},

     /* remember the matcher is case sensitive */

-    {"3c62723e",       "HTML data", CL_HTMLFILE},	/* <br> */

-    {"3c42723e",       "HTML data", CL_HTMLFILE},	/* <Br> */

-    {"3c42523e",       "HTML data", CL_HTMLFILE},	/* <BR> */

-    {"3c703e",	       "HTML data", CL_HTMLFILE},	/* <p> */

-    {"3c503e",	       "HTML data", CL_HTMLFILE},	/* <P> */

-    {"68726566",       "HTML data", CL_HTMLFILE},	/* href */

-    {"48726566",       "HTML data", CL_HTMLFILE},	/* Href */

-    {"48524546",       "HTML data", CL_HTMLFILE},	/* HREF */

-    {"3c666f6e74",     "HTML data", CL_HTMLFILE},	/* <font */

-    {"3c466f6e74",     "HTML data", CL_HTMLFILE},	/* <Font */

-    {"3c464f4e54",     "HTML data", CL_HTMLFILE},	/* <FONT */

-    {"3c736372697074", "HTML data", CL_HTMLFILE},	/* <script */

-    {"3c536372697074", "HTML data", CL_HTMLFILE},	/* <Script */

-    {"3c534352495054", "HTML data", CL_HTMLFILE},	/* <SCRIPT */

-

-    {NULL,  NULL,   CL_UNKNOWN_DATA_TYPE}

+    {"3c62723e",       "HTML data", CL_TYPE_HTML},	/* <br> */

+    {"3c42723e",       "HTML data", CL_TYPE_HTML},	/* <Br> */

+    {"3c42523e",       "HTML data", CL_TYPE_HTML},	/* <BR> */

+    {"3c703e",	       "HTML data", CL_TYPE_HTML},	/* <p> */

+    {"3c503e",	       "HTML data", CL_TYPE_HTML},	/* <P> */

+    {"68726566",       "HTML data", CL_TYPE_HTML},	/* href */

+    {"48726566",       "HTML data", CL_TYPE_HTML},	/* Href */

+    {"48524546",       "HTML data", CL_TYPE_HTML},	/* HREF */

+    {"3c666f6e74",     "HTML data", CL_TYPE_HTML},	/* <font */

+    {"3c466f6e74",     "HTML data", CL_TYPE_HTML},	/* <Font */

+    {"3c464f4e54",     "HTML data", CL_TYPE_HTML},	/* <FONT */

+    {"3c736372697074", "HTML data", CL_TYPE_HTML},	/* <script */

+    {"3c536372697074", "HTML data", CL_TYPE_HTML},	/* <Script */

+    {"3c534352495054", "HTML data", CL_TYPE_HTML},	/* <SCRIPT */

+

+    {NULL,  NULL,   CL_TYPE_UNKNOWN_DATA}

 };

 cli_file_t cli_filetype(const char *buf, size_t buflen)

@@ -168,7 +168,7 @@ cli_file_t cli_filetype(const char *buf, size_t buflen)

 	    break;

 	}

-    return ascii ? CL_UNKNOWN_TEXT_TYPE : CL_UNKNOWN_DATA_TYPE;

+    return ascii ? CL_TYPE_UNKNOWN_TEXT : CL_TYPE_UNKNOWN_DATA;

 }

 int cli_addtypesigs(struct cl_node *root)

@@ -24,24 +24,24 @@

 #define CL_TYPENO 500

 typedef enum {

-    CL_UNKNOWN_TEXT_TYPE = CL_TYPENO,

-    CL_UNKNOWN_DATA_TYPE,

-    CL_DOSEXE,

-    CL_DATAFILE,

-    CL_TARFILE,

-    CL_GZFILE,

-    CL_ZIPFILE,

-    CL_BZFILE,

-    CL_RARFILE,

-    CL_MSCFILE,

-    CL_OLE2FILE,

-    CL_MSCABFILE,

-    CL_MSCHMFILE,

-    CL_SCRENC,

+    CL_TYPE_UNKNOWN_TEXT = CL_TYPENO,

+    CL_TYPE_UNKNOWN_DATA,

+    CL_TYPE_MSEXE,

+    CL_TYPE_DATA,

+    CL_TYPE_TAR,

+    CL_TYPE_GZ,

+    CL_TYPE_ZIP,

+    CL_TYPE_BZ,

+    CL_TYPE_RAR,

+    CL_TYPE_MSSZDD,

+    CL_TYPE_MSOLE2,

+    CL_TYPE_MSCAB,

+    CL_TYPE_MSCHM,

+    CL_TYPE_SCRENC,

     /* bigger numbers have higher priority (in o-t-f detection) */

-    CL_HTMLFILE, /* on the fly */

-    CL_MAILFILE  /* magic + on the fly */

+    CL_TYPE_HTML, /* on the fly */

+    CL_TYPE_MAIL  /* magic + on the fly */

 } cli_file_t;

@@ -17,6 +17,9 @@

  *

  * Change History:

  * $Log: mbox.c,v $

+ * Revision 1.117  2004/09/13 16:44:01  kojm

+ * minor cleanup

+ *

  * Revision 1.116  2004/09/13 13:16:28  nigelhorne

  * Return CL_EFORMAT on bad format

  *

@@ -336,7 +339,7 @@

  * Compilable under SCO; removed duplicate code with message.c

  *

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.116 2004/09/13 13:16:28 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.117 2004/09/13 16:44:01 kojm Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -1395,7 +1398,7 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 									addAttachment = TRUE;

 								}

 							} else {

-								if(options&CL_MAILURL)

+								if(options&CL_SCAN_MAILURL)

 									if(tableFind(subtypeTable, cptr) == HTML)

 										checkURLs(aMessage, dir);

 								messageAddArgument(aMessage, "filename=textportion");

@@ -17,6 +17,9 @@

  *

  * Change History:

  * $Log: message.c,v $

+ * Revision 1.77  2004/09/13 16:44:01  kojm

+ * minor cleanup

+ *

  * Revision 1.76  2004/09/03 15:59:00  nigelhorne

  * Handle boundary= "foo"

  *

@@ -225,7 +228,7 @@

  * uuencodebegin() no longer static

  *

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.76 2004/09/03 15:59:00 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.77 2004/09/13 16:44:01 kojm Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -939,7 +942,7 @@ messageIsEncoding(message *m)

 	   (strstr(line, "7bit") == NULL))

 		m->encoding = m->body_last;

 	else if(/*(m->bounce == NULL) &&*/

-		(cli_filetype(line, strlen(line)) == CL_MAILFILE))

+		(cli_filetype(line, strlen(line)) == CL_TYPE_MAIL))

 			m->bounce = m->body_last;

 	else if((m->binhex == NULL) &&

 		(strncasecmp(line, binhex, sizeof(binhex) - 1) == 0))

@@ -1574,7 +1577,7 @@ bounceBegin(const message *m)

 	const text *t_line;

 	for(t_line = messageGetBody(m); t_line; t_line = t_line->t_next)

-		if(cli_filetype(t_line->t_text, strlen(t_line->t_text)) == CL_MAILFILE)

+		if(cli_filetype(t_line->t_text, strlen(t_line->t_text)) == CL_TYPE_MAIL)

 			return t_line;

 	return NULL;

@@ -46,7 +46,7 @@

 #define IMAGE_NT_SIGNATURE	    0x00004550

 #define IMAGE_OPTIONAL_SIGNATURE    0x010b

-#define DETECT_BROKEN		    (options & CL_BROKEN)

+#define DETECT_BROKEN		    (options & CL_SCAN_BROKEN)

 #define UPX_NRV2B "\x11\xdb\x11\xc9\x01\xdb\x75\x07\x8b\x1e\x83\xee\xfc\x11\xdb\x11\xc9\x11\xc9\x75\x20\x41\x01\xdb"

 #define UPX_NRV2D "\x83\xf0\xff\x74\x78\xd1\xf8\x89\xc5\xeb\x0b\x01\xdb\x75\x07\x8b\x1e\x83\xee\xfc\x11\xdb\x11\xc9"

@@ -141,7 +141,7 @@ static int cli_ddump(int desc, int offset, int size, const char *file)

     return 0;

 }

-int cli_scanpe(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+int cli_scanpe(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	uint16_t e_magic; /* DOS signature ("MZ") */

 	uint16_t nsections;

@@ -100,7 +100,7 @@ struct cli_pe_info {

     struct SECTION *section;

 };

-int cli_scanpe(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec);

+int cli_scanpe(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec);

 int cli_peheader(int desc, struct cli_pe_info **peinfo);

@@ -383,7 +383,7 @@ int cli_parse_add(struct cl_node *root, const char *virname, const char *hexsig,

     return 0;

 }

-static int cli_loaddb(FILE *fd, struct cl_node **root, int *virnum)

+static int cli_loaddb(FILE *fd, struct cl_node **root, unsigned int *signo)

 {

 	char buffer[FILEBUFF], *pt, *start;

 	int line = 0, ret = 0;

@@ -448,13 +448,13 @@ static int cli_loaddb(FILE *fd, struct cl_node **root, int *virnum)

 	return ret;

     }

-    if(virnum)

-	*virnum += line;

+    if(signo)

+	*signo += line;

     return 0;

 }

-static int cli_loadhdb(FILE *fd, struct cl_node **root, int *virnum)

+static int cli_loadhdb(FILE *fd, struct cl_node **root, unsigned int *signo)

 {

 	char buffer[FILEBUFF], *pt;

 	int line = 0, ret = 0;

@@ -535,13 +535,13 @@ static int cli_loadhdb(FILE *fd, struct cl_node **root, int *virnum)

 	return ret;

     }

-    if(virnum)

-	*virnum += line;

+    if(signo)

+	*signo += line;

     return 0;

 }

-int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

+int cl_loaddb(const char *filename, struct cl_node **root, unsigned int *signo)

 {

 	FILE *fd;

 	int ret;

@@ -555,17 +555,17 @@ int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

     cli_dbgmsg("Loading %s\n", filename);

     if(cli_strbcasestr(filename, ".db")  || cli_strbcasestr(filename, ".db2") || cli_strbcasestr(filename, ".db3")) {

-	ret = cli_loaddb(fd, root, virnum);

+	ret = cli_loaddb(fd, root, signo);

     } else if(cli_strbcasestr(filename, ".cvd")) {

-	ret = cli_cvdload(fd, root, virnum);

+	ret = cli_cvdload(fd, root, signo);

     } else if(cli_strbcasestr(filename, ".hdb")) {

-	ret = cli_loadhdb(fd, root, virnum);

+	ret = cli_loadhdb(fd, root, signo);

     } else {

 	cli_dbgmsg("cl_loaddb: unknown extension - assuming old database format\n");

-	ret = cli_loaddb(fd, root, virnum);

+	ret = cli_loaddb(fd, root, signo);

     }

     if(ret)

@@ -575,7 +575,7 @@ int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

     return ret;

 }

-int cl_loaddbdir(const char *dirname, struct cl_node **root, int *virnum)

+int cl_loaddbdir(const char *dirname, struct cl_node **root, unsigned int *signo)

 {

 	DIR *dd;

 	struct dirent *dent;

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

 		    return CL_EMEM;

 		}

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

-		if((ret = cl_loaddb(dbfile, root, virnum))) {

+		if((ret = cl_loaddb(dbfile, root, signo))) {

 		    cli_dbgmsg("cl_loaddbdir(): error loading database %s\n", dbfile);

 		    free(dbfile);

 		    closedir(dd);

@@ -76,18 +76,18 @@ extern int cli_mbox(const char *dir, int desc, unsigned int options); /* FIXME *

 #include <bzlib.h>

 #endif

-#define SCAN_ARCHIVE	    (options & CL_ARCHIVE)

-#define SCAN_MAIL	    (options & CL_MAIL)

-#define SCAN_OLE2	    (options & CL_OLE2)

-#define SCAN_HTML	    (options & CL_HTML)

-#define SCAN_PE		    (options & CL_PE)

-#define DISABLE_RAR	    (options & CL_DISABLERAR)

-#define DETECT_ENCRYPTED    (options & CL_ENCRYPTED)

-#define BLOCKMAX	    (options & CL_BLOCKMAX)

+#define SCAN_ARCHIVE	    (options & CL_SCAN_ARCHIVE)

+#define SCAN_MAIL	    (options & CL_SCAN_MAIL)

+#define SCAN_OLE2	    (options & CL_SCAN_OLE2)

+#define SCAN_HTML	    (options & CL_SCAN_HTML)

+#define SCAN_PE		    (options & CL_SCAN_PE)

+#define DISABLE_RAR	    (options & CL_SCAN_DISABLERAR)

+#define DETECT_ENCRYPTED    (options & CL_SCAN_ENCRYPTED)

+#define BLOCKMAX	    (options & CL_SCAN_BLOCKMAX)

 #define MAX_MAIL_RECURSION  15

-static int cli_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec);

+static int cli_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec);

 #ifdef CL_THREAD_SAFE

@@ -98,7 +98,7 @@ static void cli_unlock_mutex(void *mtx)

 }

 #endif

-static int cli_scanrar(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int cli_scanrar(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	FILE *tmp = NULL;

 	int files = 0, fd, ret = CL_CLEAN, afiles;

@@ -259,7 +259,7 @@ static int cli_scanrar(int desc, const char **virname, long int *scanned, const

 }

 #ifdef HAVE_ZLIB_H

-static int cli_scanzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int cli_scanzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	ZZIP_DIR *zdir;

 	ZZIP_DIRENT zdirent;

@@ -423,7 +423,7 @@ static int cli_scanzip(int desc, const char **virname, long int *scanned, const

     return ret;

 }

-static int cli_scangzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int cli_scangzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	int fd, bytes, ret = CL_CLEAN;

 	long int size = 0;

@@ -499,7 +499,7 @@ static int cli_scangzip(int desc, const char **virname, long int *scanned, const

 #define BZ2_bzRead bzRead

 #endif

-static int cli_scanbzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int cli_scanbzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	int fd, bytes, ret = CL_CLEAN, bzerror = 0;

 	short memlim = 0;

@@ -580,7 +580,7 @@ static int cli_scanbzip(int desc, const char **virname, long int *scanned, const

 }

 #endif

-static int cli_scanmscomp(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int cli_scanszdd(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	int fd, ret = CL_CLEAN;

 	FILE *tmp = NULL, *in;

@@ -623,7 +623,7 @@ static int cli_scanmscomp(int desc, const char **virname, long int *scanned, con

     return ret;

 }

-static int cli_scanmscab(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int cli_scanmscab(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	struct mscab_decompressor *cabd = NULL;

 	struct mscabd_cabinet *base, *cab;

@@ -678,7 +678,7 @@ static int cli_scanmscab(int desc, const char **virname, long int *scanned, cons

     return ret;

 }

-static int cli_scanhtml(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int cli_scanhtml(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	char *tempname, fullname[1024];

 	const char *tmpdir;

@@ -734,7 +734,7 @@ static int cli_scanhtml(int desc, const char **virname, long int *scanned, const

     return ret;

 }

-static int  cli_scan_mydoom_log(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int  cli_scan_mydoom_log(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	int32_t record[8], check;

 	int i, retval=CL_VIRUS, j;

@@ -771,7 +771,7 @@ static int  cli_scan_mydoom_log(int desc, const char **virname, long int *scanne

     return retval;

 }

-static int cli_scandir(const char *dirname, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int cli_scandir(const char *dirname, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	DIR *dd;

 	struct dirent *dent;

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

     return 0;

 }

-static int cli_vba_scandir(const char *dirname, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int cli_vba_scandir(const char *dirname, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	int ret = CL_CLEAN, i, fd, data_len;

 	vba_project_t *vba_project;

@@ -947,7 +947,7 @@ static int cli_vba_scandir(const char *dirname, const char **virname, long int *

     return ret;

 }

-static int cli_scanole2(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int cli_scanole2(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	const char *tmpdir;

 	char *dir;

@@ -988,7 +988,7 @@ static int cli_scanole2(int desc, const char **virname, long int *scanned, const

     return ret;

 }

-static int cli_scantar(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int cli_scantar(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	const char *tmpdir;

 	char *dir;

@@ -1023,7 +1023,7 @@ static int cli_scantar(int desc, const char **virname, long int *scanned, const

     return ret;

 }

-static int cli_scanmschm(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int cli_scanmschm(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	const char *tmpdir;

 	char *tempname;

@@ -1056,7 +1056,7 @@ static int cli_scanmschm(int desc, const char **virname, long int *scanned, cons

     return ret;

 }

-static int cli_scanscrenc(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int cli_scanscrenc(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	const char *tmpdir;

 	char *tempname;

@@ -1087,7 +1087,7 @@ static int cli_scanscrenc(int desc, const char **virname, long int *scanned, con

     free(tempname);

     return ret;

 }

-static int cli_scanmail(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+static int cli_scanmail(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	const char *tmpdir;

 	char *dir;

@@ -1124,7 +1124,7 @@ static int cli_scanmail(int desc, const char **virname, long int *scanned, const

 	return ret;

 }

-int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

+int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, int *arec, int *mrec)

 {

 	char magic[MAGIC_BUFFER_SIZE + 1];

 	int ret = CL_CLEAN, nret;

@@ -1172,74 +1172,74 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

     lseek(desc, 0, SEEK_SET);

     type = cli_filetype(magic, bread);

-    type == CL_MAILFILE ? (*mrec)++ : (*arec)++;

+    type == CL_TYPE_MAIL ? (*mrec)++ : (*arec)++;

     switch(type) {

-	case CL_RARFILE: