@@ -1,3 +1,14 @@

+Mon Mar 29 02:05:39 CEST 2004 (tk)

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

+  * big cleanup: remove duplicated code and move it to /shared (fixes

+		 a dependency problem when compiling with --disable-pthreads

+		 and LogSyslog support in freshclam); eliminate warnings

+  * libclamav: include backup snprintf implementation (patch by Phil Oleson

+	       <oz*nixil.net>, snprintf by Patrick Powell)

+  * clamd: fix clamd hangup when log size is exceeded (bug reported by

+	   Ryan Thompson <clamav*sasknow.com>)

+  * examples/ex1.c: update

+

 Sat Mar 27 21:55:33 GMT 2004 (njh)

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

   * clamav-milter:	Delay connection to clamd to handle clamd's timeout

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

 #

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

+#  Copyright (C) 2002 - 2004 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

@@ -16,4 +16,4 @@

 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool database docs etc clamav-milter

-EXTRA_DIST = FAQ contrib test examples BUGS

+EXTRA_DIST = FAQ contrib test examples BUGS shared

@@ -15,7 +15,7 @@

 @SET_MAKE@

 #

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

+#  Copyright (C) 2002 - 2004 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

@@ -117,7 +117,7 @@ am__quote = @am__quote@

 install_sh = @install_sh@

 SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool database docs etc clamav-milter

-EXTRA_DIST = FAQ contrib test examples BUGS

+EXTRA_DIST = FAQ contrib test examples BUGS shared

 subdir = .

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

@@ -1,4 +1,4 @@

-# aclocal.m4 generated automatically by aclocal 1.6.1 -*- Autoconf -*-

+# aclocal.m4t generated automatically by aclocal 1.6.1 -*- Autoconf -*-

 # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002

 # Free Software Foundation, Inc.

@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: aclocal.m4,v 1.29 2004/03/19 23:12:33 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.30 2004/03/29 00:00:57 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: aclocal.m4,v 1.29 2004/03/19 23:12:33 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.30 2004/03/29 00:00:57 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

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

 /* clamav-config.h.in.  Generated from configure.in by autoheader.  */

+/* Define if your snprintf is busted */

+#undef BROKEN_SNPRINTF

+

 /* "build clamd" */

 #undef BUILD_CLAMD

@@ -9,9 +12,6 @@

 /* name of the clamav user */

 #undef CLAMAVUSER

-/* use syslog */

-#undef CLAMD_USE_SYSLOG

-

 /* enable clamuko */

 #undef CLAMUKO

@@ -150,9 +150,15 @@

 /* Define to 1 if you have the <sys/types.h> header file. */

 #undef HAVE_SYS_TYPES_H

+/* Define to 1 if you have the <tcpd.h> header file. */

+#undef HAVE_TCPD_H

+

 /* Define to 1 if you have the <unistd.h> header file. */

 #undef HAVE_UNISTD_H

+/* Define to 1 if you have the `vsnprintf' function. */

+#undef HAVE_VSNPRINTF

+

 /* zlib installed */

 #undef HAVE_ZLIB_H

@@ -198,6 +204,9 @@

 /* Define to 1 if you have the ANSI C header files. */

 #undef STDC_HEADERS

+/* use syslog */

+#undef USE_SYSLOG

+

 /* Version number of package */

 #undef VERSION

@@ -20,10 +20,16 @@ if BUILD_CLAMD

 sbin_PROGRAMS = clamd

 clamd_SOURCES = \

+    $(top_srcdir)/shared/output.c \

+    $(top_srcdir)/shared/output.h \

+    $(top_srcdir)/shared/cfgparser.c \

+    $(top_srcdir)/shared/cfgparser.h \

+    $(top_srcdir)/shared/getopt.c \

+    $(top_srcdir)/shared/getopt.h \

+    $(top_srcdir)/shared/memory.c \

+    $(top_srcdir)/shared/memory.h \

     options.c \

     options.h \

-    cfgfile.c \

-    cfgfile.h \

     clamd.c \

     defaults.h \

     tcpserver.c \

@@ -49,12 +55,11 @@ clamd_SOURCES = \

     dazuko_xp.h \

     dazukoio_xp.h \

     tests.c \

-    tests.h

-

-clamd_LDADD = $(top_builddir)/clamscan/getopt.o

+    tests.h \

+    shared.h

 endif

 DEFS = @DEFS@

 LIBS = -L$(top_builddir)/libclamav -lclamav @CLAMD_LIBS@

-INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/libclamav

+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

@@ -119,10 +119,16 @@ install_sh = @install_sh@

 @BUILD_CLAMD_TRUE@sbin_PROGRAMS = clamd

 @BUILD_CLAMD_TRUE@clamd_SOURCES = \

+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/output.c \

+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/output.h \

+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/cfgparser.c \

+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/cfgparser.h \

+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/getopt.c \

+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/getopt.h \

+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/memory.c \

+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/memory.h \

 @BUILD_CLAMD_TRUE@    options.c \

 @BUILD_CLAMD_TRUE@    options.h \

-@BUILD_CLAMD_TRUE@    cfgfile.c \

-@BUILD_CLAMD_TRUE@    cfgfile.h \

 @BUILD_CLAMD_TRUE@    clamd.c \

 @BUILD_CLAMD_TRUE@    defaults.h \

 @BUILD_CLAMD_TRUE@    tcpserver.c \

@@ -148,14 +154,13 @@ install_sh = @install_sh@

 @BUILD_CLAMD_TRUE@    dazuko_xp.h \

 @BUILD_CLAMD_TRUE@    dazukoio_xp.h \

 @BUILD_CLAMD_TRUE@    tests.c \

-@BUILD_CLAMD_TRUE@    tests.h

+@BUILD_CLAMD_TRUE@    tests.h \

+@BUILD_CLAMD_TRUE@    shared.h

-@BUILD_CLAMD_TRUE@clamd_LDADD = $(top_builddir)/clamscan/getopt.o

-

 DEFS = @DEFS@

 LIBS = -L$(top_builddir)/libclamav -lclamav @CLAMD_LIBS@

-INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/libclamav

+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 subdir = clamd

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

 CONFIG_HEADER = $(top_builddir)/clamav-config.h

@@ -164,7 +169,9 @@ CONFIG_CLEAN_FILES =

 @BUILD_CLAMD_FALSE@sbin_PROGRAMS =

 PROGRAMS = $(sbin_PROGRAMS)

-@BUILD_CLAMD_TRUE@am_clamd_OBJECTS = options.$(OBJEXT) cfgfile.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@am_clamd_OBJECTS = output.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	cfgparser.$(OBJEXT) getopt.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	memory.$(OBJEXT) options.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	clamd.$(OBJEXT) tcpserver.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	localserver.$(OBJEXT) session.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	thrmgr.$(OBJEXT) server-th.$(OBJEXT) \

@@ -172,22 +179,23 @@ PROGRAMS = $(sbin_PROGRAMS)

 @BUILD_CLAMD_TRUE@	clamuko.$(OBJEXT) dazukoio_compat12.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	dazukoio.$(OBJEXT) tests.$(OBJEXT)

 clamd_OBJECTS = $(am_clamd_OBJECTS)

-@BUILD_CLAMD_TRUE@clamd_DEPENDENCIES = $(top_builddir)/clamscan/getopt.o

-@BUILD_CLAMD_FALSE@clamd_DEPENDENCIES =

+clamd_LDADD = $(LDADD)

+clamd_DEPENDENCIES =

 clamd_LDFLAGS =

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

 CPPFLAGS = @CPPFLAGS@

 LDFLAGS = @LDFLAGS@

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

 am__depfiles_maybe = depfiles

-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cfgfile.Po ./$(DEPDIR)/clamd.Po \

+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cfgparser.Po ./$(DEPDIR)/clamd.Po \

 @AMDEP_TRUE@	./$(DEPDIR)/clamuko.Po ./$(DEPDIR)/dazukoio.Po \

 @AMDEP_TRUE@	./$(DEPDIR)/dazukoio_compat12.Po \

-@AMDEP_TRUE@	./$(DEPDIR)/localserver.Po ./$(DEPDIR)/options.Po \

-@AMDEP_TRUE@	./$(DEPDIR)/others.Po ./$(DEPDIR)/scanner.Po \

-@AMDEP_TRUE@	./$(DEPDIR)/server-th.Po ./$(DEPDIR)/session.Po \

-@AMDEP_TRUE@	./$(DEPDIR)/tcpserver.Po ./$(DEPDIR)/tests.Po \

-@AMDEP_TRUE@	./$(DEPDIR)/thrmgr.Po

+@AMDEP_TRUE@	./$(DEPDIR)/getopt.Po ./$(DEPDIR)/localserver.Po \

+@AMDEP_TRUE@	./$(DEPDIR)/memory.Po ./$(DEPDIR)/options.Po \

+@AMDEP_TRUE@	./$(DEPDIR)/others.Po ./$(DEPDIR)/output.Po \

+@AMDEP_TRUE@	./$(DEPDIR)/scanner.Po ./$(DEPDIR)/server-th.Po \

+@AMDEP_TRUE@	./$(DEPDIR)/session.Po ./$(DEPDIR)/tcpserver.Po \

+@AMDEP_TRUE@	./$(DEPDIR)/tests.Po ./$(DEPDIR)/thrmgr.Po

 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \

@@ -236,6 +244,10 @@ uninstall-sbinPROGRAMS:

 clean-sbinPROGRAMS:

 	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)

+output.$(OBJEXT): $(top_srcdir)/shared/output.c

+cfgparser.$(OBJEXT): $(top_srcdir)/shared/cfgparser.c

+getopt.$(OBJEXT): $(top_srcdir)/shared/getopt.c

+memory.$(OBJEXT): $(top_srcdir)/shared/memory.c

 clamd$(EXEEXT): $(clamd_OBJECTS) $(clamd_DEPENDENCIES) 

 	@rm -f clamd$(EXEEXT)

 	$(LINK) $(clamd_LDFLAGS) $(clamd_OBJECTS) $(clamd_LDADD) $(LIBS)

@@ -246,14 +258,17 @@ mostlyclean-compile:

 distclean-compile:

 	-rm -f *.tab.c

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfgfile.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfgparser.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamd.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamuko.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukoio.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dazukoio_compat12.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localserver.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memory.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/others.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanner.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server-th.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session.Po@am__quote@

@@ -281,6 +296,78 @@ distclean-depend:

 @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@

 @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<

+

+output.o: $(top_srcdir)/shared/output.c

+@AMDEP_TRUE@	source='$(top_srcdir)/shared/output.c' object='output.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@	depfile='$(DEPDIR)/output.Po' tmpdepfile='$(DEPDIR)/output.TPo' @AMDEPBACKSLASH@

+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.o `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c

+

+output.obj: $(top_srcdir)/shared/output.c

+@AMDEP_TRUE@	source='$(top_srcdir)/shared/output.c' object='output.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@	depfile='$(DEPDIR)/output.Po' tmpdepfile='$(DEPDIR)/output.TPo' @AMDEPBACKSLASH@

+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.obj `cygpath -w $(top_srcdir)/shared/output.c`

+

+output.lo: $(top_srcdir)/shared/output.c

+@AMDEP_TRUE@	source='$(top_srcdir)/shared/output.c' object='output.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@	depfile='$(DEPDIR)/output.Plo' tmpdepfile='$(DEPDIR)/output.TPlo' @AMDEPBACKSLASH@

+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o output.lo `test -f '$(top_srcdir)/shared/output.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/output.c

+

+cfgparser.o: $(top_srcdir)/shared/cfgparser.c

+@AMDEP_TRUE@	source='$(top_srcdir)/shared/cfgparser.c' object='cfgparser.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@	depfile='$(DEPDIR)/cfgparser.Po' tmpdepfile='$(DEPDIR)/cfgparser.TPo' @AMDEPBACKSLASH@

+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cfgparser.o `test -f '$(top_srcdir)/shared/cfgparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/cfgparser.c

+

+cfgparser.obj: $(top_srcdir)/shared/cfgparser.c

+@AMDEP_TRUE@	source='$(top_srcdir)/shared/cfgparser.c' object='cfgparser.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@	depfile='$(DEPDIR)/cfgparser.Po' tmpdepfile='$(DEPDIR)/cfgparser.TPo' @AMDEPBACKSLASH@

+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cfgparser.obj `cygpath -w $(top_srcdir)/shared/cfgparser.c`

+

+cfgparser.lo: $(top_srcdir)/shared/cfgparser.c

+@AMDEP_TRUE@	source='$(top_srcdir)/shared/cfgparser.c' object='cfgparser.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@	depfile='$(DEPDIR)/cfgparser.Plo' tmpdepfile='$(DEPDIR)/cfgparser.TPlo' @AMDEPBACKSLASH@

+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cfgparser.lo `test -f '$(top_srcdir)/shared/cfgparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/cfgparser.c

+

+getopt.o: $(top_srcdir)/shared/getopt.c

+@AMDEP_TRUE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@	depfile='$(DEPDIR)/getopt.Po' tmpdepfile='$(DEPDIR)/getopt.TPo' @AMDEPBACKSLASH@

+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c

+

+getopt.obj: $(top_srcdir)/shared/getopt.c

+@AMDEP_TRUE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@	depfile='$(DEPDIR)/getopt.Po' tmpdepfile='$(DEPDIR)/getopt.TPo' @AMDEPBACKSLASH@

+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `cygpath -w $(top_srcdir)/shared/getopt.c`

+

+getopt.lo: $(top_srcdir)/shared/getopt.c

+@AMDEP_TRUE@	source='$(top_srcdir)/shared/getopt.c' object='getopt.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@	depfile='$(DEPDIR)/getopt.Plo' tmpdepfile='$(DEPDIR)/getopt.TPlo' @AMDEPBACKSLASH@

+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.lo `test -f '$(top_srcdir)/shared/getopt.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/getopt.c

+

+memory.o: $(top_srcdir)/shared/memory.c

+@AMDEP_TRUE@	source='$(top_srcdir)/shared/memory.c' object='memory.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@	depfile='$(DEPDIR)/memory.Po' tmpdepfile='$(DEPDIR)/memory.TPo' @AMDEPBACKSLASH@

+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o memory.o `test -f '$(top_srcdir)/shared/memory.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/memory.c

+

+memory.obj: $(top_srcdir)/shared/memory.c

+@AMDEP_TRUE@	source='$(top_srcdir)/shared/memory.c' object='memory.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@	depfile='$(DEPDIR)/memory.Po' tmpdepfile='$(DEPDIR)/memory.TPo' @AMDEPBACKSLASH@

+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o memory.obj `cygpath -w $(top_srcdir)/shared/memory.c`

+

+memory.lo: $(top_srcdir)/shared/memory.c

+@AMDEP_TRUE@	source='$(top_srcdir)/shared/memory.c' object='memory.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@	depfile='$(DEPDIR)/memory.Plo' tmpdepfile='$(DEPDIR)/memory.TPlo' @AMDEPBACKSLASH@

+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o memory.lo `test -f '$(top_srcdir)/shared/memory.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/memory.c

 CCDEPMODE = @CCDEPMODE@

 mostlyclean-libtool:

deleted file mode 100644

@@ -1,294 +0,0 @@

-/*

- *  Copyright (C) 2002 - 2004 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

- *  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., 675 Mass Ave, Cambridge, MA 02139, USA.

- */

-

-#if HAVE_CONFIG_H

-#include "clamav-config.h"

-#endif

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <ctype.h>

-

-#include "options.h"

-#include "cfgfile.h"

-#include "others.h"

-#include "defaults.h"

-#include "str.h"

-

-struct cfgstruct *parsecfg(const char *cfgfile)

-{

-	char buff[LINE_LENGTH], *name, *arg;

-	FILE *fs;

-	int line = 0, i, found, ctype, calc;

-	struct cfgstruct *copt = NULL;

-	struct cfgoption *pt;

-

-	struct cfgoption cfg_options[] = {

-	    {"LogFile", OPT_STR},

-	    {"LogFileUnlock", OPT_NOARG},

-	    {"LogFileMaxSize", OPT_COMPSIZE},

-	    {"LogTime", OPT_NOARG},

-	    {"LogClean", OPT_NOARG},

-	    {"LogVerbose", OPT_NOARG}, /* clamd + freshclam */

-	    {"LogSyslog", OPT_NOARG},

-	    {"PidFile", OPT_STR},

-	    {"TemporaryDirectory", OPT_STR},

-	    {"MaxFileSize", OPT_COMPSIZE},

-	    {"ScanMail", OPT_NOARG},

-	    {"ScanOLE2", OPT_NOARG},

-	    {"ScanArchive", OPT_NOARG},

-	    {"ScanRAR", OPT_NOARG},

-	    {"ArchiveMaxFileSize", OPT_COMPSIZE},

-	    {"ArchiveMaxRecursion", OPT_NUM},

-	    {"ArchiveMaxFiles", OPT_NUM},

-	    {"ArchiveMaxCompressionRatio", OPT_NUM},

-	    {"ArchiveLimitMemoryUsage", OPT_NOARG},

-	    {"ArchiveDetectEncrypted", OPT_NOARG},

-	    {"DataDirectory", OPT_STR}, /* obsolete */

-	    {"DatabaseDirectory", OPT_STR}, /* clamd + freshclam */

-	    {"TCPAddr", OPT_STR},

-	    {"TCPSocket", OPT_NUM},

-	    {"LocalSocket", OPT_STR},

-	    {"MaxConnectionQueueLength", OPT_NUM},

-	    {"StreamSaveToDisk", OPT_NOARG},

-	    {"StreamMaxLength", OPT_COMPSIZE},

-	    {"MaxThreads", OPT_NUM},

-	    {"ThreadTimeout", OPT_NUM},

-	    {"MaxDirectoryRecursion", OPT_NUM},

-	    {"FollowDirectorySymlinks", OPT_NOARG},

-	    {"FollowFileSymlinks", OPT_NOARG},

-	    {"Foreground", OPT_NOARG},

-	    {"Debug", OPT_NOARG},

-	    {"FixStaleSocket", OPT_NOARG},

-	    {"User", OPT_STR},

-	    {"AllowSupplementaryGroups", OPT_NOARG},

-	    {"SelfCheck", OPT_NUM},

-	    {"VirusEvent", OPT_FULLSTR},

-	    {"ClamukoScanOnLine", OPT_NOARG},

-	    {"ClamukoScanOnOpen", OPT_NOARG},

-	    {"ClamukoScanOnClose", OPT_NOARG},

-	    {"ClamukoScanOnExec", OPT_NOARG},

-	    {"ClamukoIncludePath", OPT_STR},

-	    {"ClamukoExcludePath", OPT_STR},

-	    {"ClamukoMaxFileSize", OPT_COMPSIZE},

-	    {"ClamukoScanArchive", OPT_NOARG},

-	    {"DatabaseOwner", OPT_STR}, /* freshclam */

-	    {"Checks", OPT_NUM}, /* freshclam */

-	    {"UpdateLogFile", OPT_STR}, /* freshclam */

-	    {"DatabaseMirror", OPT_STR}, /* freshclam */

-	    {"MaxAttempts", OPT_NUM}, /* freshclam */

-	    {"HTTPProxyServer", OPT_STR}, /* freshclam */

-	    {"HTTPProxyPort", OPT_NUM}, /* freshclam */

-	    {"HTTPProxyUsername", OPT_STR}, /* freshclam */

-	    {"HTTPProxyPassword", OPT_STR}, /* freshclam */

-	    {"NotifyClamd", OPT_OPTARG}, /* freshclam */

-	    {"OnUpdateExecute", OPT_FULLSTR}, /* freshclam */

-	    {"OnErrorExecute", OPT_FULLSTR}, /* freshclam */

-	    {0, 0}

-	};

-

-

-    if((fs = fopen(cfgfile, "r")) == NULL) {

-	return NULL;

-    }

-

-

-    while(fgets(buff, LINE_LENGTH, fs)) {

-

-	line++;

-

-	if(buff[0] == '#')

-	    continue;

-

-	if(!strncmp("Example", buff, 7)) {

-	    fprintf(stderr, "ERROR: Please edit the example config file %s.\n", cfgfile);

-	    return NULL;

-	}

-

-

-	if((name = cli_strtok(buff, 0, " \r\n"))) {

-	    arg = cli_strtok(buff, 1, " \r\n");

-	    found = 0;

-	    for(i = 0; ; i++) {

-		pt = &cfg_options[i];

-		if(pt->name) {

-		    if(!strcmp(name, pt->name)) {

-			found = 1;

-			switch(pt->argtype) {

-			    case OPT_STR:

-				if(!arg) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires string as argument.\n", line, name);

-				    return NULL;

-				}

-				copt = regcfg(copt, name, arg, 0);

-				break;

-			    case OPT_FULLSTR:

-				if(!arg) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires string as argument.\n", line, name);

-				    return NULL;

-				}

-				/* FIXME: this one is an ugly hack of the above case */

-				free(arg);

-				arg = strstr(buff, " ");

-				arg = strdup(++arg);

-				copt = regcfg(copt, name, arg, 0);

-				break;

-			    case OPT_NUM:

-				if(!arg || !isnumb(arg)) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires numerical argument.\n", line, name);

-				    return NULL;

-				}

-				copt = regcfg(copt, name, NULL, atoi(arg));

-				free(arg);

-				break;

-			    case OPT_COMPSIZE:

-				if(!arg) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires argument.\n", line, name);

-				    return NULL;

-				}

-				ctype = tolower(arg[strlen(arg) - 1]);

-				if(ctype == 'm' || ctype == 'k') {

-				    char *cpy = mcalloc(strlen(arg), sizeof(char));

-				    strncpy(cpy, arg, strlen(arg) - 1);

-				    if(!isnumb(cpy)) {

-					fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires numerical (raw/K/M) argument.\n", line, name);

-					return NULL;

-				    }

-				    if(ctype == 'm')

-					calc = atoi(cpy) * 1024 * 1024;

-				    else

-					calc = atoi(cpy) * 1024;

-				    free(cpy);

-				} else {

-				    if(!isnumb(arg)) {

-					fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires numerical (raw/K/M) argument.\n", line, name);

-					return NULL;

-				    }

-				    calc = atoi(arg);

-				}

-				copt = regcfg(copt, name, NULL, calc);

-				free(arg);

-				break;

-			    case OPT_NOARG:

-				if(arg) {

-				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s doesn't support arguments (got '%s').\n", line, name, arg);

-				    return NULL;

-				}

-				copt = regcfg(copt, name, NULL, 0);

-				break;

-			    case OPT_OPTARG:

-				copt = regcfg(copt, name, arg, 0);

-				break;

-			    default:

-				fprintf(stderr, "ERROR: Parse error at line %d: Option %s is of unknown type %d\n", line, name, pt->argtype);

-				free(name);

-				free(arg);

-				break;

-			}

-		    }

-		} else

-		    break;

-	    } 

-

-	    if(!found) {

-		fprintf(stderr, "ERROR: Parse error at line %d: Unknown option %s.\n", line, name);

-		return NULL;

-	    }

-	}

-    }

-

-    fclose(fs);

-    return copt;

-}

-

-void freecfg(struct cfgstruct *copt)

-{

-    	struct cfgstruct *handler;

-    	struct cfgstruct *arg;

-

-    while (copt) {

-	arg = copt->nextarg;

-	while (arg) {

-	    if(arg->strarg) {

-		free(arg->optname);

-		free(arg->strarg);

-		handler = arg;

-		arg=arg->nextarg;

-		free(handler);

-	    }

-	}

-	if(copt->optname) {

-	    free(copt->optname);

-	}

-	if(copt->strarg) {

-	    free(copt->strarg);

-	}

-	handler = copt;

-	copt = copt->next;

-	free(handler);

-    }

-    return;

-}

-

-struct cfgstruct *regcfg(struct cfgstruct *copt, char *optname, char *strarg, int numarg)

-{

-	struct cfgstruct *newnode, *pt;

-

-    newnode = (struct cfgstruct *) mmalloc(sizeof(struct cfgstruct));

-    newnode->optname = optname;

-    newnode->nextarg = NULL;

-    newnode->next = NULL;

-

-    if(strarg)

-	newnode->strarg = strarg;

-    else {

-	newnode->strarg = NULL;

-	newnode->numarg = numarg;

-    }

-

-    if((pt = cfgopt(copt, optname))) {

-	while(pt->nextarg)

-	    pt = pt->nextarg;

-

-	pt->nextarg = newnode;

-	return copt;

-    } else {

-	newnode->next = copt;

-	return newnode;

-    }

-}

-

-struct cfgstruct *cfgopt(const struct cfgstruct *copt, const char *optname)

-{

-	struct cfgstruct *handler;

-

-    handler = (struct cfgstruct *) copt;

-

-    while(1) {

-	if(handler) {

-	    if(handler->optname)

-		if(!strcmp(handler->optname, optname))

-		    return handler;

-	} else break;

-	handler = handler->next;

-    }

-

-    return NULL;

-}

-

deleted file mode 100644

@@ -1,54 +0,0 @@

-/*

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

- *

- *  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., 675 Mass Ave, Cambridge, MA 02139, USA.

- */

-

-#ifndef __CFGFILE_H

-#define __CFGFILE_H

-

-#define LINE_LENGTH 1024

-

-

-#define OPT_STR 1 /* string argument */

-#define OPT_NUM 2 /* numerical argument */

-#define OPT_COMPSIZE 3 /* convert kilobytes (k) and megabytes (m) to bytes */

-#define OPT_NOARG 4 /* no argument */

-#define OPT_OPTARG 5 /* argument is optional, it's registered as string */

-#define OPT_FULLSTR 6 /* string argument, but get a full line */

-

-struct cfgoption {

-    const char *name;

-    int argtype;

-};

-

-struct cfgstruct {

-    char *optname;

-    char *strarg;

-    int numarg;

-    struct cfgstruct *nextarg;

-    struct cfgstruct *next;

-};

-

-

-struct cfgstruct *parsecfg(const char *cfgfile);

-

-struct cfgstruct *regcfg(struct cfgstruct *copt, char *optname, char *strarg, int numarg);

-

-struct cfgstruct *cfgopt(const struct cfgstruct *copt, const char *optname);

-

-void freecfg(struct cfgstruct *copt);

-

-#endif

@@ -33,7 +33,7 @@

 #include <grp.h>

 #include <clamav.h>

-#if defined(CLAMD_USE_SYSLOG) && !defined(C_AIX)

+#if defined(USE_SYSLOG) && !defined(C_AIX)

 #include <syslog.h>

 #endif

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

 #endif

 #include "options.h"

-#include "cfgfile.h"

+#include "cfgparser.h"

 #include "others.h"

 /* Fixes gcc warning */

 #include "../libclamav/others.h"

@@ -50,7 +50,9 @@

 #include "localserver.h"

 #include "others.h"

 #include "defaults.h"

-

+#include "memory.h"

+#include "output.h"

+#include "shared.h"

 void help(void);

 void daemonize(void);

@@ -107,14 +109,14 @@ void clamd(struct optstruct *opt)

     /* initialize logger */

     if(cfgopt(copt, "LogFileUnlock"))

-	loglock = 0;

+	logg_lock = 0;

     else

-	loglock = 1;

+	logg_lock = 1;

     if(cfgopt(copt, "LogTime"))

-	logtime = 1;

+	logg_time = 1;

     else

-	logtime = 0;

+	logg_time = 0;

     if(cfgopt(copt, "LogClean"))

 	logok = 1;

@@ -122,45 +124,44 @@ void clamd(struct optstruct *opt)

 	logok = 0;

     if((cpt = cfgopt(copt, "LogFileMaxSize")))

-	logsize = cpt->numarg;

+	logg_size = cpt->numarg;

     else

-	logsize = CL_DEFAULT_LOGSIZE;

+	logg_size = CL_DEFAULT_LOGSIZE;

     if(cfgopt(copt, "Debug")) /* enable debug messages in libclamav */

 	cl_debug();

     if(cfgopt(copt, "LogVerbose"))

-	logverbose = 1;

+	logg_verbose = 1;

     else

-	logverbose = 0;

+	logg_verbose = 0;

     if((cpt = cfgopt(copt, "LogFile"))) {

-	logfile = cpt->strarg;

-	if(logfile[0] != '/') {

+	logg_file = cpt->strarg;

+	if(logg_file[0] != '/') {

 	    fprintf(stderr, "ERROR: LogFile requires full path.\n");

 	    exit(1);

 	}

 	time(&currtime);

 	if(logg("+++ Started at %s", ctime(&currtime))) {

-	    fprintf(stderr, "ERROR: Problem with internal logger. Please check the permissions on the %s file.\n", logfile);

+	    fprintf(stderr, "ERROR: Problem with internal logger. Please check the permissions on the %s file.\n", logg_file);

 	    exit(1);

 	}

     } else

-	logfile = NULL;

+	logg_file = NULL;

-#if defined(CLAMD_USE_SYSLOG) && !defined(C_AIX)

+#if defined(USE_SYSLOG) && !defined(C_AIX)

     if((cpt = cfgopt(copt, "LogSyslog"))) {

 	openlog("clamd", LOG_PID, LOG_LOCAL6);

-	use_syslog = 1;

+	logg_syslog = 1;

 	syslog(LOG_INFO, "Daemon started.\n");

     } else

-	use_syslog = 0;

+	logg_syslog = 0;

 #endif

-

-    if(logsize)

-	logg("Log file size limited to %d bytes.\n", logsize);

+    if(logg_size)

+	logg("Log file size limited to %d bytes.\n", logg_size);

     else

 	logg("Log file size limit disabled.\n");

@@ -32,10 +32,11 @@

 #include "server.h"

 #include "others.h"

-#include "cfgfile.h"

+#include "cfgparser.h"

 #include "dazukoio.h"

 #include "clamuko.h"

 #include "defaults.h"

+#include "output.h"

 struct dazuko_access *acc;

@@ -30,10 +30,11 @@

 #include <errno.h>

 #include "options.h"

-#include "cfgfile.h"

+#include "cfgparser.h"

 #include "defaults.h"

 #include "others.h"

 #include "server.h"

+#include "output.h"

 int localserver(const struct optstruct *opt, const struct cfgstruct *copt, struct cl_node *root)

 {

@@ -36,6 +36,7 @@

 #include "options.h"

 #include "others.h"

 #include "../libclamav/others.h"

+#include "memory.h"

 void clamd(struct optstruct *opt);

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

 /*

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

+ *  Copyright (C) 2002 - 2004 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

@@ -24,9 +24,7 @@

 #include <stdarg.h>

 #include <stdlib.h>

 #include <string.h>

-#include <ctype.h>

 #include <unistd.h>

-#include <pthread.h>

 #include <fcntl.h>