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

+Sun Feb 11 01:38:26 CET 2007 (tk)

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

+  * remove part of warnings from gcc, patch from Edwin

+

 Sat Feb 10 18:44:52 CET 2007 (tk)

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

   * clamdscan/client.c: fix "clamdcan /" mode, reported by Luca

@@ -32,7 +32,7 @@

 #define _GNU_SOURCE

 #include "getopt.h"

-void printopt(const struct cfgoption *opt, const struct cfgstruct *cpt)

+static void printopt(const struct cfgoption *opt, const struct cfgstruct *cpt)

 {

     if(!cpt->enabled) {

 	printf("%s not set\n", opt->name);

@@ -65,7 +65,7 @@ void printopt(const struct cfgoption *opt, const struct cfgstruct *cpt)

     }

 }

-void printcfg(const char *cfgfile)

+static void printcfg(const char *cfgfile)

 {

 	const struct cfgoption *opt;

 	const struct cfgstruct *cpt;

@@ -167,7 +167,7 @@ void printcfg(const char *cfgfile)

     freecfg(cfg);

 }

-void help(void)

+static void help(void)

 {

     printf("\n");

     printf("             Clam AntiVirus: Configuration Tool "VERSION"\n");

@@ -70,7 +70,7 @@

 short debug_mode = 0, logok = 0;

 short foreground = 0;

-void help(void)

+static void help(void)

 {

     printf("\n");

     printf("                      Clam AntiVirus Daemon "VERSION"\n");

@@ -42,7 +42,7 @@

 struct dazuko_access *acc;

-void clamuko_exit(int sig)

+static void clamuko_exit(int sig)

 {

     logg("*Clamuko: clamuko_exit(), signal %d\n", sig);

@@ -40,6 +40,7 @@

 #include "others.h"

 #include "server.h"

 #include "output.h"

+#include "localserver.h"

 #ifdef        C_WINDOWS

 int localserver(const struct cfgstruct *copt)

@@ -50,10 +50,10 @@

 #include <sys/ioctl.h>

 #endif

-#if HAVE_SYS_TYPES_H

+#ifdef HAVE_SYS_TYPES_H

 #include <sys/types.h>

 #endif

-#if HAVE_SYS_FILIO_H

+#ifdef HAVE_SYS_FILIO_H

 #include <sys/filio.h>

 #endif

 #ifdef HAVE_SYS_UIO_H

@@ -83,7 +83,7 @@ typedef struct client_conn_tag {

     int nsockets;

 } client_conn_t;

-void scanner_thread(void *arg)

+static void scanner_thread(void *arg)

 {

 	client_conn_t *conn = (client_conn_t *) arg;

 #ifndef	C_WINDOWS

@@ -71,7 +71,7 @@ struct multi_tag {

     const struct cl_limits *limits;

 };

-void multiscanfile(void *arg)

+static void multiscanfile(void *arg)

 {

 	struct multi_tag *tag = (struct multi_tag *) arg;

 	const char *virname;

@@ -50,6 +50,7 @@

 #include "others.h"

 #include "server.h"

+#include "tcpserver.h"

 int tcpserver(const struct cfgstruct *copt)

 {

@@ -195,7 +195,7 @@ threadpool_t *thrmgr_new(int max_threads, int idle_timeout, void (*handler)(void

 	return threadpool;

 }

-void *thrmgr_worker(void *arg)

+static void *thrmgr_worker(void *arg)

 {

 	threadpool_t *threadpool = (threadpool_t *) arg;

 	void *job_data;

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

 	struct timezone tz;

 	time_t starttime;

 	struct optstruct *opt;

-	char *clamdscan_accepted[] = { "help", "version", "verbose", "quiet",

+	const char *clamdscan_accepted[] = { "help", "version", "verbose", "quiet",

 				  "stdout", "log", "move", "copy", "remove",

 				  "config-file", "no-summary",

 				  "disable-summary", "multiscan", NULL };

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

 #include "output.h"

 #include "misc.h"

 #include "str.h"

+#include "client.h"

 #ifdef PF_INET

 # define SOCKET_INET	PF_INET

@@ -515,7 +515,7 @@ static void move_infected(const char *filename, const struct optstruct *opt)

     }

     if(!(tmp = strrchr(filename, '/')))

-	tmp = (char *) filename;

+	tmp = (const char *) filename;

     movefilename_size = sizeof(char) * (strlen(movedir) + strlen(tmp) + sizeof(numext) + 2);

@@ -28,6 +28,7 @@

 #include <errno.h>

 #include "shared/output.h"

+#include "execute.h"

 #define MAX_CHILDREN 5

@@ -115,7 +115,7 @@ static void writepid(char *pidfile)

     umask(old_umask);

 }

-void help(void)

+static void help(void)

 {

     mprintf_stdout = 1;

@@ -150,7 +150,7 @@ void help(void)

     mprintf("\n");

 }

-int download(const struct cfgstruct *copt, const struct optstruct *opt, const char *datadir)

+static int download(const struct cfgstruct *copt, const struct optstruct *opt, const char *datadir)

 {

 	int ret = 0, try = 0, maxattempts = 0;

 	struct cfgstruct *cpt;

@@ -205,7 +205,7 @@ int download(const struct cfgstruct *copt, const struct optstruct *opt, const ch

 int main(int argc, char **argv)

 {

 	int ret = 52;

-	char *newdir, *cfgfile;

+	const char *newdir, *cfgfile;

 	char *pidfile = NULL;

 	struct cfgstruct *copt, *cpt;

 #ifndef	C_WINDOWS

@@ -93,7 +93,7 @@ static int wwwconnect(const char *server, const char *proxy, int pport, char *ip

     if(localip) {

 	if((he = gethostbyname(localip)) == NULL) {

-	    char *herr;

+	    const char *herr;

 	    switch(h_errno) {

 	        case HOST_NOT_FOUND:

 		    herr = "Host not found";

@@ -156,7 +156,7 @@ static int wwwconnect(const char *server, const char *proxy, int pport, char *ip

     }

     if((host = gethostbyname(hostpt)) == NULL) {

-	char *herr;

+	const char *herr;

 	switch(h_errno) {

 	    case HOST_NOT_FOUND:

 		herr = "Host not found";

@@ -35,6 +35,7 @@

 #include "shared/cfgparser.h"

 #include "shared/output.h"

+#include "notify.h"

 int notify(const char *cfgfile)

 {

@@ -97,7 +97,7 @@ struct cab_block_hdr

     uint16_t	cbUncomp;   /* number of uncompressed bytes */

 };

-char *cab_readstr(int fd, int *ret)

+static char *cab_readstr(int fd, int *ret)

 {

 	int i, bread, found = 0;

 	char buff[256], *str;

@@ -136,7 +136,7 @@ char *cab_readstr(int fd, int *ret)

     return str;

 }

-int cab_chkname(const char *name)

+static int cab_chkname(const char *name)

 {

 	size_t i, len = strlen(name);

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

 #include "others.h"

 #include "mspack.h"

 #include "cltypes.h"

+#include "chmunpack.h"

 #ifndef HAVE_ATTRIB_PACKED

 #define __attribute__(x)

@@ -155,7 +156,7 @@ typedef struct lzx_content_tag {

 #define chm_endian_convert_64(x) le64_to_host(x)

 /* Read in a block of data from either the mmap area or the given fd */

-int chm_read_data(int fd, unsigned char *dest, off_t offset, off_t len,

+static int chm_read_data(int fd, unsigned char *dest, off_t offset, off_t len,

 			unsigned char *m_area, off_t m_length)

 {

 	if ((offset < 0) || (len < 0) || ((offset+len) < 0)) {

@@ -177,7 +178,7 @@ int chm_read_data(int fd, unsigned char *dest, off_t offset, off_t len,

 	return TRUE;

 }

-uint64_t chm_copy_file_data(int ifd, int ofd, uint64_t len)

+static uint64_t chm_copy_file_data(int ifd, int ofd, uint64_t len)

 {

 	unsigned char data[8192];

 	uint64_t count, rem;

@@ -359,7 +359,7 @@ int cli_cvdload(FILE *fs, struct cl_engine **engine, unsigned int *signo, short

         char *dir;

 	struct cl_cvd cvd;

 	int ret, fd;

-	time_t stime;

+	time_t s_time;

     cli_dbgmsg("in cli_cvdload()\n");

@@ -370,8 +370,8 @@ int cli_cvdload(FILE *fs, struct cl_engine **engine, unsigned int *signo, short

 	return ret;

     if(cvd.stime && warn) {

-	time(&stime);

-	if((int) stime - cvd.stime > 604800) {

+	time(&s_time);

+	if((int) s_time - cvd.stime > 604800) {

 	    cli_warnmsg("**************************************************\n");

 	    cli_warnmsg("***  The virus database is older than 7 days.  ***\n");

 	    cli_warnmsg("***        Please update it IMMEDIATELY!       ***\n");

@@ -297,10 +297,10 @@ cli_file_t cli_filetype2(int desc, const struct cl_engine *engine)

 			if(cli_ac_initdata(&mdata, root->ac_partsigs, AC_DEFAULT_TRACKLEN))

 			    return ret;

-			decoded = (char*) encoding_norm_readline(&conv, NULL, &area, bread);

+			decoded =  encoding_norm_readline(&conv, NULL, &area, bread);

 			if(decoded) {

-			    sret = cli_ac_scanbuff(decoded, strlen(decoded), NULL, engine->root[0], &mdata, 1, 0, 0, -1, NULL);

+			    sret = cli_ac_scanbuff(decoded, strlen((const char *) decoded), NULL, engine->root[0], &mdata, 1, 0, 0, -1, NULL);

 			    free(decoded);

 			    if(sret == CL_TYPE_HTML) {

 				ret = CL_TYPE_HTML;

@@ -43,7 +43,7 @@

 #include "rebuildpe.h"

 #include "others.h"

 #include "packlibs.h"

-

+#include "fsg.h"

 int unfsg_200(char *source, char *dest, int ssize, int dsize, uint32_t rva, uint32_t base, uint32_t ep, int file) {

   char *tsrc;

@@ -83,13 +83,13 @@ typedef enum {

     HTML_RFC2397_DATA,

     HTML_RFC2397_FINISH,

     HTML_RFC2397_ESC,

-    HTML_ESCAPE_CHAR,

+    HTML_ESCAPE_CHAR

 } html_state;

 typedef enum {

     SINGLE_QUOTED,

     DOUBLE_QUOTED,

-    NOT_QUOTED,

+    NOT_QUOTED

 } quoted_state;

@@ -257,7 +257,7 @@ static void html_output_c(file_buff_t *fbuff1, file_buff_t *fbuff2, unsigned cha

 	}

 }

-static void html_output_str(file_buff_t *fbuff, unsigned char *str, int len)

+static void html_output_str(file_buff_t *fbuff, const unsigned char *str, int len)

 {

 	if (fbuff) {

 		if ((fbuff->length + len) >= HTML_FILE_BUFF_LEN) {

@@ -273,7 +273,7 @@ static void html_output_str(file_buff_t *fbuff, unsigned char *str, int len)

 	}

 }

-static char *html_tag_arg_value(tag_arguments_t *tags, char *tag)

+static char *html_tag_arg_value(tag_arguments_t *tags, const char *tag)

 {

 	int i;

@@ -285,7 +285,7 @@ static char *html_tag_arg_value(tag_arguments_t *tags, char *tag)

 	return NULL;

 }

-static void html_tag_arg_set(tag_arguments_t *tags, char *tag, char *value)

+static void html_tag_arg_set(tag_arguments_t *tags, const char *tag, const char *value)

 {

 	int i;

@@ -299,7 +299,7 @@ static void html_tag_arg_set(tag_arguments_t *tags, char *tag, char *value)

 	return;

 }

 static void html_tag_arg_add(tag_arguments_t *tags,

-		unsigned char *tag, unsigned char *value)

+		const unsigned char *tag, unsigned char *value)

 {

 	int len, i;

 	tags->count++;

@@ -614,6 +614,9 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag

 				continue;

 			}

 			switch (state) {

+			case HTML_SPECIAL_CHAR:

+				cli_dbgmsg("Impossible, special_char can't occur here\n");

+				break;

 			case HTML_BAD_STATE:

 				/* An engine error has occurred */

 				cli_dbgmsg("HTML Engine Error\n");

@@ -962,25 +965,24 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag

 					const unsigned char* http_equiv = html_tag_arg_value(&tag_args, "http-equiv");

 					const unsigned char* http_content = html_tag_arg_value(&tag_args, "content");

 					if(http_equiv && http_content && strcasecmp(http_equiv,"content-type") == 0) {

-						const size_t len = strlen((const char*)http_content);

+						size_t len = strlen((const char*)http_content);

 						unsigned char* http_content2 = cli_malloc( len + 1);

 						unsigned char* charset;

 						size_t i;

 						if(!http_content2)

 							return CL_EMEM;

-						for(i = 0; i < strlen((const char*)http_content); i++)

+						for(i = 0; i < len; i++)

 							http_content2[i] = tolower(http_content[i]);

 						http_content2[len] = '\0';

 						charset = (unsigned char*) strstr((char*)http_content2,"charset");

 						if(charset) {							

-							size_t length;

 							while(*charset && *charset != '=')

 								charset++;

 							charset++;/* skip = */

-							length = strcspn((const char*)charset," \"'");

-							charset[length] = '\0';

-							if(length)

+							len = strcspn((const char*)charset," \"'");

+							charset[len] = '\0';

+							if(len)

 								process_encoding_set(&conv, charset, META);

 						}

 						free(http_content2);

@@ -5,7 +5,7 @@

  *

  * Created 25 August 1985 by John Gilmore, ihnp4!hoptoad!gnu.

  *

- * $Id: is_tar.h,v 1.1 2005/03/22 21:26:25 kojm Exp $ # checkin only

+ * $Id: is_tar.h,v 1.2 2007/02/11 00:41:13 tkojm Exp $ # checkin only

  */

 /*

@@ -43,3 +43,5 @@ union record {

 /* The magic field is filled with this if uname and gname are valid. */

 #define	TMAGIC		"ustar  "	/* 7 chars and a null */

+

+int is_tar(unsigned char *buf, unsigned int nbytes);

@@ -54,6 +54,7 @@

 #include "clamav.h"

 #include "others.h"

+#include "lockdb.h"

 #ifdef CL_THREAD_SAFE

 #include <pthread.h>

@@ -49,16 +49,16 @@

  */

 #if defined(__i386__) || defined(__x86_64__) || defined(__vax__)

 #define SET(n) \

-	(*(MD5_u32plus *)&ptr[(n) * 4])

+	(*(const MD5_u32plus *)&ptr[(n) * 4])

 #define GET(n) \

 	SET(n)

 #else

 #define SET(n) \

 	(ctx->block[(n)] = \

-	(MD5_u32plus)ptr[(n) * 4] | \

-	((MD5_u32plus)ptr[(n) * 4 + 1] << 8) | \

-	((MD5_u32plus)ptr[(n) * 4 + 2] << 16) | \

-	((MD5_u32plus)ptr[(n) * 4 + 3] << 24))

+	(const MD5_u32plus)ptr[(n) * 4] | \

+	(const (MD5_u32plus)ptr[(n) * 4 + 1] << 8) | \

+	(const (MD5_u32plus)ptr[(n) * 4 + 2] << 16) | \

+	(const (MD5_u32plus)ptr[(n) * 4 + 3] << 24))

 #define GET(n) \

 	(ctx->block[(n)])

 #endif

@@ -67,9 +67,9 @@

  * This processes one or more 64-byte data blocks, but does NOT update

  * the bit counters.  There are no alignment requirements.

  */

-static void *body(MD5_CTX *ctx, void *data, unsigned long size)

+static const void *body(MD5_CTX *ctx, const void *data, unsigned long size)

 {

-	unsigned char *ptr;

+	const unsigned char *ptr;

 	MD5_u32plus a, b, c, d;

 	MD5_u32plus saved_a, saved_b, saved_c, saved_d;

@@ -185,7 +185,7 @@ void MD5_Init(MD5_CTX *ctx)

 	ctx->hi = 0;

 }

-void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)

+void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size)

 {

 	MD5_u32plus saved_lo;

 	unsigned long used, free;

@@ -206,7 +206,7 @@ void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)

 		}

 		memcpy(&ctx->buffer[used], data, free);

-		data = (unsigned char *)data + free;

+		data = (const unsigned char *)data + free;

 		size -= free;

 		body(ctx, ctx->buffer, 64);

 	}

@@ -22,7 +22,7 @@ typedef struct {

 } MD5_CTX;

 extern void MD5_Init(MD5_CTX *ctx);

-extern void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size);

+extern void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size);

 extern void MD5_Final(unsigned char *result, MD5_CTX *ctx);

 #endif

@@ -63,7 +63,7 @@

 /* northfox does this shitty way,

  * this should be done with just a bswap

  */

-char *lzma_bswap_4861dc(struct lzmastate *p, char *old_edx)

+static char *lzma_bswap_4861dc(struct lzmastate *p, char *old_edx)

 {

 	/* dumb_dump_start

 	 *

@@ -98,7 +98,7 @@ char *lzma_bswap_4861dc(struct lzmastate *p, char *old_edx)

 	return p->p0;

 }

-uint32_t lzma_486248 (struct lzmastate *p, char **old_ecx, char *src, uint32_t size)

+static uint32_t lzma_486248 (struct lzmastate *p, char **old_ecx, char *src, uint32_t size)

 {

 	uint32_t loc_esi, loc_edi, loc_eax, loc_ecx, ret;

 	if (!CLI_ISCONTAINED(src, size, *old_ecx, 4) || !CLI_ISCONTAINED(src, size, p->p0, 1))

@@ -151,7 +151,7 @@ uint32_t lzma_486248 (struct lzmastate *p, char **old_ecx, char *src, uint32_t s

 }

-uint32_t lzma_48635C(uint8_t znaczek, char **old_ecx, struct lzmastate *p, uint32_t *retval, char *src, uint32_t size)

+static uint32_t lzma_48635C(uint8_t znaczek, char **old_ecx, struct lzmastate *p, uint32_t *retval, char *src, uint32_t size)

 {

 	uint32_t loc_esi = (znaczek&0xff) >> 7, /* msb */

 		loc_ebx, ret;

@@ -195,7 +195,7 @@ uint32_t lzma_48635C(uint8_t znaczek, char **old_ecx, struct lzmastate *p, uint3

 	return 0;

 }

-uint32_t lzma_4862e0 (struct lzmastate *p, char **old_ecx, uint32_t *old_edx, uint32_t *retval, char *src, uint32_t size)

+static uint32_t lzma_4862e0 (struct lzmastate *p, char **old_ecx, uint32_t *old_edx, uint32_t *retval, char *src, uint32_t size)

 {

 	uint32_t loc_ebx, loc_esi, stack_ecx, ret;

 	char *loc_edi;

@@ -228,7 +228,7 @@ uint32_t lzma_4862e0 (struct lzmastate *p, char **old_ecx, uint32_t *old_edx, ui

 }

 /* old_edx - write only */

-uint32_t lzma_4863da (uint32_t var0, struct lzmastate *p, char  **old_ecx, uint32_t *old_edx, uint32_t *retval, char *src, uint32_t size)

+static uint32_t lzma_4863da (uint32_t var0, struct lzmastate *p, char  **old_ecx, uint32_t *old_edx, uint32_t *retval, char *src, uint32_t size)

 {

 	uint32_t ret;

 	char *loc_esi = *old_ecx;

@@ -270,7 +270,7 @@ uint32_t lzma_4863da (uint32_t var0, struct lzmastate *p, char  **old_ecx, uint3

 	return 0;

 }

-uint32_t lzma_486204 (struct lzmastate *p, uint32_t old_edx, uint32_t *retval, char *src, uint32_t size)

+static uint32_t lzma_486204 (struct lzmastate *p, uint32_t old_edx, uint32_t *retval, char *src, uint32_t size)

 {

 	uint32_t loc_esi, loc_edi, loc_ebx, loc_eax;

 	char *loc_edx;

@@ -310,7 +310,7 @@ uint32_t lzma_486204 (struct lzmastate *p, uint32_t old_edx, uint32_t *retval, c

 	return 0;

 }

-uint32_t lzma_48631a (struct lzmastate *p, char **old_ecx, uint32_t *old_edx, uint32_t *retval, char *src, uint32_t size)

+static uint32_t lzma_48631a (struct lzmastate *p, char **old_ecx, uint32_t *old_edx, uint32_t *retval, char *src, uint32_t size)

 {

 	uint32_t copy1, copy2;

 	uint32_t loc_esi, loc_edi, ret;

@@ -308,7 +308,7 @@ static char *cli_md5buff(const char *buffer, unsigned int len, unsigned char *di

     MD5_Init(&ctx);

-    MD5_Update(&ctx, (unsigned char *) buffer, len);

+    MD5_Update(&ctx, (const unsigned char *) buffer, len);

     MD5_Final(digest, &ctx);

     if(dig)

@@ -791,7 +791,7 @@ int32_t cli_readint32(const char *buff)

 	int32_t ret;

 #if WORDS_BIGENDIAN == 0

-    ret = *(int32_t *) buff;

+    ret = *(const int32_t *) buff;

 #else

     ret = buff[0] & 0xff;

     ret |= (buff[1] & 0xff) << 8;

@@ -25,6 +25,7 @@

 #include "others.h"

 #include "execs.h"

 #include "pe.h"

+#include "packlibs.h"

 static int doubledl(char **scur, uint8_t *mydlptr, char *buffer, uint32_t buffersize)

 {

@@ -56,6 +56,7 @@

 #include "rebuildpe.h"

 #include "execs.h"

 #include "others.h"

+#include "petite.h"

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

@@ -19,6 +19,9 @@

  *  MA 02110-1301, USA.

  *

  *  $Log: phishcheck.c,v $

+ *  Revision 1.21  2007/02/11 00:41:13  tkojm

+ *  remove some gcc warnings

+ *

  *  Revision 1.20  2007/01/30 18:29:21  tkojm

  *  fix some includes

  *

@@ -296,6 +299,12 @@ static const char adonet[] = "ado.net";

 static const char aspnet[] = "asp.net";

 static const char lt[]="<";

 static const char gt[]=">";

+static const char cid[] = "cid:";

+static const char src_text[] = "src";

+static const char href_text[] = "href";

+static const size_t href_text_len = sizeof(href_text);

+static const size_t src_text_len = sizeof(src_text);

+static const size_t cid_len = sizeof(cid)-1;

 static const size_t dotnet_len = sizeof(dotnet)-1;

 static const size_t adonet_len = sizeof(adonet)-1;

 static const size_t aspnet_len = sizeof(aspnet)-1;

@@ -385,8 +394,11 @@ static	inline	void string_init_c(struct string* dest,char* data);

 static	void	string_assign_null(struct string* dest);

 static	char	*rfind(char *start, char c, size_t len);

 static inline char hex2int(const unsigned char* src);

+static int isTLD(const struct phishcheck* pchk,const char* str,int len);

+static enum phish_status phishingCheck(const struct cl_engine* engine,struct url_check* urls);

+static const char* phishing_ret_toString(enum phish_status rc);

-void url_check_init(struct url_check* urls)

+static void url_check_init(struct url_check* urls)

 {

 	urls->realLink.refcount=0;

 	urls->realLink.data=empty_string;

@@ -400,7 +412,7 @@ void url_check_init(struct url_check* urls)

  * so that: we don't have to keep in mind who allocated what, and when needs to be freed,

  * and thus we won't leak memory*/

-void string_free(struct string* str)

+static void string_free(struct string* str)

 {

 	for(;;){

 		str->refcount--;

@@ -418,7 +430,7 @@ void string_free(struct string* str)

 }

 /* always use the string_assign when assigning to a string, this makes sure the old one's refcount is decremented*/

-void string_assign(struct string* dest,struct string* src)

+static void string_assign(struct string* dest,struct string* src)

 {

 	string_free(dest);

 	src->refcount++;

@@ -428,15 +440,7 @@ void string_assign(struct string* dest,struct string* src)

 }

 /* data will be freed when string freed */

-void string_assign_c(struct string* dest,char* data)

-{

-	string_free(dest);

-	dest->data=data;

-	dest->ref=NULL;

-	dest->refcount=1;

-}

-

-/* same as above, but it doesn't free old string, use only for initialization

+/* it doesn't free old string, use only for initialization

  * Doesn't allow NULL pointers, they are replaced by pointer to empty string

  * */

 static inline void string_init_c(struct string* dest,char* data)

@@ -447,7 +451,7 @@ static inline void string_init_c(struct string* dest,char* data)

 }

 /* make a copy of the string between start -> end*/

-int string_assign_dup(struct string* dest,const char* start,const char* end)

+static int string_assign_dup(struct string* dest,const char* start,const char* end)

 {

 	char*	    ret  = cli_malloc(end-start+1);

 	if(!ret)

@@ -471,7 +475,7 @@ static inline void string_assign_null(struct string* dest)

 }

 /* this string uses portion of another string*/

-void string_assign_ref(struct string* dest,struct string* ref,char* data)

+static void string_assign_ref(struct string* dest,struct string* ref,char* data)

 {

 	string_free(dest);

 	ref->refcount++;

@@ -480,7 +484,7 @@ void string_assign_ref(struct string* dest,struct string* ref,char* data)

 	dest->ref=ref;

 }

-void free_if_needed(struct url_check* url)

+static void free_if_needed(struct url_check* url)

 {

 	string_free(&url->realLink);

 	string_free(&url->displayLink);

@@ -515,7 +519,7 @@ static int build_regex(regex_t* preg,const char* regex,int nosub)

 static const char* host_regex="cid:.+|mailto:(.+)|([[:alpha:]]+://)?(([^:/?]+@)+([^:/?]+)([:/?].+)?|([^@:/?]+)([:/?].+)?)"; <- this is slower than the function below

 */

 /* allocates memory */

-int get_host(const struct phishcheck* s,struct string* dest,const char* URL,int isReal,int* phishy)

+static int get_host(const struct phishcheck* s,struct string* dest,const char* URL,int isReal,int* phishy)

 {

 	const char mailto[] = "mailto:";

 	int rc,ismailto = 0;

@@ -595,12 +599,12 @@ int get_host(const struct phishcheck* s,struct string* dest,const char* URL,int

 	return 0;

 }

-int isCountryCode(const struct phishcheck* s,const char* str)

+static int isCountryCode(const struct phishcheck* s,const char* str)

 {

 	return str ? !regexec(&s->preg_cctld,str,0,NULL,0) : 0;

 }

-int isTLD(const struct phishcheck* pchk,const char* str,int len)

+static int isTLD(const struct phishcheck* pchk,const char* str,int len)

 {

 	if (!str)

 		return 0;

@@ -634,7 +638,7 @@ rfind(char *start, char c, size_t len)

 	return (p < start) ? NULL : p;

 }

-void get_domain(const struct phishcheck* pchk,struct string* dest,struct string* host)

+static void get_domain(const struct phishcheck* pchk,struct string* dest,struct string* host)

 {

 	char* domain;

 	char* tld = strrchr(host->data,'.');

@@ -702,7 +706,7 @@ void reverse_lookup(struct url_check* url,int isReal)

 	ip_reverse(url,isReal);

 }

 */

-int isNumeric(const char* host)

+static int isNumeric(const char* host)

 {

 	int len = strlen(host);

 	int a,b,c,d,n=0;

@@ -717,7 +721,7 @@ int isNumeric(const char* host)

 	return 0;

 }

-int isSSL(const char* URL)

+static int isSSL(const char* URL)

 {

 	const char https[]="https://";

 	return URL ? !strncmp(https,URL,sizeof(https)-1) : 0;

@@ -872,7 +876,7 @@ str_fixup_spaces(char **begin, const char **end)

 }

 /* allocates memory */

-int

+static int

 cleanupURL(struct string *URL, int isReal)

 {

 	char *begin = URL->data;

@@ -930,11 +934,6 @@ cleanupURL(struct string *URL, int isReal)

 	return 0;

 }

-void get_redirected_URL(struct string* URL)

-{

-	/*TODO: see if URL redirects sowhere, if so, then follow

-	returns redirected URL*/

-}

 /* ---- runtime disable ------*/

 void phish_disable(struct cl_engine* engine, const char* reason)

@@ -946,10 +945,6 @@ void phish_disable(struct cl_engine* engine, const char* reason)

 int phishingScan(message* m,const char* dir,cli_ctx* ctx,tag_arguments_t* hrefs)

 {

-	const char src_text[]="src";

-	const char href_text[]="href";

-	const size_t href_text_len = sizeof(href_text);

-	const size_t src_text_len = sizeof(src_text);

 	int i;

 	struct phishcheck* pchk = (struct phishcheck*) ctx->engine->phishcheck;

 	if(!pchk || pchk->is_disabled)

@@ -1171,12 +1166,12 @@ void phishing_done(struct cl_engine* engine)

  * Only those URLs are identified as URLs for which phishing detection can be performed.

  * This means that no attempt is made to properly recognize 'cid:' URLs

  */

-int isURL(const struct phishcheck* pchk,const char* URL)

+static int isURL(const struct phishcheck* pchk,const char* URL)

 {

 	return URL ? !regexec(&pchk->preg,URL,0,NULL,0) : 0;

 }

-int isNumericURL(const struct phishcheck* pchk,const char* URL)

+static int isNumericURL(const struct phishcheck* pchk,const char* URL)

 {

 	return URL ? !regexec(&pchk->preg_numeric,URL,0,NULL,0) : 0;

 }

@@ -1184,7 +1179,7 @@ int isNumericURL(const struct phishcheck* pchk,const char* URL)

 /* Cleans up @urls

  * If URLs are identical after cleanup it will return CL_PHISH_CLEANUP_OK.

  * */

-enum phish_status cleanupURLs(struct url_check* urls)

+static enum phish_status cleanupURLs(struct url_check* urls)

 {

 	if(urls->flags&CLEANUP_URL) {

 		cleanupURL(&urls->realLink,1);

@@ -1197,7 +1192,7 @@ enum phish_status cleanupURLs(struct url_check* urls)

 	return CL_PHISH_NODECISION;

 }

-int url_get_host(const struct phishcheck* pchk, struct url_check* url,struct url_check* host_url,int isReal,int* phishy)

+static int url_get_host(const struct phishcheck* pchk, struct url_check* url,struct url_check* host_url,int isReal,int* phishy)

 {

 	struct string* host = isReal ? &host_url->realLink : &host_url->displayLink;

 	get_host(pchk, host, isReal ? url->realLink.data : url->displayLink.data, isReal, phishy);

@@ -1224,14 +1219,14 @@ int url_get_host(const struct phishcheck* pchk, struct url_check* url,struct url

 	return CL_PHISH_NODECISION;

 }

-void url_get_domain(const struct phishcheck* pchk, struct url_check* url,struct url_check* domains)

+static void url_get_domain(const struct phishcheck* pchk, struct url_check* url,struct url_check* domains)

 {

 	get_domain(pchk, &domains->realLink, &url->realLink);

 	get_domain(pchk, &domains->displayLink, &url->displayLink);

 	domains->flags = url->flags;

 }

-enum phish_status phishy_map(int phishy,enum phish_status fallback)

+static enum phish_status phishy_map(int phishy,enum phish_status fallback)

 {

 	if(phishy&PHISHY_USERNAME_IN_URL)

 		return CL_PHISH_CLOAKED_UIU;

@@ -1241,7 +1236,7 @@ enum phish_status phishy_map(int phishy,enum phish_status fallback)

 		return fallback;

 }

-int isEncoded(const char* url)

+static int isEncoded(const char* url)

 {

 	const char* start=url;

 	size_t cnt=0;

@@ -1255,18 +1250,16 @@ int isEncoded(const char* url)

 	return (cnt-1 >strlen(url)*7/10);/*more than 70% made up of &#;*/

 }

-int whitelist_check(const struct cl_engine* engine,struct url_check* urls,int hostOnly)

+static int whitelist_check(const struct cl_engine* engine,struct url_check* urls,int hostOnly)

 {

 	return whitelist_match(engine,urls->realLink.data,urls->displayLink.data,hostOnly);

 }

 /* urls can't contain null pointer, caller must ensure this */

-enum phish_status phishingCheck(const struct cl_engine* engine,struct url_check* urls)

+static enum phish_status phishingCheck(const struct cl_engine* engine,struct url_check* urls)

 {

 	struct url_check host_url;

-	const char cid[] = "cid:";

-	const size_t cid_len = sizeof(cid)-1;

 	enum phish_status rc=CL_PHISH_NODECISION;

 	int phishy=0;

 	const struct phishcheck* pchk = (const struct phishcheck*) engine->phishcheck;

@@ -1463,7 +1456,7 @@ enum phish_status phishingCheck(const struct cl_engine* engine,struct url_check*

 	return phishy_map(phishy,CL_PHISH_NOMATCH);

 }

-const char* phishing_ret_toString(enum phish_status rc)

+static const char* phishing_ret_toString(enum phish_status rc)

 {

 	switch(rc) {

 		case CL_PHISH_CLEAN:

@@ -76,34 +76,9 @@ struct url_check {

 	unsigned short       link_type;

 };

+#ifdef _MESSAGE_H

 int phishingScan(message* m,const char* dir,cli_ctx* ctx,tag_arguments_t* hrefs);

-enum phish_status phishingCheck(const struct cl_engine* engine,struct url_check* urls);

-

-int whitelist_check(const struct cl_engine* engine,struct url_check* urls,int hostOnly);

-void url_check_init(struct url_check* urls);

-void string_free(struct string* str);

-void string_assign(struct string* dest,struct string* src);

-void string_assign_c(struct string* dest,char* data);

-int string_assign_dup(struct string* dest,const char* start,const char* end);

-void string_assign_ref(struct string* dest,struct string* ref,char* data);

-void free_if_needed(struct url_check* url);

-int get_host(const struct phishcheck* pchk,struct string* dest,const char* URL,int isReal,int* phishy);

-int isCountryCode(const struct phishcheck* s,const char* str);

-int isTLD(const struct phishcheck* s,const char* str,int len);

-void get_domain(const struct phishcheck* pchk,struct string* dest,struct string* host);