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

+Thu Jun 15 15:55:08 CEST 2006 (tk)

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

+  * sigtool/sigtool.c: new option --run-cdiff

+

 Thu Jun 15 15:03:55 CEST 2006 (tk)

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

   * shared/cdiff.[ch]: new files (interpreter for scripted database updates)

@@ -71,7 +71,8 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

 PROGRAMS = $(bin_PROGRAMS)

 am_sigtool_OBJECTS = output.$(OBJEXT) getopt.$(OBJEXT) \

 	memory.$(OBJEXT) cfgparser.$(OBJEXT) misc.$(OBJEXT) \

-	options.$(OBJEXT) vba.$(OBJEXT) sigtool.$(OBJEXT)

+	options.$(OBJEXT) cdiff.$(OBJEXT) vba.$(OBJEXT) \

+	sigtool.$(OBJEXT)

 sigtool_OBJECTS = $(am_sigtool_OBJECTS)

 sigtool_DEPENDENCIES = $(top_builddir)/clamscan/others.o

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

@@ -217,6 +218,8 @@ sigtool_SOURCES = \

     $(top_srcdir)/shared/misc.h \

     $(top_srcdir)/shared/options.c \

     $(top_srcdir)/shared/options.h \

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

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

     vba.c \

     vba.h \

     sigtool.c

@@ -294,6 +297,7 @@ mostlyclean-compile:

 distclean-compile:

 	-rm -f *.tab.c

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

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

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

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

@@ -408,6 +412,20 @@ options.obj: $(top_srcdir)/shared/options.c

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

 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o options.obj `if test -f '$(top_srcdir)/shared/options.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/options.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/options.c'; fi`

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

+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdiff.o -MD -MP -MF "$(DEPDIR)/cdiff.Tpo" -c -o cdiff.o `test -f '$(top_srcdir)/shared/cdiff.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/cdiff.c; \

+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cdiff.Tpo" "$(DEPDIR)/cdiff.Po"; else rm -f "$(DEPDIR)/cdiff.Tpo"; exit 1; fi

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

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

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

+

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

+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdiff.obj -MD -MP -MF "$(DEPDIR)/cdiff.Tpo" -c -o cdiff.obj `if test -f '$(top_srcdir)/shared/cdiff.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/cdiff.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/cdiff.c'; fi`; \

+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cdiff.Tpo" "$(DEPDIR)/cdiff.Po"; else rm -f "$(DEPDIR)/cdiff.Tpo"; exit 1; fi

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

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

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdiff.obj `if test -f '$(top_srcdir)/shared/cdiff.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/cdiff.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/cdiff.c'; fi`

+

 mostlyclean-libtool:

 	-rm -f *.lo

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

 #include "shared/output.h"

 #include "shared/cfgparser.h"

 #include "shared/misc.h"

+#include "shared/cdiff.h"

 #include "libclamav/cvd.h"

 #include "libclamav/others.h"

@@ -805,6 +806,20 @@ static int vbadump(struct optstruct *opt)

     return 0;

 }

+static int runcdiff(struct optstruct *opt)

+{

+	int fd, ret;

+

+

+    if((fd = open(opt_arg(opt, "run-cdiff"), O_RDONLY)) == -1)

+	return -1;

+

+    ret = cdiff_apply(fd);

+    close(fd);

+

+    return ret;

+}

+

 void help(void)

 {

     mprintf("\n");

@@ -829,6 +844,8 @@ void help(void)

     mprintf("    --list-sigs[=FILE]     -l[FILE]        List signature names\n");

     mprintf("    --vba=FILE                             Extract VBA/Word6 macro code\n");

     mprintf("    --vba-hex=FILE                         Extract Word6 macro code with hex values\n");

+    mprintf("    --vba-hex=FILE                         Extract Word6 macro code with hex values\n");

+    mprintf("    --run-cdiff=FILE       -r FILE         Execute update script FILE in cwd\n");

     mprintf("\n");

     return;

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

 {

 	int ret = 1;

         struct optstruct *opt;

-	const char *short_options = "hvVb:i:u:l::";

+	const char *short_options = "hvVb:i:u:l::r:";

 	static struct option long_options[] = {

 	    {"help", 0, 0, 'h'},

 	    {"quiet", 0, 0, 0},

@@ -858,6 +875,7 @@ int main(int argc, char **argv)

 	    {"list-sigs", 2, 0, 'l'},

 	    {"vba", 1, 0 ,0},

 	    {"vba-hex", 1, 0, 0},

+	    {"run-cdiff", 1, 0, 'r'},

 	    {0, 0, 0, 0}

     	};

@@ -906,6 +924,8 @@ int main(int argc, char **argv)

 	ret = listsigs(opt);

     else if(opt_check(opt, "vba") || opt_check(opt, "vba-hex"))

 	ret = vbadump(opt);

+    else if(opt_check(opt, "run-cdiff"))

+	ret = runcdiff(opt);

     else

 	help();