open-dsi
/
clamav
mirror of https://github.com/Cisco-Talos/clamav
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small cleanups

Browse Source 
git-svn: trunk@455
remotes/push_mirror/metadata
Tomasz Kojm 21 years ago
parent ab2eac0728
commit 58bcf50207
12 changed files with 89 additions and 180 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      clamav-devel/ChangeLog
  2. 11
      clamav-devel/clamav-milter/Makefile.am
  3. 111
      clamav-devel/clamav-milter/Makefile.in
  4. 10
      clamav-devel/clamd/clamd.c
  5. 2
      clamav-devel/clamd/shared.h
  6. 37
      clamav-devel/clamdscan/clamdscan.c
  7. 32
      clamav-devel/clamscan/clamscan.c
  8. 7
      clamav-devel/clamscan/shared.h
  9. 32
      clamav-devel/freshclam/freshclam.c
  10. 2
      clamav-devel/freshclam/freshclam.h
  11. 10
      clamav-devel/shared/output.c
  12. 10
      clamav-devel/shared/output.h

5
clamav-devel/ChangeLog
Unescape View File

@ -1,3 +1,8 @@
Tue Mar 30 23:18:49 CEST 2004 (tk)
----------------------------------
* clamav-milter: adapt Makefile to new directory structure
* small code cleanup
Tue Mar 30 08:40:10 BST 2004 (trog)
-----------------------------------
* clamav.conf, shared/cfgparser.c: recognise ReadTimeout option

11
clamav-devel/clamav-milter/Makefile.am
Unescape View File

@ -21,9 +21,12 @@ if HAVE_MILTER
sbin_PROGRAMS = clamav-milter
clamav_milter_SOURCES = clamav-milter.c
clamav_milter_LDADD = $(top_builddir)/clamd/cfgfile.o $(top_builddir)/clamd/others.o $(top_builddir)/clamscan/getopt.o
clamav_milter_SOURCES =
$(top_srcdir)/shared/cfgparser.c \
$(top_srcdir)/shared/cfgparser.h \
$(top_srcdir)/shared/getopt.c \
$(top_srcdir)/shared/getopt.h \
clamav-milter.c
man_MANS = $(top_srcdir)/docs/man/clamav-milter.8
@ -33,5 +36,5 @@ endif
DEFS = @DEFS@ -DSENDMAIL_BIN=\"@SENDMAIL@\"
# CLAMD_LIBS is used, because clamav-milter requires the same libraries as clamd
LIBS = -L$(top_builddir)/libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@
INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)/clamscan
INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared
EXTRA_DIST = clamav-milter.c INSTALL

111
clamav-devel/clamav-milter/Makefile.in
Unescape View File

@ -120,16 +120,14 @@ install_sh = @install_sh@
# FIXME: check automake for 'and' (&&)
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@sbin_PROGRAMS = clamav-milter
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@clamav_milter_SOURCES = clamav-milter.c
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@clamav_milter_LDADD = $(top_builddir)/clamd/cfgfile.o $(top_builddir)/clamd/others.o $(top_builddir)/clamscan/getopt.o
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@clamav_milter_SOURCES =
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_srcdir)/docs/man/clamav-milter.8
DEFS = @DEFS@ -DSENDMAIL_BIN=\"@SENDMAIL@\"
# CLAMD_LIBS is used, because clamav-milter requires the same libraries as clamd
LIBS = -L$(top_builddir)/libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@
INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)/clamscan
INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared
EXTRA_DIST = clamav-milter.c INSTALL
subdir = clamav-milter
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@ -142,23 +140,15 @@ CONFIG_CLEAN_FILES =
@BUILD_CLAMD_TRUE@@HAVE_MILTER_FALSE@sbin_PROGRAMS =
PROGRAMS = $(sbin_PROGRAMS)
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@am_clamav_milter_OBJECTS = \
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ clamav-milter.$(OBJEXT)
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@am_clamav_milter_OBJECTS =
clamav_milter_OBJECTS = $(am_clamav_milter_OBJECTS)
@BUILD_CLAMD_FALSE@@HAVE_MILTER_TRUE@clamav_milter_DEPENDENCIES =
@BUILD_CLAMD_FALSE@@HAVE_MILTER_FALSE@clamav_milter_DEPENDENCIES =
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@clamav_milter_DEPENDENCIES = \
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_builddir)/clamd/cfgfile.o \
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_builddir)/clamd/others.o \
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_builddir)/clamscan/getopt.o
@BUILD_CLAMD_TRUE@@HAVE_MILTER_FALSE@clamav_milter_DEPENDENCIES =
clamav_milter_LDADD = $(LDADD)
clamav_milter_DEPENDENCIES =
clamav_milter_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)/clamav-milter.Po
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@ -166,7 +156,6 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@
DIST_SOURCES = $(clamav_milter_SOURCES)
NROFF = nroff
@ -177,7 +166,6 @@ SOURCES = $(clamav_milter_SOURCES)
all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu clamav-milter/Makefile
@ -220,30 +208,6 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamav-milter.Po@am__quote@
distclean-depend:
-rm -rf ./$(DEPDIR)
.c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
.c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `cygpath -w $<`
.c.lo:
@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
CCDEPMODE = @CCDEPMODE@
mostlyclean-libtool:
-rm -f *.lo
@ -292,42 +256,9 @@ uninstall-man8:
echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
rm -f $(DESTDIR)$(man8dir)/$$inst; \
done
ETAGS = etags
ETAGSFLAGS =
tags: TAGS
TAGS:
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$tags$$unique" \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
@ -391,8 +322,8 @@ clean-am: clean-generic clean-libtool clean-sbinPROGRAMS mostlyclean-am
distclean: distclean-am
distclean-am: clean-am distclean-compile distclean-depend \
distclean-generic distclean-libtool distclean-tags
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool
dvi: dvi-am
@ -425,19 +356,23 @@ uninstall-am: uninstall-info-am uninstall-man uninstall-sbinPROGRAMS
uninstall-man: uninstall-man8
.PHONY: GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-sbinPROGRAMS distclean distclean-compile \
distclean-depend distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am info info-am install \
install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
install-man8 install-sbinPROGRAMS install-strip installcheck \
installcheck-am installdirs maintainer-clean \
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
clean-sbinPROGRAMS distclean distclean-compile \
distclean-generic distclean-libtool distdir dvi dvi-am info \
info-am install install-am install-data install-data-am \
install-exec install-exec-am install-info install-info-am \
install-man install-man8 install-sbinPROGRAMS install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool tags uninstall \
uninstall-am uninstall-info-am uninstall-man uninstall-man8 \
mostlyclean-generic mostlyclean-libtool uninstall uninstall-am \
uninstall-info-am uninstall-man uninstall-man8 \
uninstall-sbinPROGRAMS
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_srcdir)/shared/cfgparser.c \
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_srcdir)/shared/cfgparser.h \
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_srcdir)/shared/getopt.c \
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(top_srcdir)/shared/getopt.h \
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ clamav-milter.c
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

10
clamav-devel/clamd/clamd.c
Unescape View File

@ -57,6 +57,8 @@
void help(void);
void daemonize(void);
short debug_mode = 0, logok = 0;
void clamd(struct optstruct *opt)
{
struct cfgstruct *copt, *cpt;
@ -89,8 +91,6 @@ void clamd(struct optstruct *opt)
#endif
debug_mode = 1;
} else {
debug_mode = 0;
}
/* parse the config file */
@ -110,18 +110,12 @@ void clamd(struct optstruct *opt)
if(cfgopt(copt, "LogFileUnlock"))
logg_lock = 0;
else
logg_lock = 1;
if(cfgopt(copt, "LogTime"))
logg_time = 1;
else
logg_time = 0;
if(cfgopt(copt, "LogClean"))
logok = 1;
else
logok = 0;
if((cpt = cfgopt(copt, "LogFileMaxSize")))
logg_size = cpt->numarg;

2
clamav-devel/clamd/shared.h
Unescape View File

@ -19,6 +19,6 @@
#ifndef __SHARED_H
#define __SHARED_H
short debug_mode, logok;
extern short debug_mode, logok;
#endif

37
clamav-devel/clamdscan/clamdscan.c
Unescape View File

@ -34,17 +34,8 @@
#include "client.h"
#include "output.h"
void help(void);
/* this local macro takes care about freeing memory at exit */
/*
#define mexit(i) if(opt) free_opt(opt); \
mprintf("*Memory freed. Exit code: %d\n", i); \
exit(i);
*/
#define mexit(i) exit(i)
void clamscan(struct optstruct *opt)
{
int ds, dms, ret;
@ -55,25 +46,20 @@ void clamscan(struct optstruct *opt)
/* initialize some important variables */
mprintf_disabled = 0;
if(optc(opt, 'v')) {
mprintf_verbose = 1;
logg_verbose = 1;
} else {
mprintf_verbose = 0;
logg_verbose = 0;
}
if(optl(opt, "quiet")) mprintf_quiet = 1;
else mprintf_quiet = 0;
if(optl(opt, "quiet"))
mprintf_quiet = 1;
if(optl(opt, "stdout")) mprintf_stdout = 1;
else mprintf_stdout = 0;
if(optl(opt, "stdout"))
mprintf_stdout = 1;
if(optc(opt, 'V')) {
mprintf("clamdscan / ClamAV version "VERSION"\n");
mexit(0);
exit(0);
}
if(optc(opt, 'h')) {
@ -81,21 +67,16 @@ void clamscan(struct optstruct *opt)
help();
}
if(optc(opt, 'i')) printinfected = 1;
else printinfected = 0;
if(optc(opt, 'i'))
printinfected = 1;
/* initialize logger */
/* FIXME: enable in the future */
logg_size = 0;
logg_lock = 0;
logg_time = 0;
if(optc(opt, 'l')) {
logg_file = getargc(opt, 'l');
if(logg("--------------------------------------\n")) {
mprintf("!Problem with internal logger.\n");
mexit(2);
exit(2);
}
} else
logg_file = NULL;
@ -125,7 +106,7 @@ void clamscan(struct optstruct *opt)
logg("Time: %d.%3.3d sec (%d m %d s)\n", ds, dms/1000, ds/60, ds%60);
}
mexit(ret);
exit(ret);
}
void help(void)

32
clamav-devel/clamscan/clamscan.c
Unescape View File

@ -42,6 +42,9 @@
void help(void);
struct s_info claminfo;
short recursion = 0, printinfected = 0, bell = 0;
int clamscan(struct optstruct *opt)
{
int ds, dms, ret;
@ -53,21 +56,16 @@ int clamscan(struct optstruct *opt)
/* initialize some important variables */
mprintf_disabled = 0;
if(optc(opt, 'v')) {
mprintf_verbose = 1;
logg_verbose = 1;
} else {
mprintf_verbose = 0;
logg_verbose = 0;
}
if(optl(opt, "quiet")) mprintf_quiet = 1;
else mprintf_quiet = 0;
if(optl(opt, "quiet"))
mprintf_quiet = 1;
if(optl(opt, "stdout")) mprintf_stdout = 1;
else mprintf_stdout = 0;
if(optl(opt, "stdout"))
mprintf_stdout = 1;
if(optl(opt, "debug")) {
#if defined(C_LINUX)
@ -93,21 +91,17 @@ int clamscan(struct optstruct *opt)
/* check other options */
if(optc(opt, 'r')) recursion = 1;
else recursion = 0;
if(optc(opt, 'r'))
recursion = 1;
if(optc(opt, 'i')) printinfected = 1;
else printinfected = 0;
if(optc(opt, 'i'))
printinfected = 1;
if(optl(opt, "bell")) bell = 1;
if(optl(opt, "bell"))
bell = 1;
/* initialize logger */
/* FIXME: enable in the future */
logg_size = 0;
logg_lock = 0;
logg_time = 0;
if(optc(opt, 'l')) {
logg_file = getargc(opt, 'l');
if(logg("--------------------------------------\n")) {

7
clamav-devel/clamscan/shared.h
Unescape View File

@ -19,8 +19,6 @@
#ifndef __SHARED_H
#define __SHARED_H
/* some global variables */
struct s_info {
int signs; /* number of signatures loaded */
int dirs; /* number of scanned directories */
@ -30,8 +28,9 @@ struct s_info {
int notmoved; /* number of not moved files (if --move) */
int errors; /* ... of errors */
long int blocks; /* number of read 16kb blocks */
} claminfo;
};
short recursion, printinfected, bell;
extern struct s_info claminfo;
extern short recursion, printinfected, bell;
#endif

32
clamav-devel/freshclam/freshclam.c
Unescape View File

@ -162,45 +162,36 @@ int freshclam(struct optstruct *opt)
if(optl(opt, "debug") || cfgopt(copt, "Debug"))
cl_debug();
mprintf_disabled = 0;
if(optc(opt, 'v'))
mprintf_verbose = 1;
if(optc(opt, 'v')) mprintf_verbose = 1;
else mprintf_verbose = 0;
if(optl(opt, "quiet"))
mprintf_quiet = 1;
if(optl(opt, "quiet")) mprintf_quiet = 1;
else mprintf_quiet = 0;
if(optl(opt, "stdout")) mprintf_stdout = 1;
else mprintf_stdout = 0;
if(optl(opt, "stdout"))
mprintf_stdout = 1;
if(optc(opt, 'V')) {
mprintf("freshclam / ClamAV version "VERSION"\n");
mexit(0);
exit(0);
}
/* initialize logger */
/* FIXME: enable in config file */
logg_size = 0;
logg_lock = 0;
logg_time = 0;
if(cfgopt(copt, "LogVerbose"))
logg_verbose = 1;
else
logg_verbose = 0;
if(optc(opt, 'l')) {
logg_file = getargc(opt, 'l');
if(logg("--------------------------------------\n")) {
mprintf("!Problem with internal logger.\n");
mexit(1);
exit(1);
}
} else if((cpt = cfgopt(copt, "UpdateLogFile"))) {
logg_file = cpt->strarg;
if(logg("--------------------------------------\n")) {
mprintf("!Problem with internal logger.\n");
mexit(1);
exit(1);
}
} else
logg_file = NULL;
@ -210,8 +201,7 @@ int freshclam(struct optstruct *opt)
openlog("freshclam", LOG_PID, LOG_LOCAL6);
logg_syslog = 1;
syslog(LOG_INFO, "Freshclam started.\n");
} else
logg_syslog = 0;
}
#endif
/* change the current working directory */
@ -248,7 +238,7 @@ int freshclam(struct optstruct *opt)
if(checks <= 0 || checks > 50) {
mprintf("@Number of checks must be between 1 and 50.\n");
mexit(41);
exit(41);
}
bigsleep = 24 * 3600 / checks;

2
clamav-devel/freshclam/freshclam.h
Unescape View File

@ -25,6 +25,4 @@ void help(void);
void daemonize(void);
int download(const struct cfgstruct *copt, const struct optstruct *opt);
#define mexit(i) exit(i)
#endif

10
clamav-devel/shared/output.c
Unescape View File

@ -50,6 +50,16 @@ pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
FILE *logg_fd = NULL;
short int logg_verbose = 0, logg_lock = 0, logg_time = 0;
int logg_size = 0;
const char *logg_file = NULL;
#if defined(USE_SYSLOG) && !defined(C_AIX)
short logg_syslog = 0;
#endif
short int mprintf_disabled = 0, mprintf_verbose = 0, mprintf_quiet = 0,
mprintf_stdout = 0;
int mdprintf(int desc, const char *str, ...)
{
va_list args;

10
clamav-devel/shared/output.h
Unescape View File

@ -30,15 +30,15 @@ int mdprintf(int desc, const char *str, ...);
int logg(const char *str, ...);
void logg_close(void);
short int logg_verbose, logg_lock, logg_time;
int logg_size;
const char *logg_file;
extern short int logg_verbose, logg_lock, logg_time;
extern int logg_size;
extern const char *logg_file;
#if defined(USE_SYSLOG) && !defined(C_AIX)
short logg_syslog;
extern short logg_syslog;
#endif
void mprintf(const char *str, ...);
short int mprintf_disabled, mprintf_verbose, mprintf_quiet, mprintf_stdout;
extern short int mprintf_disabled, mprintf_verbose, mprintf_quiet, mprintf_stdout;
#endif

Write Preview
Loading…
Cancel
Save