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

+Sat Jan 15 18:33:41 CET 2005 (tk)

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

+  * libclamav/str.c: cli_memstr: return needle address

+

 Fri Jan 14 16:12:21 GMT 2005 (trog)

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

   * libclamav/filetypes.c: add a few more HTML filetype markers

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 1999 - 2004 Tomasz Kojm <tk@clamav.net>

+ *  Copyright (C) 1999 - 2005 Tomasz Kojm <tkojm@clamav.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

@@ -547,43 +547,6 @@ void cli_writeint32(char *offset, uint32_t value)

     offset[3] = (value & 0xff000000) >> 24;

 }

-int cli_memstr(const char *haystack, int hs, const char *needle, int ns)

-{

-	const char *pt, *hay;

-	int n;

-

-

-    if(hs < ns)

-	return 0;

-

-    if(haystack == needle)

-	return 1;

-

-    if(!memcmp(haystack, needle, ns))

-	return 1;

-

-    pt = hay = haystack;

-    n = hs;

-

-    while((pt = memchr(hay, needle[0], n)) != NULL) {

-	n -= (int) pt - (int) hay;

-	if(n < ns)

-	    break;

-

-	if(!memcmp(pt, needle, ns))

-	    return 1;

-

-	if(hay == pt) {

-	    n--;

-	    hay++;

-	} else {

-	    hay = pt;

-	}

-    }

-

-    return 0;

-}

-

 int cli_filecopy(const char *src, const char *dest)

 {

 	char *buffer;

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 1999 - 2004 Tomasz Kojm <tk@clamav.net>

+ *  Copyright (C) 1999 - 2005 Tomasz Kojm <tkojm@clamav.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

@@ -38,7 +38,6 @@ int32_t cli_readint32(const char *buff);

 void cli_writeint32(char *offset, uint32_t value);

 char *cli_gentemp(const char *dir);

 unsigned int cli_rndnum(unsigned int max);

-int cli_memstr(const char *haystack, int hs, const char *needle, int ns);

 int cli_filecopy(const char *src, const char *dest);

 #endif

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2002, 2003 Tomasz Kojm <zolw@konarski.edu.pl>

+ *  Copyright (C) 2002 - 2005 Tomasz Kojm <tkojm@clamav.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

@@ -269,3 +269,40 @@ char *cli_strtokbuf(const char *input, int fieldno, const char *delim, char *out

     return output;

 }

+

+int cli_memstr(const char *haystack, int hs, const char *needle, int ns)

+{

+	const char *pt, *hay;

+	int n;

+

+

+    if(hs < ns)

+	return NULL;

+

+    if(haystack == needle)

+	return haystack;

+

+    if(!memcmp(haystack, needle, ns))

+	return haystack;

+

+    pt = hay = haystack;

+    n = hs;

+

+    while((pt = memchr(hay, needle[0], n)) != NULL) {

+	n -= (int) pt - (int) hay;

+	if(n < ns)

+	    break;

+

+	if(!memcmp(pt, needle, ns))

+	    return pt;

+

+	if(hay == pt) {

+	    n--;

+	    hay++;

+	} else {

+	    hay = pt;

+	}

+    }

+

+    return NULL;

+}

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl>

+ *  Copyright (C) 2002 - 2005 Tomasz Kojm <tkojm@clamav.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

@@ -26,5 +26,6 @@ short int *cli_hex2si(const char *hex);

 char *cli_hex2str(const char *hex);

 char *cli_str2hex(const char *string, unsigned int len);

 char *cli_strtokbuf(const char *input, int fieldno, const char *delim, char *output);

+int cli_memstr(const char *haystack, int hs, const char *needle, int ns);

 #endif