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

+Tue Jun 20 18:49:10 CEST 2006 (tk)

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

+  * libclamav/strrcpy.[ch]: remove files; move strrcpy() into str.c

+

 Sat Jun 17 22:57:37 CEST 2006 (tk)

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

   * libclamav: minor code cleanup

@@ -58,8 +58,6 @@ libclamav_la_SOURCES = \

 	message.h \

 	snprintf.c \

 	snprintf.h \

-	strrcpy.c \

-	strrcpy.h \

 	table.c \

 	table.h \

 	text.c \

@@ -79,14 +79,14 @@ LTLIBRARIES = $(lib_LTLIBRARIES)

 libclamav_la_DEPENDENCIES =

 am_libclamav_la_OBJECTS = matcher-ac.lo matcher-bm.lo matcher.lo \

 	md5.lo others.lo readdb.lo cvd.lo dsig.lo str.lo scanners.lo \

-	filetypes.lo blob.lo mbox.lo message.lo snprintf.lo strrcpy.lo \

-	table.lo text.lo ole2_extract.lo vba_extract.lo msexpand.lo \

-	pe.lo cabd.lo lzxd.lo mszipd.lo qtmd.lo system.lo upx.lo \

-	htmlnorm.lo chmunpack.lo rebuildpe.lo petite.lo fsg.lo line.lo \

-	untar.lo unzip.lo special.lo binhex.lo is_tar.lo tnef.lo \

-	unrar15.lo unrarvm.lo unrar.lo unrarfilter.lo unrarppm.lo \

-	unrar20.lo unrarcmd.lo pdf.lo spin.lo yc.lo elf.lo sis.lo \

-	uuencode.lo pst.lo

+	filetypes.lo blob.lo mbox.lo message.lo snprintf.lo table.lo \

+	text.lo ole2_extract.lo vba_extract.lo msexpand.lo pe.lo \

+	cabd.lo lzxd.lo mszipd.lo qtmd.lo system.lo upx.lo htmlnorm.lo \

+	chmunpack.lo rebuildpe.lo petite.lo fsg.lo line.lo untar.lo \

+	unzip.lo special.lo binhex.lo is_tar.lo tnef.lo unrar15.lo \

+	unrarvm.lo unrar.lo unrarfilter.lo unrarppm.lo unrar20.lo \

+	unrarcmd.lo pdf.lo spin.lo yc.lo elf.lo sis.lo uuencode.lo \

+	pst.lo

 libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)

 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/depcomp

@@ -257,8 +257,6 @@ libclamav_la_SOURCES = \

 	message.h \

 	snprintf.c \

 	snprintf.h \

-	strrcpy.c \

-	strrcpy.h \

 	table.c \

 	table.h \

 	text.c \

@@ -445,7 +443,6 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/special.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spin.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str.Plo@am__quote@

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strrcpy.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/system.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text.Plo@am__quote@

@@ -16,7 +16,7 @@

  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

  *  MA 02110-1301, USA.

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.174 2006/06/12 13:24:06 njh Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.175 2006/06/20 16:54:31 tkojm Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -49,7 +49,6 @@ static	char	const	rcsid[] = "$Id: message.c,v 1.174 2006/06/12 13:24:06 njh Exp

 #include "others.h"

 #include "str.h"

 #include "filetypes.h"

-#include "strrcpy.h"

 #include "mbox.h"

@@ -1848,9 +1847,9 @@ decodeLine(message *m, encoding_type et, const char *line, unsigned char *buf, s

 		case EIGHTBIT:

 		default:	/* unknown encoding type - try our best */

 			if(line)	/* empty line? */

-				buf = (unsigned char *)strrcpy((char *)buf, line);

+				buf = (unsigned char *)cli_strrcpy((char *)buf, line);

 			/* Put the new line back in */

-			return (unsigned char *)strrcpy((char *)buf, "\n");

+			return (unsigned char *)cli_strrcpy((char *)buf, "\n");

 		case QUOTEDPRINTABLE:

 			if(line == NULL) {	/* empty line */

@@ -331,3 +331,16 @@ const char *cli_memstr(const char *haystack, int hs, const char *needle, int ns)

     return NULL;

 }

+

+char *cli_strrcpy(char *dest, const char *source) /* by NJH */

+{

+

+    if(!dest || !source) {

+	cli_errmsg("cli_strrcpy: NULL argument\n");

+	return NULL;

+    }

+

+    while((*dest++ = *source++));

+

+    return --dest;

+}

@@ -29,5 +29,5 @@ int cli_hex2num(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);

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

-

+char *cli_strrcpy(char *dest, const char *source);

 #endif

deleted file mode 100644

@@ -1,50 +0,0 @@

-/*

- *  Copyright (C) 2002 Nigel Horne <njh@bandsman.co.uk>

- *

- *  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., 51 Franklin Street, Fifth Floor, Boston,

- *  MA 02110-1301, USA.

- */

-

-#if HAVE_CONFIG_H

-#include "clamav-config.h"

-#endif

-

-#include <stdio.h>

-

-#ifndef	CL_DEBUG

-#define	NDEBUG	/* map CLAMAV debug onto standard */

-#endif

-

-#include <assert.h>

-

-#include "strrcpy.h"

-

-/*

- * Like strcpy, but return the END of the destination, allowing a quicker

- * means of adding to the end of a string than strcat

- */

-char *

-strrcpy(char *dest, const char *source)

-{

-	/* Pre assertions */

-	assert(dest != NULL);

-	assert(source != NULL);

-	assert(dest != source);

-

-	/* tk: parentheses */

-	while((*dest++ = *source++))

-		;

-	return(--dest);

-}

deleted file mode 100644

@@ -1,27 +0,0 @@

-/*

- *  Copyright (C) 2002 Nigel Horne <njh@bandsman.co.uk>

- *

- *  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., 51 Franklin Street, Fifth Floor, Boston,

- *  MA 02110-1301, USA.

- */

-

-/* tk: added strrcpy.h */

-

-#ifndef __STRRCPY_H

-#define __STRRCPY_H

-

-char	*strrcpy(char *dest, const char *source);

-

-#endif