@@ -1,3 +1,10 @@

+Fri Dec 12 10:28:04 EET 2008 (edwin)

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

+ * libclamav/Makefile.am, libclamav/Makefile.in, libclamav/others.c,

+ libclamav/others_common.c: make regex available in

+ libclamav_internal_utils.la, split others.c instead of using #ifdef

+ CLI_MEMFUNS_ONLY.

+

 Thu Dec 11 19:09:36 CET 2008 (acab)

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

  * freshclam/dns.c: small fix to previous commit (bb#1303)

@@ -75,8 +75,8 @@ IFACEDEP = libclamunrar_iface.la

 endif

-libclamav_la_LIBADD = @LIBLTDL@ $(IFACELIBADD) lzma/liblzma.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@

-libclamav_la_DEPENDENCIES =  @LIBLTDL@ $(IFACEDEP)

+libclamav_la_LIBADD = @LIBLTDL@ $(IFACELIBADD) lzma/liblzma.la libclamav_internal_utils.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@

+libclamav_la_DEPENDENCIES =  @LIBLTDL@ $(IFACEDEP) libclamav_internal_utils.la

 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined

 if VERSIONSCRIPT

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

 	cvd.h \

 	dsig.c \

 	dsig.h \

-        str.c \

-	str.h \

 	scanners.c \

 	scanners.h \

 	textdet.c \

@@ -180,16 +178,6 @@ libclamav_la_SOURCES = \

 	tnef.h \

 	autoit.c \

 	autoit.h \

-	regex/strlcpy.c \

-	regex/regcomp.c \

-	regex/regerror.c \

-	regex/regexec.c \

-	regex/regfree.c \

-	regex/cclass.h \

-	regex/cname.h \

-	regex/regex.h \

-	regex/regex2.h \

-	regex/utils.h \

 	unarj.c \

 	unarj.h \

 	nsis/bzlib.c \

@@ -284,11 +272,21 @@ version.h.tmp:

 libclamav_internal_utils_la_SOURCES=str.c \

 				    str.h \

-				    others.c \

-				    others.h

+				    others_common.c \

+				    others.h \

+				    regex/strlcpy.c \

+				    regex/regcomp.c \

+				    regex/regerror.c \

+				    regex/regexec.c \

+				    regex/regfree.c \

+				    regex/cclass.h \

+				    regex/cname.h \

+				    regex/regex.h \

+				    regex/regex2.h \

+				    regex/utils.h

 libclamav_internal_utils_la_LDFLAGS=-static

-libclamav_internal_utils_la_CFLAGS=-DCLI_MEMFUNSONLY

+libclamav_internal_utils_la_CFLAGS=  -fPIC -DPIC

 lib_LTLIBRARIES += libclamav.la

 noinst_LTLIBRARIES = libclamav_internal_utils.la

 EXTRA_DIST += regex/engine.c libclamav.map \

@@ -89,16 +89,15 @@ libLTLIBRARIES_INSTALL = $(INSTALL)

 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)

 @ENABLE_UNRAR_TRUE@am__DEPENDENCIES_1 = libclamunrar_iface.la

 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 \

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

 	textdet.lo filetypes.lo rtf.lo blob.lo mbox.lo message.lo \

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

 	pe.lo disasm.lo upx.lo htmlnorm.lo chmunpack.lo rebuildpe.lo \

 	petite.lo wwunpack.lo unsp.lo aspack.lo packlibs.lo fsg.lo \

 	mew.lo upack.lo line.lo untar.lo unzip.lo inflate64.lo \

-	special.lo binhex.lo is_tar.lo tnef.lo autoit.lo strlcpy.lo \

-	regcomp.lo regerror.lo regexec.lo regfree.lo unarj.lo bzlib.lo \

-	nulsft.lo infblock.lo pdf.lo spin.lo yc.lo elf.lo sis.lo \

-	uuencode.lo phishcheck.lo phish_domaincheck_db.lo \

+	special.lo binhex.lo is_tar.lo tnef.lo autoit.lo unarj.lo \

+	bzlib.lo nulsft.lo infblock.lo pdf.lo spin.lo yc.lo elf.lo \

+	sis.lo uuencode.lo phishcheck.lo phish_domaincheck_db.lo \

 	phish_whitelist.lo regex_list.lo regex_suffix.lo mspack.lo \

 	cab.lo entconv.lo hashtab.lo dconf.lo lzma_iface.lo explode.lo \

 	textnorm.lo dlp.lo js-norm.lo uniq.lo version.lo mpool.lo

@@ -109,7 +108,12 @@ libclamav_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \

 libclamav_internal_utils_la_LIBADD =

 am_libclamav_internal_utils_la_OBJECTS =  \

 	libclamav_internal_utils_la-str.lo \

-	libclamav_internal_utils_la-others.lo

+	libclamav_internal_utils_la-others_common.lo \

+	libclamav_internal_utils_la-strlcpy.lo \

+	libclamav_internal_utils_la-regcomp.lo \

+	libclamav_internal_utils_la-regerror.lo \

+	libclamav_internal_utils_la-regexec.lo \

+	libclamav_internal_utils_la-regfree.lo

 libclamav_internal_utils_la_OBJECTS =  \

 	$(am_libclamav_internal_utils_la_OBJECTS)

 libclamav_internal_utils_la_LINK = $(LIBTOOL) --tag=CC \

@@ -375,7 +379,7 @@ EXTRA_DIST = $(am__append_4) regex/engine.c libclamav.map \

 @ENABLE_UNRAR_TRUE@IFACELIBADD = -dlopen libclamunrar_iface.la

 @ENABLE_UNRAR_TRUE@IFACEDEP = libclamunrar_iface.la

-libclamav_la_LIBADD = @LIBLTDL@ $(IFACELIBADD) lzma/liblzma.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@

+libclamav_la_LIBADD = @LIBLTDL@ $(IFACELIBADD) lzma/liblzma.la libclamav_internal_utils.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@

 libclamav_la_DEPENDENCIES = @LIBLTDL@ $(IFACEDEP)

 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ \

 	-no-undefined $(am__append_6)

@@ -398,8 +402,6 @@ libclamav_la_SOURCES = \

 	cvd.h \

 	dsig.c \

 	dsig.h \

-        str.c \

-	str.h \

 	scanners.c \

 	scanners.h \

 	textdet.c \

@@ -475,16 +477,6 @@ libclamav_la_SOURCES = \

 	tnef.h \

 	autoit.c \

 	autoit.h \

-	regex/strlcpy.c \

-	regex/regcomp.c \

-	regex/regerror.c \

-	regex/regexec.c \

-	regex/regfree.c \

-	regex/cclass.h \

-	regex/cname.h \

-	regex/regex.h \

-	regex/regex2.h \

-	regex/utils.h \

 	unarj.c \

 	unarj.h \

 	nsis/bzlib.c \

@@ -554,11 +546,21 @@ libclamav_la_SOURCES = \

 libclamav_internal_utils_la_SOURCES = str.c \

 				    str.h \

-				    others.c \

-				    others.h

+				    others_common.c \

+				    others.h \

+				    regex/strlcpy.c \

+				    regex/regcomp.c \

+				    regex/regerror.c \

+				    regex/regexec.c \

+				    regex/regfree.c \

+				    regex/cclass.h \

+				    regex/cname.h \

+				    regex/regex.h \

+				    regex/regex2.h \

+				    regex/utils.h

 libclamav_internal_utils_la_LDFLAGS = -static

-libclamav_internal_utils_la_CFLAGS = -DCLI_MEMFUNSONLY

+libclamav_internal_utils_la_CFLAGS = -fPIC -DPIC

 noinst_LTLIBRARIES = libclamav_internal_utils.la

 COMMON_CLEANFILES = version.h version.h.tmp *.gcda *.gcno lzma/*.gcda lzma/*.gcno

 @MAINTAINER_MODE_TRUE@BUILT_SOURCES = jsparse/generated/operators.h jsparse/generated/keywords.h jsparse-keywords.gperf

@@ -673,8 +675,13 @@ distclean-compile:

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

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

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

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

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-others_common.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regcomp.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regerror.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regexec.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regfree.Plo@am__quote@

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

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-strlcpy.Plo@am__quote@

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

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

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

@@ -699,19 +706,13 @@ distclean-compile:

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

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

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

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

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

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

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

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

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

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

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

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

 @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)/strlcpy.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@

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

@@ -760,41 +761,6 @@ distclean-compile:

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

-strlcpy.lo: regex/strlcpy.c

-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strlcpy.lo -MD -MP -MF $(DEPDIR)/strlcpy.Tpo -c -o strlcpy.lo `test -f 'regex/strlcpy.c' || echo '$(srcdir)/'`regex/strlcpy.c

-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/strlcpy.Tpo $(DEPDIR)/strlcpy.Plo

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/strlcpy.c' object='strlcpy.lo' libtool=yes @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strlcpy.lo `test -f 'regex/strlcpy.c' || echo '$(srcdir)/'`regex/strlcpy.c

-

-regcomp.lo: regex/regcomp.c

-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regcomp.lo -MD -MP -MF $(DEPDIR)/regcomp.Tpo -c -o regcomp.lo `test -f 'regex/regcomp.c' || echo '$(srcdir)/'`regex/regcomp.c

-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/regcomp.Tpo $(DEPDIR)/regcomp.Plo

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regcomp.c' object='regcomp.lo' libtool=yes @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regcomp.lo `test -f 'regex/regcomp.c' || echo '$(srcdir)/'`regex/regcomp.c

-

-regerror.lo: regex/regerror.c

-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regerror.lo -MD -MP -MF $(DEPDIR)/regerror.Tpo -c -o regerror.lo `test -f 'regex/regerror.c' || echo '$(srcdir)/'`regex/regerror.c

-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/regerror.Tpo $(DEPDIR)/regerror.Plo

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regerror.c' object='regerror.lo' libtool=yes @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regerror.lo `test -f 'regex/regerror.c' || echo '$(srcdir)/'`regex/regerror.c

-

-regexec.lo: regex/regexec.c

-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regexec.lo -MD -MP -MF $(DEPDIR)/regexec.Tpo -c -o regexec.lo `test -f 'regex/regexec.c' || echo '$(srcdir)/'`regex/regexec.c

-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/regexec.Tpo $(DEPDIR)/regexec.Plo

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regexec.c' object='regexec.lo' libtool=yes @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regexec.lo `test -f 'regex/regexec.c' || echo '$(srcdir)/'`regex/regexec.c

-

-regfree.lo: regex/regfree.c

-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regfree.lo -MD -MP -MF $(DEPDIR)/regfree.Tpo -c -o regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c

-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/regfree.Tpo $(DEPDIR)/regfree.Plo

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regfree.c' object='regfree.lo' libtool=yes @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c

-

 bzlib.lo: nsis/bzlib.c

 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bzlib.lo -MD -MP -MF $(DEPDIR)/bzlib.Tpo -c -o bzlib.lo `test -f 'nsis/bzlib.c' || echo '$(srcdir)/'`nsis/bzlib.c

 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/bzlib.Tpo $(DEPDIR)/bzlib.Plo

@@ -830,12 +796,47 @@ libclamav_internal_utils_la-str.lo: str.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-str.lo `test -f 'str.c' || echo '$(srcdir)/'`str.c

-libclamav_internal_utils_la-others.lo: others.c

-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-others.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-others.Tpo -c -o libclamav_internal_utils_la-others.lo `test -f 'others.c' || echo '$(srcdir)/'`others.c

-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_la-others.Tpo $(DEPDIR)/libclamav_internal_utils_la-others.Plo

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='others.c' object='libclamav_internal_utils_la-others.lo' libtool=yes @AMDEPBACKSLASH@

+libclamav_internal_utils_la-others_common.lo: others_common.c

+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-others_common.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-others_common.Tpo -c -o libclamav_internal_utils_la-others_common.lo `test -f 'others_common.c' || echo '$(srcdir)/'`others_common.c

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_la-others_common.Tpo $(DEPDIR)/libclamav_internal_utils_la-others_common.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='others_common.c' object='libclamav_internal_utils_la-others_common.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-others_common.lo `test -f 'others_common.c' || echo '$(srcdir)/'`others_common.c

+

+libclamav_internal_utils_la-strlcpy.lo: regex/strlcpy.c

+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-strlcpy.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-strlcpy.Tpo -c -o libclamav_internal_utils_la-strlcpy.lo `test -f 'regex/strlcpy.c' || echo '$(srcdir)/'`regex/strlcpy.c

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_la-strlcpy.Tpo $(DEPDIR)/libclamav_internal_utils_la-strlcpy.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/strlcpy.c' object='libclamav_internal_utils_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-strlcpy.lo `test -f 'regex/strlcpy.c' || echo '$(srcdir)/'`regex/strlcpy.c

+

+libclamav_internal_utils_la-regcomp.lo: regex/regcomp.c

+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-regcomp.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-regcomp.Tpo -c -o libclamav_internal_utils_la-regcomp.lo `test -f 'regex/regcomp.c' || echo '$(srcdir)/'`regex/regcomp.c

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_la-regcomp.Tpo $(DEPDIR)/libclamav_internal_utils_la-regcomp.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regcomp.c' object='libclamav_internal_utils_la-regcomp.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-regcomp.lo `test -f 'regex/regcomp.c' || echo '$(srcdir)/'`regex/regcomp.c

+

+libclamav_internal_utils_la-regerror.lo: regex/regerror.c

+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-regerror.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-regerror.Tpo -c -o libclamav_internal_utils_la-regerror.lo `test -f 'regex/regerror.c' || echo '$(srcdir)/'`regex/regerror.c

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_la-regerror.Tpo $(DEPDIR)/libclamav_internal_utils_la-regerror.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regerror.c' object='libclamav_internal_utils_la-regerror.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-regerror.lo `test -f 'regex/regerror.c' || echo '$(srcdir)/'`regex/regerror.c

+

+libclamav_internal_utils_la-regexec.lo: regex/regexec.c

+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-regexec.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-regexec.Tpo -c -o libclamav_internal_utils_la-regexec.lo `test -f 'regex/regexec.c' || echo '$(srcdir)/'`regex/regexec.c

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_la-regexec.Tpo $(DEPDIR)/libclamav_internal_utils_la-regexec.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regexec.c' object='libclamav_internal_utils_la-regexec.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-regexec.lo `test -f 'regex/regexec.c' || echo '$(srcdir)/'`regex/regexec.c

+

+libclamav_internal_utils_la-regfree.lo: regex/regfree.c

+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-regfree.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-regfree.Tpo -c -o libclamav_internal_utils_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_la-regfree.Tpo $(DEPDIR)/libclamav_internal_utils_la-regfree.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regfree.c' object='libclamav_internal_utils_la-regfree.lo' libtool=yes @AMDEPBACKSLASH@

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-others.lo `test -f 'others.c' || echo '$(srcdir)/'`others.c

+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c

 unrar15.lo: ../libclamunrar/unrar15.c

 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrar15.lo -MD -MP -MF $(DEPDIR)/unrar15.Tpo -c -o unrar15.lo `test -f '../libclamunrar/unrar15.c' || echo '$(srcdir)/'`../libclamunrar/unrar15.c

@@ -60,13 +60,7 @@

 #ifdef CL_THREAD_SAFE

 #  include <pthread.h>

-#ifndef CLI_MEMFUNSONLY

 static pthread_mutex_t cli_gentemp_mutex = PTHREAD_MUTEX_INITIALIZER;

-#endif

-

-# ifndef HAVE_CTIME_R

-static pthread_mutex_t cli_ctime_mutex = PTHREAD_MUTEX_INITIALIZER;

-# endif

 #endif

@@ -92,40 +86,8 @@ static pthread_mutex_t cli_ctime_mutex = PTHREAD_MUTEX_INITIALIZER;

 #define       P_tmpdir        "C:\\WINDOWS\\TEMP"

 #endif

-uint8_t cli_debug_flag = 0;

-

-#ifndef CLI_MEMFUNSONLY

 static unsigned char name_salt[16] = { 16, 38, 97, 12, 8, 4, 72, 196, 217, 144, 33, 124, 18, 11, 17, 253 };

-#endif

-

-#define MSGCODE(x)					    \

-	va_list args;					    \

-	int len = sizeof(x) - 1;			    \

-	char buff[BUFSIZ];				    \

-    strncpy(buff, x, len);				    \

-    buff[BUFSIZ-1]='\0';				    \

-    va_start(args, str);				    \

-    vsnprintf(buff + len, sizeof(buff) - len, str, args);   \

-    buff[sizeof(buff) - 1] = '\0';			    \

-    fputs(buff, stderr);				    \

-    va_end(args)

-

-void cli_warnmsg(const char *str, ...)

-{

-    MSGCODE("LibClamAV Warning: ");

-}

-

-void cli_errmsg(const char *str, ...)

-{

-    MSGCODE("LibClamAV Error: ");

-}

-

-void cli_dbgmsg_internal(const char *str, ...)

-{

-    MSGCODE("LibClamAV debug: ");

-}

-#ifndef CLI_MEMFUNSONLY

 int (*cli_unrar_open)(int fd, const char *dirname, unrar_state_t *state);

 int (*cli_unrar_extract_next_prepare)(unrar_state_t *state, const char *dirname);

 int (*cli_unrar_extract_next)(unrar_state_t *state, const char *dirname);

@@ -553,120 +515,7 @@ static char *cli_md5buff(const unsigned char *buffer, unsigned int len, unsigned

     return md5str;

 }

-#endif

-

-void *cli_malloc(size_t size)

-{

-	void *alloc;

-

-

-    if(!size || size > CLI_MAX_ALLOCATION) {

-	cli_errmsg("cli_malloc(): Attempt to allocate %lu bytes. Please report to http://bugs.clamav.net\n", (unsigned long int) size);

-	return NULL;

-    }

-

-#if defined(_MSC_VER) && defined(_DEBUG)

-    alloc = _malloc_dbg(size, _NORMAL_BLOCK, __FILE__, __LINE__);

-#else

-    alloc = malloc(size);

-#endif

-

-    if(!alloc) {

-	cli_errmsg("cli_malloc(): Can't allocate memory (%lu bytes).\n", (unsigned long int) size);

-	perror("malloc_problem");

-	return NULL;

-    } else return alloc;

-}

-

-void *cli_calloc(size_t nmemb, size_t size)

-{

-	void *alloc;

-

-

-    if(!size || size > CLI_MAX_ALLOCATION) {

-	cli_errmsg("cli_calloc(): Attempt to allocate %lu bytes. Please report to http://bugs.clamav.net\n", (unsigned long int) size);

-	return NULL;

-    }

-

-#if defined(_MSC_VER) && defined(_DEBUG)

-    alloc = _calloc_dbg(nmemb, size, _NORMAL_BLOCK, __FILE__, __LINE__);

-#else

-    alloc = calloc(nmemb, size);

-#endif

-

-    if(!alloc) {

-	cli_errmsg("cli_calloc(): Can't allocate memory (%lu bytes).\n", (unsigned long int) (nmemb * size));

-	perror("calloc_problem");

-	return NULL;

-    } else return alloc;

-}

-

-void *cli_realloc(void *ptr, size_t size)

-{

-	void *alloc;

-

-

-    if(!size || size > CLI_MAX_ALLOCATION) {

-	cli_errmsg("cli_realloc(): Attempt to allocate %lu bytes. Please report to http://bugs.clamav.net\n", (unsigned long int) size);

-	return NULL;

-    }

-    alloc = realloc(ptr, size);

-

-    if(!alloc) {

-	cli_errmsg("cli_realloc(): Can't re-allocate memory to %lu bytes.\n", (unsigned long int) size);

-	perror("realloc_problem");

-	return NULL;

-    } else return alloc;

-}

-

-void *cli_realloc2(void *ptr, size_t size)

-{

-	void *alloc;

-

-

-    if(!size || size > CLI_MAX_ALLOCATION) {

-	cli_errmsg("cli_realloc2(): Attempt to allocate %lu bytes. Please report to http://bugs.clamav.net\n", (unsigned long int) size);

-	return NULL;

-    }

-

-    alloc = realloc(ptr, size);

-

-    if(!alloc) {

-	cli_errmsg("cli_realloc2(): Can't re-allocate memory to %lu bytes.\n", (unsigned long int) size);

-	perror("realloc_problem");

-	if(ptr)

-	    free(ptr);

-	return NULL;

-    } else return alloc;

-}

-

-char *cli_strdup(const char *s)

-{

-        char *alloc;

-

-

-    if(s == NULL) {

-        cli_errmsg("cli_strdup(): s == NULL. Please report to http://bugs.clamav.net\n");

-        return NULL;

-    }

-

-#if defined(_MSC_VER) && defined(_DEBUG)

-    alloc = _strdup_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__);

-#else

-    alloc = strdup(s);

-#endif

-

-    if(!alloc) {

-        cli_errmsg("cli_strdup(): Can't allocate memory (%u bytes).\n", (unsigned int) strlen(s));

-        perror("strdup_problem");

-        return NULL;

-    }

-

-    return alloc;

-}

-

-#ifndef CLI_MEMFUNSONLY

 unsigned int cli_rndnum(unsigned int max)

 {

     if(name_salt[0] == 16) { /* minimizes re-seeding after the first call to cli_gentemp() */

@@ -753,7 +602,6 @@ int cli_gentempfd(const char *dir, char **name, int *fd)

     return CL_SUCCESS;

 }

-#endif

 /* Function: unlink

         unlink() with error checking

@@ -1107,64 +955,3 @@ int cli_bitset_test(bitset_t *bs, unsigned long bit_offset)

 	return (bs->bitset[char_offset] & ((unsigned char)1 << bit_offset));

 }

-/* returns converted timestamp, in case of error the returned string contains at least one character */

-const char* cli_ctime(const time_t *timep, char *buf, const size_t bufsize)

-{

-	const char *ret;

-	if(bufsize < 26) {

-		/* standard says we must have at least 26 bytes buffer */

-		cli_warnmsg("buffer too small for ctime\n");

-		return " ";

-	}

-	if((uint32_t)(*timep) > 0x7fffffff) {

-		/* some systems can consider these timestamps invalid */

-		strncpy(buf, "invalid timestamp", bufsize-1);

-		buf[bufsize-1] = '\0';

-		return buf;

-	}

-

-#ifdef HAVE_CTIME_R	

-# ifdef HAVE_CTIME_R_2

-	ret = ctime_r(timep, buf);

-# else

-	ret = ctime_r(timep, buf, bufsize);

-# endif

-#else /* no ctime_r */

-

-# ifdef CL_THREAD_SAFE

-	pthread_mutex_lock(&cli_ctime_mutex);

-# endif

-	ret = ctime(timep);

-	if(ret) {

-		strncpy(buf, ret, bufsize-1);

-		buf[bufsize-1] = '\0';

-		ret = buf;

-	}

-# ifdef CL_THREAD_SAFE

-	pthread_mutex_unlock(&cli_ctime_mutex);

-# endif

-#endif

-	/* common */

-	if(!ret) {

-		buf[0] = ' ';

-		buf[1] = '\0';

-		return buf;

-	}

-	return ret;

-}

-

-#ifndef CLI_MEMFUNSONLY

-int cli_matchregex(const char *str, const char *regex)

-{

-	regex_t reg;

-	int match;

-

-    if(cli_regcomp(&reg, regex, REG_EXTENDED | REG_NOSUB) == 0) {

-	match = (cli_regexec(&reg, str, 0, NULL, 0) == REG_NOMATCH) ? 0 : 1;

-	cli_regfree(&reg);

-	return match;

-    }

-

-    return 0;

-}

-#endif

new file mode 100644

@@ -0,0 +1,275 @@

+/*

+ *  Copyright (C) 2007-2008 Sourcefire, Inc.

+ *

+ *  Authors: Tomasz Kojm, Trog

+ *

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

+ *  it under the terms of the GNU General Public License version 2 as

+ *  published by the Free Software Foundation.

+ *

+ *  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>

+#include <stdarg.h>

+#include <string.h>

+#include <stdlib.h>

+#include <ctype.h>

+#ifdef	HAVE_UNISTD_H

+#include <unistd.h>

+#endif

+#include <sys/types.h>

+#include <sys/stat.h>

+#ifndef	C_WINDOWS

+#include <sys/wait.h>

+#include <sys/time.h>

+#include <dirent.h>

+#endif

+#include <time.h>

+#include <fcntl.h>

+#ifndef	C_WINDOWS

+#include <pwd.h>

+#endif

+#include <errno.h>

+#include "target.h"

+#ifndef	C_WINDOWS

+#include <sys/time.h>

+#endif

+#ifdef	HAVE_SYS_PARAM_H

+#include <sys/param.h>

+#endif

+#ifdef	HAVE_MALLOC_H

+#include <malloc.h>

+#endif

+#if	defined(_MSC_VER) && defined(_DEBUG)

+#include <crtdbg.h>

+#endif

+

+#include "clamav.h"

+#include "others.h"

+#include "md5.h"

+#include "cltypes.h"

+#include "regex/regex.h"

+#include "ltdl.h"

+#include "matcher-ac.h"

+

+#ifdef CL_THREAD_SAFE

+#  include <pthread.h>

+

+# ifndef HAVE_CTIME_R

+static pthread_mutex_t cli_ctime_mutex = PTHREAD_MUTEX_INITIALIZER;

+# endif

+

+#endif

+uint8_t cli_debug_flag = 0;

+

+#define MSGCODE(x)					    \

+	va_list args;					    \

+	int len = sizeof(x) - 1;			    \

+	char buff[BUFSIZ];				    \

+    strncpy(buff, x, len);				    \

+    buff[BUFSIZ-1]='\0';				    \

+    va_start(args, str);				    \

+    vsnprintf(buff + len, sizeof(buff) - len, str, args);   \

+    buff[sizeof(buff) - 1] = '\0';			    \

+    fputs(buff, stderr);				    \

+    va_end(args)

+

+void cli_warnmsg(const char *str, ...)

+{

+    MSGCODE("LibClamAV Warning: ");

+}

+

+void cli_errmsg(const char *str, ...)

+{

+    MSGCODE("LibClamAV Error: ");

+}

+

+void cli_dbgmsg_internal(const char *str, ...)

+{

+    MSGCODE("LibClamAV debug: ");

+}

+

+int cli_matchregex(const char *str, const char *regex)

+{

+	regex_t reg;

+	int match;

+

+    if(cli_regcomp(&reg, regex, REG_EXTENDED | REG_NOSUB) == 0) {

+	match = (cli_regexec(&reg, str, 0, NULL, 0) == REG_NOMATCH) ? 0 : 1;

+	cli_regfree(&reg);

+	return match;

+    }

+

+    return 0;

+}

+void *cli_malloc(size_t size)

+{

+	void *alloc;

+

+

+    if(!size || size > CLI_MAX_ALLOCATION) {

+	cli_errmsg("cli_malloc(): Attempt to allocate %lu bytes. Please report to http://bugs.clamav.net\n", (unsigned long int) size);

+	return NULL;

+    }

+

+#if defined(_MSC_VER) && defined(_DEBUG)

+    alloc = _malloc_dbg(size, _NORMAL_BLOCK, __FILE__, __LINE__);

+#else

+    alloc = malloc(size);

+#endif

+

+    if(!alloc) {

+	cli_errmsg("cli_malloc(): Can't allocate memory (%lu bytes).\n", (unsigned long int) size);

+	perror("malloc_problem");

+	return NULL;

+    } else return alloc;

+}

+

+void *cli_calloc(size_t nmemb, size_t size)

+{

+	void *alloc;

+

+

+    if(!size || size > CLI_MAX_ALLOCATION) {

+	cli_errmsg("cli_calloc(): Attempt to allocate %lu bytes. Please report to http://bugs.clamav.net\n", (unsigned long int) size);

+	return NULL;

+    }

+

+#if defined(_MSC_VER) && defined(_DEBUG)

+    alloc = _calloc_dbg(nmemb, size, _NORMAL_BLOCK, __FILE__, __LINE__);

+#else

+    alloc = calloc(nmemb, size);

+#endif

+

+    if(!alloc) {

+	cli_errmsg("cli_calloc(): Can't allocate memory (%lu bytes).\n", (unsigned long int) (nmemb * size));

+	perror("calloc_problem");

+	return NULL;

+    } else return alloc;

+}

+

+void *cli_realloc(void *ptr, size_t size)

+{

+	void *alloc;

+

+

+    if(!size || size > CLI_MAX_ALLOCATION) {

+	cli_errmsg("cli_realloc(): Attempt to allocate %lu bytes. Please report to http://bugs.clamav.net\n", (unsigned long int) size);

+	return NULL;

+    }

+

+    alloc = realloc(ptr, size);

+

+    if(!alloc) {

+	cli_errmsg("cli_realloc(): Can't re-allocate memory to %lu bytes.\n", (unsigned long int) size);

+	perror("realloc_problem");

+	return NULL;

+    } else return alloc;

+}

+

+void *cli_realloc2(void *ptr, size_t size)

+{

+	void *alloc;

+

+

+    if(!size || size > CLI_MAX_ALLOCATION) {

+	cli_errmsg("cli_realloc2(): Attempt to allocate %lu bytes. Please report to http://bugs.clamav.net\n", (unsigned long int) size);

+	return NULL;

+    }

+

+    alloc = realloc(ptr, size);

+

+    if(!alloc) {

+	cli_errmsg("cli_realloc2(): Can't re-allocate memory to %lu bytes.\n", (unsigned long int) size);

+	perror("realloc_problem");

+	if(ptr)

+	    free(ptr);

+	return NULL;

+    } else return alloc;

+}

+

+char *cli_strdup(const char *s)

+{

+        char *alloc;

+

+

+    if(s == NULL) {

+        cli_errmsg("cli_strdup(): s == NULL. Please report to http://bugs.clamav.net\n");

+        return NULL;

+    }

+

+#if defined(_MSC_VER) && defined(_DEBUG)

+    alloc = _strdup_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__);

+#else

+    alloc = strdup(s);

+#endif

+

+    if(!alloc) {

+        cli_errmsg("cli_strdup(): Can't allocate memory (%u bytes).\n", (unsigned int) strlen(s));

+        perror("strdup_problem");

+        return NULL;

+    }

+

+    return alloc;

+}

+

+/* returns converted timestamp, in case of error the returned string contains at least one character */

+const char* cli_ctime(const time_t *timep, char *buf, const size_t bufsize)

+{

+	const char *ret;

+	if(bufsize < 26) {

+		/* standard says we must have at least 26 bytes buffer */

+		cli_warnmsg("buffer too small for ctime\n");

+		return " ";

+	}

+	if((uint32_t)(*timep) > 0x7fffffff) {

+		/* some systems can consider these timestamps invalid */

+		strncpy(buf, "invalid timestamp", bufsize-1);

+		buf[bufsize-1] = '\0';

+		return buf;

+	}

+

+#ifdef HAVE_CTIME_R	

+# ifdef HAVE_CTIME_R_2

+	ret = ctime_r(timep, buf);

+# else

+	ret = ctime_r(timep, buf, bufsize);

+# endif

+#else /* no ctime_r */

+

+# ifdef CL_THREAD_SAFE

+	pthread_mutex_lock(&cli_ctime_mutex);

+# endif

+	ret = ctime(timep);

+	if(ret) {

+		strncpy(buf, ret, bufsize-1);

+		buf[bufsize-1] = '\0';

+		ret = buf;

+	}

+# ifdef CL_THREAD_SAFE

+	pthread_mutex_unlock(&cli_ctime_mutex);

+# endif

+#endif

+	/* common */

+	if(!ret) {

+		buf[0] = ' ';

+		buf[1] = '\0';

+		return buf;

+	}

+	return ret;

+}

+