git-svn: trunk@1508
Tomasz Kojm authored on 2005/05/01 09:47:39... | ... |
@@ -28,6 +28,8 @@ clamav_milter_SOURCES = \ |
28 | 28 |
$(top_srcdir)/shared/getopt.h \ |
29 | 29 |
$(top_srcdir)/shared/memory.c \ |
30 | 30 |
$(top_srcdir)/shared/memory.h \ |
31 |
+ $(top_srcdir)/shared/misc.c \ |
|
32 |
+ $(top_srcdir)/shared/misc.h \ |
|
31 | 33 |
clamav-milter.c |
32 | 34 |
|
33 | 35 |
man_MANS = $(top_srcdir)/docs/man/clamav-milter.8 |
... | ... |
@@ -74,11 +74,13 @@ PROGRAMS = $(sbin_PROGRAMS) |
74 | 74 |
am__clamav_milter_SOURCES_DIST = $(top_srcdir)/shared/cfgparser.c \ |
75 | 75 |
$(top_srcdir)/shared/cfgparser.h $(top_srcdir)/shared/getopt.c \ |
76 | 76 |
$(top_srcdir)/shared/getopt.h $(top_srcdir)/shared/memory.c \ |
77 |
- $(top_srcdir)/shared/memory.h clamav-milter.c |
|
77 |
+ $(top_srcdir)/shared/memory.h $(top_srcdir)/shared/misc.c \ |
|
78 |
+ $(top_srcdir)/shared/misc.h clamav-milter.c |
|
78 | 79 |
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@am_clamav_milter_OBJECTS = \ |
79 | 80 |
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ cfgparser.$(OBJEXT) \ |
80 | 81 |
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ getopt.$(OBJEXT) \ |
81 | 82 |
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ memory.$(OBJEXT) \ |
83 |
+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ misc.$(OBJEXT) \ |
|
82 | 84 |
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ clamav-milter.$(OBJEXT) |
83 | 85 |
clamav_milter_OBJECTS = $(am_clamav_milter_OBJECTS) |
84 | 86 |
clamav_milter_LDADD = $(LDADD) |
... | ... |
@@ -216,6 +218,8 @@ target_vendor = @target_vendor@ |
216 | 216 |
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_srcdir)/shared/getopt.h \ |
217 | 217 |
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_srcdir)/shared/memory.c \ |
218 | 218 |
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_srcdir)/shared/memory.h \ |
219 |
+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_srcdir)/shared/misc.c \ |
|
220 |
+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_srcdir)/shared/misc.h \ |
|
219 | 221 |
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ clamav-milter.c |
220 | 222 |
|
221 | 223 |
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_srcdir)/docs/man/clamav-milter.8 |
... | ... |
@@ -297,6 +301,7 @@ distclean-compile: |
297 | 297 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamav-milter.Po@am__quote@ |
298 | 298 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ |
299 | 299 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memory.Po@am__quote@ |
300 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@ |
|
300 | 301 |
|
301 | 302 |
.c.o: |
302 | 303 |
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ |
... | ... |
@@ -361,6 +366,20 @@ memory.obj: $(top_srcdir)/shared/memory.c |
361 | 361 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
362 | 362 |
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o memory.obj `if test -f '$(top_srcdir)/shared/memory.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/memory.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/memory.c'; fi` |
363 | 363 |
|
364 |
+misc.o: $(top_srcdir)/shared/misc.c |
|
365 |
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.o -MD -MP -MF "$(DEPDIR)/misc.Tpo" -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c; \ |
|
366 |
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/misc.Tpo" "$(DEPDIR)/misc.Po"; else rm -f "$(DEPDIR)/misc.Tpo"; exit 1; fi |
|
367 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/shared/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@ |
|
368 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
|
369 |
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.o `test -f '$(top_srcdir)/shared/misc.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/misc.c |
|
370 |
+ |
|
371 |
+misc.obj: $(top_srcdir)/shared/misc.c |
|
372 |
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.obj -MD -MP -MF "$(DEPDIR)/misc.Tpo" -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`; \ |
|
373 |
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/misc.Tpo" "$(DEPDIR)/misc.Po"; else rm -f "$(DEPDIR)/misc.Tpo"; exit 1; fi |
|
374 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/shared/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@ |
|
375 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
|
376 |
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi` |
|
377 |
+ |
|
364 | 378 |
mostlyclean-libtool: |
365 | 379 |
-rm -f *.lo |
366 | 380 |
|
... | ... |
@@ -95,11 +95,6 @@ static const struct cli_magic_s cli_magic[] = { |
95 | 95 |
{0, "Hi. This is the qmail-send", 26, "Qmail bounce", CL_TYPE_MAIL}, |
96 | 96 |
{0, "\170\237\076\042", 4, "TNEF", CL_TYPE_TNEF}, |
97 | 97 |
|
98 |
- /* Others */ |
|
99 |
- |
|
100 |
- {0, "\320\317\021\340\241\261\032\341", |
|
101 |
- 8, "OLE2 container", CL_TYPE_MSOLE2}, |
|
102 |
- |
|
103 | 98 |
/* Graphics (may contain exploits against MS systems) */ |
104 | 99 |
|
105 | 100 |
{0, "GIF", 3, "GIF", CL_TYPE_GRAPHICS}, |
... | ... |
@@ -111,6 +106,11 @@ static const struct cli_magic_s cli_magic[] = { |
111 | 111 |
{0, "RIFF", 4, "RIFF", CL_TYPE_RIFF}, |
112 | 112 |
{0, "RIFX", 4, "RIFX", CL_TYPE_RIFF}, |
113 | 113 |
|
114 |
+ /* Others */ |
|
115 |
+ |
|
116 |
+ {0, "\320\317\021\340\241\261\032\341", 8, "OLE2 container", CL_TYPE_MSOLE2}, |
|
117 |
+ //{0, "\%PDF-", 5, "PDF document", CL_TYPE_PDF}, |
|
118 |
+ |
|
114 | 119 |
/* Ignored types */ |
115 | 120 |
|
116 | 121 |
{0, "\000\000\001\263", 4, "MPEG video stream", CL_TYPE_DATA}, |
... | ... |
@@ -118,7 +118,6 @@ static const struct cli_magic_s cli_magic[] = { |
118 | 118 |
{0, "OggS", 4, "Ogg Stream", CL_TYPE_DATA}, |
119 | 119 |
{0, "ID3", 3, "MP3", CL_TYPE_DATA}, |
120 | 120 |
{0, "\377\373\220", 3, "MP3", CL_TYPE_DATA}, |
121 |
- {0, "\%PDF-", 5, "PDF document", CL_TYPE_DATA}, |
|
122 | 121 |
{0, "\%!PS-Adobe-", 11, "PostScript", CL_TYPE_DATA}, |
123 | 122 |
{0, "\060\046\262\165\216\146\317", 7, "WMA/WMV/ASF", CL_TYPE_DATA}, |
124 | 123 |
{0, ".RMF" , 4, "Real Media File", CL_TYPE_DATA}, |