Browse code

update

git-svn: trunk@1005

Tomasz Kojm authored on 2004/10/16 09:52:51
Showing 6 changed files
... ...
@@ -1,3 +1,8 @@
1
+Sat Oct 16 02:41:17 CEST 2004 (tk)
2
+----------------------------------
3
+  * clamdscan: add missing support for --no-summary (problem reported by
4
+	       Matt Leyda <mfleyda*e-one.com>)
5
+
1 6
 Sat Oct 16 01:01:49 CEST 2004 (tk)
2 7
 ----------------------------------
3 8
   * libclamav/matcher-bm.c: speed up
... ...
@@ -46,7 +46,7 @@ while test $# -gt 0; do
46 46
 	;;
47 47
 
48 48
     --version)
49
-	echo devel-20041010
49
+	echo devel-20041016
50 50
 	exit 0
51 51
 	;;
52 52
 
... ...
@@ -95,7 +95,7 @@ void clamscan(struct optstruct *opt)
95 95
     ret = client(opt, &infected);
96 96
 
97 97
 /* Implement STATUS in clamd */
98
-    if(!optl(opt, "disable-summary")) {
98
+    if(!optl(opt, "disable-summary") && !optl(opt, "no-summary")) {
99 99
 	gettimeofday(&t2, &tz);
100 100
 	ds = t2.tv_sec - t1.tv_sec;
101 101
 	dms = t2.tv_usec - t1.tv_usec;
... ...
@@ -1029,7 +1029,7 @@ Optional Features:
1029 1029
   --enable-debug	  enable debug code
1030 1030
   --enable-bigstack	  increase thread stack size
1031 1031
   --disable-gethostbyname_r	  disable support for gethostbyname_r
1032
-  --enable-gethostbyname_r	  enable support for readdir_r
1032
+  --enable-readdir_r		    enable support for readdir_r
1033 1033
 
1034 1034
 Optional Packages:
1035 1035
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
... ...
@@ -628,7 +628,7 @@ if test -z "$ac_cv_readdir_args"; then
628 628
 fi
629 629
 
630 630
 AC_ARG_ENABLE(readdir_r,
631
-[  --enable-gethostbyname_r	  enable support for readdir_r],,
631
+[  --enable-readdir_r		    enable support for readdir_r],,
632 632
 disable_readdir_r="yes")
633 633
 
634 634
 if test "$disable_readdir_r" = "yes"; then
... ...
@@ -58,7 +58,7 @@ host_triplet = @host@
58 58
 target_triplet = @target@
59 59
 bin_PROGRAMS = sigtool$(EXEEXT)
60 60
 subdir = sigtool
61
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING
61
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
62 62
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
63 63
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
64 64
 	$(top_srcdir)/configure.in