@@ -1,3 +1,9 @@

+Wed Dec 17 22:43:54 CET 2008 (tk)

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

+ * shared/optparser.[ch]: initial version of the unified option parser (bb#1215)

+ * clamd: use the new option parser

+ * more to come

+

 Tue Dec 16 15:18:28 EET 2008 (edwin)

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

  * libclamav/special.c: fix Swizzor detection: if no individual

@@ -294,7 +294,6 @@ DISTCLEANFILES = target.h

 @DISTCHECK_ENABLE_FLAGS_TRUE@DISTCHECK_CONFIGURE_FLAGS =  \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	--enable-milter --disable-clamav \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	CFLAGS="-Wno-pointer-sign \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=attributes \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Werror-implicit-function-declaration \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Werror -Wextra -Wall \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wbad-function-cast -Wcast-align \

@@ -324,8 +323,7 @@ DISTCLEANFILES = target.h

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=shadow \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=uninitialized \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-fdiagnostics-show-option \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-unused-parameter -Wpacked \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=packed \

+@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-unused-parameter \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=unreachable-code \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Winvalid-pch \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=invalid-pch -O2 \

@@ -23,16 +23,14 @@ 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/optparser.c \

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

     $(top_srcdir)/shared/getopt.c \

     $(top_srcdir)/shared/getopt.h \

     $(top_srcdir)/shared/misc.c \

     $(top_srcdir)/shared/misc.h \

     $(top_srcdir)/shared/network.c \

     $(top_srcdir)/shared/network.h \

-    $(top_srcdir)/shared/options.c \

-    $(top_srcdir)/shared/options.h \

     clamd.c \

     tcpserver.c \

     tcpserver.h \

@@ -72,25 +72,24 @@ am__installdirs = "$(DESTDIR)$(sbindir)"

 sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

 PROGRAMS = $(sbin_PROGRAMS)

 am__clamd_SOURCES_DIST = $(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/output.h $(top_srcdir)/shared/optparser.c \

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

 	$(top_srcdir)/shared/getopt.h $(top_srcdir)/shared/misc.c \

 	$(top_srcdir)/shared/misc.h $(top_srcdir)/shared/network.c \

-	$(top_srcdir)/shared/network.h $(top_srcdir)/shared/options.c \

-	$(top_srcdir)/shared/options.h clamd.c tcpserver.c tcpserver.h \

+	$(top_srcdir)/shared/network.h clamd.c tcpserver.c tcpserver.h \

 	localserver.c localserver.h session.c session.h thrmgr.c \

 	thrmgr.h server-th.c server.h scanner.c scanner.h others.c \

 	others.h clamuko.c clamuko.h dazukoio_compat12.c \

 	dazukoio_compat12.h dazukoio.c dazukoio.h dazuko_xp.h \

 	dazukoio_xp.h shared.h

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

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

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

 @BUILD_CLAMD_TRUE@	misc.$(OBJEXT) network.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	options.$(OBJEXT) clamd.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	tcpserver.$(OBJEXT) localserver.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	session.$(OBJEXT) thrmgr.$(OBJEXT) \

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

-@BUILD_CLAMD_TRUE@	others.$(OBJEXT) clamuko.$(OBJEXT) \

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

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

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

+@BUILD_CLAMD_TRUE@	scanner.$(OBJEXT) others.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	clamuko.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	dazukoio_compat12.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	dazukoio.$(OBJEXT)

 clamd_OBJECTS = $(am_clamd_OBJECTS)

@@ -271,16 +270,14 @@ top_srcdir = @top_srcdir@

 @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/optparser.c \

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

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

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

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/misc.c \

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/misc.h \

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/network.c \

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/network.h \

-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/options.c \

-@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/options.h \

 @BUILD_CLAMD_TRUE@    clamd.c \

 @BUILD_CLAMD_TRUE@    tcpserver.c \

 @BUILD_CLAMD_TRUE@    tcpserver.h \

@@ -399,7 +396,6 @@ mostlyclean-compile:

 distclean-compile:

 	-rm -f *.tab.c

-@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@

@@ -408,7 +404,7 @@ distclean-compile:

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

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

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

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

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optparser.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@

@@ -452,19 +448,19 @@ output.obj: $(top_srcdir)/shared/output.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 output.obj `if test -f '$(top_srcdir)/shared/output.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/output.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/output.c'; fi`

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

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

-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cfgparser.Tpo $(DEPDIR)/cfgparser.Po

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

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

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

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.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 cfgparser.o `test -f '$(top_srcdir)/shared/cfgparser.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/cfgparser.c

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

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

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

-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cfgparser.Tpo $(DEPDIR)/cfgparser.Po

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

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

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

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/optparser.Tpo $(DEPDIR)/optparser.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/optparser.c' object='optparser.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 cfgparser.obj `if test -f '$(top_srcdir)/shared/cfgparser.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/cfgparser.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/cfgparser.c'; fi`

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

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

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

@@ -508,20 +504,6 @@ network.obj: $(top_srcdir)/shared/network.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 network.obj `if test -f '$(top_srcdir)/shared/network.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/network.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/network.c'; fi`

-options.o: $(top_srcdir)/shared/options.c

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

-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/options.Tpo $(DEPDIR)/options.Po

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/options.c' object='options.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 options.o `test -f '$(top_srcdir)/shared/options.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/options.c

-

-options.obj: $(top_srcdir)/shared/options.c

-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT options.obj -MD -MP -MF $(DEPDIR)/options.Tpo -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`

-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/options.Tpo $(DEPDIR)/options.Po

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/options.c' object='options.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 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`

-

 mostlyclean-libtool:

 	-rm -f *.lo

@@ -58,8 +58,7 @@

 #include "libclamav/readdb.h"

 #include "shared/output.h"

-#include "shared/options.h"

-#include "shared/cfgparser.h"

+#include "shared/optparser.h"

 #include "shared/misc.h"

 #include "server.h"

@@ -85,22 +84,21 @@ static void help(void)

     printf("    --version                -V             Show version number.\n");

     printf("    --debug                                 Enable debug mode.\n");

     printf("    --config-file=FILE       -c FILE        Read configuration from FILE.\n\n");

-

 }

-static struct cfgstruct *copt;

+static struct optstruct *opts;

 /* needs to be global, so that valgrind reports it as reachable, and not

  * as definetely/indirectly lost when daemonizing clamd */

 static struct cl_engine *engine;

 int main(int argc, char **argv)

 {

-	const struct cfgstruct *cpt;

+	const struct optstruct *opt;

 #ifndef	C_WINDOWS

         struct passwd *user = NULL;

 #endif

 	time_t currtime;

 	const char *dbdir, *cfgfile;

-	char *pua_cats = NULL;

+	char *pua_cats = NULL, *pt;

 	int ret, tcpsock = 0, localsock = 0, i;

 	unsigned int sigs = 0;

 	int lsockets[2], nlsockets = 0;

@@ -109,16 +107,6 @@ int main(int argc, char **argv)

 #ifdef C_LINUX

 	struct stat sb;

 #endif

-	struct optstruct *opt;

-	const char *short_options = "hc:V";

-

-	static struct option long_options[] = {

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

-	    {"config-file", 1, 0, 'c'},

-	    {"version", 0, 0, 'V'},

-	    {"debug", 0, 0, 0},

-	    {0, 0, 0, 0}

-    	};

 #ifdef C_WINDOWS

     if(!pthread_win32_process_attach_np()) {

@@ -127,19 +115,18 @@ int main(int argc, char **argv)

     }

 #endif

-    opt = opt_parse(argc, argv, short_options, long_options, NULL, NULL);

-    if(!opt) {

-	mprintf("!Can't parse the command line\n");

+    if((opts = optparse(NULL, argc, argv, 1, OPT_CLAMD, NULL)) == NULL) {

+	mprintf("!Can't parse command line options\n");

 	return 1;

     }

-    if(opt_check(opt, "help")) {

+    if(optget(opts, "help")->enabled) {

     	help();

-	opt_free(opt);

+	optfree(opts);

 	return 0;

     }

-    if(opt_check(opt, "debug")) {

+    if(optget(opts, "debug")->enabled) {

 #if defined(C_LINUX)

 	    /* njh@bandsman.co.uk: create a dump if needed */

 	    struct rlimit rlim;

@@ -152,54 +139,50 @@ int main(int argc, char **argv)

     }

     /* parse the config file */

-    if(opt_check(opt, "config-file"))

-	cfgfile = opt_arg(opt, "config-file");

-    else

-	cfgfile = CONFDIR"/clamd.conf";

-

-    if((copt = getcfg(cfgfile, 1, OPT_CLAMD)) == NULL) {

-	fprintf(stderr, "ERROR: Can't open/parse the config file %s\n", cfgfile);

-	opt_free(opt);

+    cfgfile = optget(opts, "config-file")->strarg;

+    pt = strdup(cfgfile);

+    if((opts = optparse(cfgfile, 0, NULL, 1, OPT_CLAMD, opts)) == NULL) {

+	fprintf(stderr, "ERROR: Can't open/parse the config file %s\n", pt);

+	optfree(opts);

+	free(pt);

 	return 1;

     }

+    free(pt);

-    if(opt_check(opt, "version")) {

-	print_version(cfgopt(copt, "DatabaseDirectory")->strarg);

-	opt_free(opt);

-	freecfg(copt);

+    if(optget(opts, "version")->enabled) {

+	print_version(optget(opts, "DatabaseDirectory")->strarg);

+	optfree(opts);

 	return 0;

     }

-    opt_free(opt);

-

     umask(0);

     /* drop privileges */

 #if (!defined(C_OS2)) && (!defined(C_WINDOWS))

-    if(geteuid() == 0 && (cpt = cfgopt(copt, "User"))->enabled) {

-	if((user = getpwnam(cpt->strarg)) == NULL) {

-	    fprintf(stderr, "ERROR: Can't get information about user %s.\n", cpt->strarg);

-	    freecfg(copt);

+    if(geteuid() == 0 && (opt = optget(opts, "User"))->enabled) {

+	if((user = getpwnam(opt->strarg)) == NULL) {

+	    fprintf(stderr, "ERROR: Can't get information about user %s.\n", opt->strarg);

+	    optfree(opts);

 	    return 1;

 	}

-	if(cfgopt(copt, "AllowSupplementaryGroups")->enabled) {

+	if(optget(opts, "AllowSupplementaryGroups")->enabled) {

 #ifdef HAVE_INITGROUPS

-	    if(initgroups(cpt->strarg, user->pw_gid)) {

+	    if(initgroups(opt->strarg, user->pw_gid)) {

 		fprintf(stderr, "ERROR: initgroups() failed.\n");

-		freecfg(copt);

+		optfree(opts);

 		return 1;

 	    }

 #else

 	    mprintf("!AllowSupplementaryGroups: initgroups() is not available, please disable AllowSupplementaryGroups in %s\n", cfgfile);

-	    freecfg(copt);

+	    optfree(opts);

 	    return 1;

 #endif

 	} else {

 #ifdef HAVE_SETGROUPS

 	    if(setgroups(1, &user->pw_gid)) {

 		fprintf(stderr, "ERROR: setgroups() failed.\n");

-		freecfg(copt);

+		optfree(opts);

 		return 1;

 	    }

 #endif

@@ -207,39 +190,39 @@ int main(int argc, char **argv)

 	if(setgid(user->pw_gid)) {

 	    fprintf(stderr, "ERROR: setgid(%d) failed.\n", (int) user->pw_gid);

-	    freecfg(copt);

+	    optfree(opts);

 	    return 1;

 	}

 	if(setuid(user->pw_uid)) {

 	    fprintf(stderr, "ERROR: setuid(%d) failed.\n", (int) user->pw_uid);

-	    freecfg(copt);

+	    optfree(opts);

 	    return 1;

 	}

     }

 #endif

     /* initialize logger */

-    logg_lock = !cfgopt(copt, "LogFileUnlock")->enabled;

-    logg_time = cfgopt(copt, "LogTime")->enabled;

-    logok = cfgopt(copt, "LogClean")->enabled;

-    logg_size = cfgopt(copt, "LogFileMaxSize")->numarg;

-    logg_verbose = mprintf_verbose = cfgopt(copt, "LogVerbose")->enabled;

+    logg_lock = !optget(opts, "LogFileUnlock")->enabled;

+    logg_time = optget(opts, "LogTime")->enabled;

+    logok = optget(opts, "LogClean")->enabled;

+    logg_size = optget(opts, "LogFileMaxSize")->numarg;

+    logg_verbose = mprintf_verbose = optget(opts, "LogVerbose")->enabled;

-    if((cpt = cfgopt(copt, "LogFile"))->enabled) {

+    if((opt = optget(opts, "LogFile"))->enabled) {

 	char timestr[32];

-	logg_file = cpt->strarg;

+	logg_file = opt->strarg;

 	if(strlen(logg_file) < 2 || (logg_file[0] != '/' && logg_file[0] != '\\' && logg_file[1] != ':')) {

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

 	    logg_close();

-	    freecfg(copt);

+	    optfree(opts);

 	    return 1;

 	}

 	time(&currtime);

 	if(logg("#+++ Started at %s", cli_ctime(&currtime, timestr, sizeof(timestr)))) {

 	    fprintf(stderr, "ERROR: Can't initialize the internal logger\n");

 	    logg_close();

-	    freecfg(copt);

+	    optfree(opts);

 	    return 1;

 	}

     } else

@@ -248,22 +231,22 @@ int main(int argc, char **argv)

     if((ret = cl_init(CL_INIT_DEFAULT))) {

 	logg("!Can't initialize libclamav: %s\n", cl_strerror(ret));

 	logg_close();

-	freecfg(copt);

+	optfree(opts);

 	return 1;

     }

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

+    if(optget(opts, "Debug")->enabled) /* enable debug messages in libclamav */

 	cl_debug();

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

-    if(cfgopt(copt, "LogSyslog")->enabled) {

+    if(optget(opts, "LogSyslog")->enabled) {

 	    int fac = LOG_LOCAL6;

-	cpt = cfgopt(copt, "LogFacility");

-	if((fac = logg_facility(cpt->strarg)) == -1) {

-	    logg("!LogFacility: %s: No such facility.\n", cpt->strarg);

+	opt = optget(opts, "LogFacility");

+	if((fac = logg_facility(opt->strarg)) == -1) {

+	    logg("!LogFacility: %s: No such facility.\n", opt->strarg);

 	    logg_close();

-	    freecfg(copt);

+	    optfree(opts);

 	    return 1;

 	}

@@ -280,16 +263,16 @@ int main(int argc, char **argv)

     /* check socket type */

-    if(cfgopt(copt, "TCPSocket")->enabled)

+    if(optget(opts, "TCPSocket")->enabled)

 	tcpsock = 1;

-    if(cfgopt(copt, "LocalSocket")->enabled)

+    if(optget(opts, "LocalSocket")->enabled)

 	localsock = 1;

     if(!tcpsock && !localsock) {

 	logg("!Please define server type (local and/or TCP).\n");

 	logg_close();

-	freecfg(copt);

+	optfree(opts);

 	return 1;

     }

@@ -308,45 +291,45 @@ int main(int argc, char **argv)

     if(!(engine = cl_engine_new())) {

 	logg("!Can't initialize antivirus engine\n");

 	logg_close();

-	freecfg(copt);

+	optfree(opts);

 	return 1;

     }

     /* load the database(s) */

-    dbdir = cfgopt(copt, "DatabaseDirectory")->strarg;

+    dbdir = optget(opts, "DatabaseDirectory")->strarg;

     logg("#Reading databases from %s\n", dbdir);

-    if(cfgopt(copt, "DetectPUA")->enabled) {

+    if(optget(opts, "DetectPUA")->enabled) {

 	dboptions |= CL_DB_PUA;

-	if((cpt = cfgopt(copt, "ExcludePUA"))->enabled) {

+	if((opt = optget(opts, "ExcludePUA"))->enabled) {

 	    dboptions |= CL_DB_PUA_EXCLUDE;

 	    i = 0;

 	    logg("#Excluded PUA categories:");

-	    while(cpt) {

-		if(!(pua_cats = realloc(pua_cats, i + strlen(cpt->strarg) + 3))) {

+	    while(opt) {

+		if(!(pua_cats = realloc(pua_cats, i + strlen(opt->strarg) + 3))) {

 		    logg("!Can't allocate memory for pua_cats\n");

 		    logg_close();

-		    freecfg(copt);

+		    optfree(opts);

 		    cl_engine_free(engine);

 		    return 1;

 		}

-		logg("# %s", cpt->strarg);

-		sprintf(pua_cats + i, ".%s", cpt->strarg);

-		i += strlen(cpt->strarg) + 1;

+		logg("# %s", opt->strarg);

+		sprintf(pua_cats + i, ".%s", opt->strarg);

+		i += strlen(opt->strarg) + 1;

 		pua_cats[i] = 0;

-		cpt = cpt->nextarg;

+		opt = opt->nextarg;

 	    }

 	    logg("#\n");

 	    pua_cats[i] = '.';

 	    pua_cats[i + 1] = 0;

 	}

-	if((cpt = cfgopt(copt, "IncludePUA"))->enabled) {

+	if((opt = optget(opts, "IncludePUA"))->enabled) {

 	    if(pua_cats) {

 		logg("!ExcludePUA and IncludePUA cannot be used at the same time\n");

 		logg_close();

-		freecfg(copt);

+		optfree(opts);

 		free(pua_cats);

 		cl_engine_free(engine);

 		return 1;

@@ -354,19 +337,19 @@ int main(int argc, char **argv)

 	    dboptions |= CL_DB_PUA_INCLUDE;

 	    i = 0;

 	    logg("#Included PUA categories:");

-	    while(cpt) {

-		if(!(pua_cats = realloc(pua_cats, i + strlen(cpt->strarg) + 3))) {

+	    while(opt) {

+		if(!(pua_cats = realloc(pua_cats, i + strlen(opt->strarg) + 3))) {

 		    logg("!Can't allocate memory for pua_cats\n");

 		    logg_close();

-		    freecfg(copt);

+		    optfree(opts);

 		    cl_engine_free(engine);

 		    return 1;

 		}

-		logg("# %s", cpt->strarg);

-		sprintf(pua_cats + i, ".%s", cpt->strarg);

-		i += strlen(cpt->strarg) + 1;

+		logg("# %s", opt->strarg);

+		sprintf(pua_cats + i, ".%s", opt->strarg);

+		i += strlen(opt->strarg) + 1;

 		pua_cats[i] = 0;

-		cpt = cpt->nextarg;

+		opt = opt->nextarg;

 	    }

 	    logg("#\n");

 	    pua_cats[i] = '.';

@@ -377,7 +360,7 @@ int main(int argc, char **argv)

 	    if((ret = cl_engine_set(engine, CL_ENGINE_PUA_CATEGORIES, pua_cats))) {

 		logg("!cli_engine_set(CL_ENGINE_PUA_CATEGORIES) failed: %s\n", cl_strerror(ret));

 		logg_close();

-		freecfg(copt);

+		optfree(opts);

 		free(pua_cats);

 		cl_engine_free(engine);

 		return 1;

@@ -389,47 +372,47 @@ int main(int argc, char **argv)

     }

     /* set the temporary dir */

-    if((cpt = cfgopt(copt, "TemporaryDirectory"))->enabled) {

-	if((ret = cl_engine_set(engine, CL_ENGINE_TMPDIR, cpt->strarg))) {

+    if((opt = optget(opts, "TemporaryDirectory"))->enabled) {

+	if((ret = cl_engine_set(engine, CL_ENGINE_TMPDIR, opt->strarg))) {

 	    logg("!cli_engine_set(CL_ENGINE_TMPDIR) failed: %s\n", cl_strerror(ret));

 	    logg_close();

-	    freecfg(copt);

+	    optfree(opts);

 	    cl_engine_free(engine);

 	    return 1;

 	}

     }

-    if(cfgopt(copt, "LeaveTemporaryFiles")->enabled) {

+    if(optget(opts, "LeaveTemporaryFiles")->enabled) {

 	val32 = 1;

 	cl_engine_set(engine, CL_ENGINE_KEEPTMP, &val32);

     }

-    if(cfgopt(copt, "PhishingSignatures")->enabled)

+    if(optget(opts, "PhishingSignatures")->enabled)

 	dboptions |= CL_DB_PHISHING;

     else

 	logg("#Not loading phishing signatures.\n");

-    if(cfgopt(copt,"PhishingScanURLs")->enabled)

+    if(optget(opts,"PhishingScanURLs")->enabled)

 	dboptions |= CL_DB_PHISHING_URLS;

     else

 	logg("#Disabling URL based phishing detection.\n");

-    if(cfgopt(copt,"DevACOnly")->enabled) {

+    if(optget(opts,"DevACOnly")->enabled) {

 	logg("#Only using the A-C matcher.\n");

         val32 = 1;

 	cl_engine_set(engine, CL_ENGINE_AC_ONLY, &val32);

     }

-    if((cpt = cfgopt(copt, "DevACDepth"))->enabled) {

-	val32 = cpt->numarg;

+    if((opt = optget(opts, "DevACDepth"))->enabled) {

+	val32 = opt->numarg;

         cl_engine_set(engine, CL_ENGINE_AC_MAXDEPTH, &val32);

-	logg("#Max A-C depth set to %u\n", cpt->numarg);

+	logg("#Max A-C depth set to %u\n", opt->numarg);

     }

     if((ret = cl_load(dbdir, engine, &sigs, dboptions))) {

 	logg("!%s\n", cl_strerror(ret));

 	logg_close();

-	freecfg(copt);

+	optfree(opts);

 	cl_engine_free(engine);

 	return 1;

     }

@@ -438,7 +421,7 @@ int main(int argc, char **argv)

     if((ret = cl_engine_compile(engine)) != 0) {

 	logg("!Database initialization error: %s\n", cl_strerror(ret));

 	logg_close();

-	freecfg(copt);

+	optfree(opts);

 	cl_engine_free(engine);

 	return 1;

     }

@@ -450,15 +433,15 @@ int main(int argc, char **argv)

 	if(WSAStartup(MAKEWORD(2,2), &wsaData) != NO_ERROR) {

 	    logg("!Error at WSAStartup(): %d\n", WSAGetLastError());

 	    logg_close();

-	    freecfg(copt);

+	    optfree(opts);

 	    cl_engine_free(engine);

 	    return 1;

 	}

 #endif

-	lsockets[nlsockets] = tcpserver(copt);

+	lsockets[nlsockets] = tcpserver(opts);

 	if(lsockets[nlsockets] == -1) {

 	    logg_close();

-	    freecfg(copt);

+	    optfree(opts);

 	    cl_engine_free(engine);

 	    return 1;

 	}

@@ -466,10 +449,10 @@ int main(int argc, char **argv)

     }

     if(localsock) {

-	lsockets[nlsockets] = localserver(copt);

+	lsockets[nlsockets] = localserver(opts);

 	if(lsockets[nlsockets] == -1) {

 	    logg_close();

-	    freecfg(copt);

+	    optfree(opts);

 	    if(tcpsock)

 		closesocket(lsockets[0]);

 	    cl_engine_free(engine);

@@ -479,7 +462,7 @@ int main(int argc, char **argv)

     }

     /* fork into background */

-    if(!cfgopt(copt, "Foreground")->enabled) {

+    if(!optget(opts, "Foreground")->enabled) {

 #ifdef C_BSD	    

 	/* workaround for OpenBSD bug, see https://wwws.clamav.net/bugzilla/show_bug.cgi?id=885 */

 	for(ret=0;ret<nlsockets;ret++) {

@@ -489,7 +472,7 @@ int main(int argc, char **argv)

 	if(daemonize() == -1) {

 	    logg("!daemonize() failed\n");

 	    logg_close();

-	    freecfg(copt);

+	    optfree(opts);

 	    cl_engine_free(engine);

 	    return 1;

 	}

@@ -506,7 +489,7 @@ int main(int argc, char **argv)

         foreground = 1;

-    ret = acceptloop_th(lsockets, nlsockets, engine, dboptions, copt);

+    ret = acceptloop_th(lsockets, nlsockets, engine, dboptions, opts);

 #ifdef C_WINDOWS

     if(tcpsock)

@@ -515,13 +498,13 @@ int main(int argc, char **argv)

     if(!pthread_win32_process_detach_np()) {

 	logg("!Can't stop the win32 pthreads layer\n");

 	logg_close();

-	freecfg(copt);

+	optfree(opts);

 	return 1;

     }

 #endif

     logg_close();

-    freecfg(copt);

+    optfree(opts);

     return ret;

 }

@@ -31,7 +31,7 @@

 #include "libclamav/clamav.h"

-#include "shared/cfgparser.h"

+#include "shared/optparser.h"

 #include "shared/output.h"

 #include "server.h"

@@ -67,7 +67,7 @@ void *clamukoth(void *arg)

 	const char *virname;

         struct sigaction act;

 	unsigned long mask = 0;

-	const struct cfgstruct *pt;

+	const struct optstruct *pt;

 	short int scan;

 	int sizelimit = 0;

 	struct stat sb;

@@ -100,15 +100,15 @@ void *clamukoth(void *arg)

 	logg("Clamuko: Correctly registered with Dazuko.\n");

     /* access mask */

-    if(cfgopt(tharg->copt, "ClamukoScanOnOpen")->enabled) {

+    if(optget(tharg->opts, "ClamukoScanOnOpen")->enabled) {

 	logg("Clamuko: Scan-on-open mode activated.\n");

 	mask |= DAZUKO_ON_OPEN;

     }

-    if(cfgopt(tharg->copt, "ClamukoScanOnClose")->enabled) {

+    if(optget(tharg->opts, "ClamukoScanOnClose")->enabled) {

 	logg("Clamuko: Scan-on-close mode activated.\n");

 	mask |= DAZUKO_ON_CLOSE;

     }

-    if(cfgopt(tharg->copt, "ClamukoScanOnExec")->enabled) {

+    if(optget(tharg->opts, "ClamukoScanOnExec")->enabled) {

 	logg("Clamuko: Scan-on-exec mode activated.\n");

 	mask |= DAZUKO_ON_EXEC;

     }

@@ -125,7 +125,7 @@ void *clamukoth(void *arg)

 	return NULL;

     }

-    if((pt = cfgopt(tharg->copt, "ClamukoIncludePath"))->enabled) {

+    if((pt = optget(tharg->opts, "ClamukoIncludePath"))->enabled) {

 	while(pt) {

 	    if((dazukoAddIncludePath(pt->strarg))) {

 		logg("!Clamuko: Dazuko -> Can't include path %s\n", pt->strarg);

@@ -134,7 +134,7 @@ void *clamukoth(void *arg)

 	    } else

 		logg("Clamuko: Included path %s\n", pt->strarg);

-	    pt = (struct cfgstruct *) pt->nextarg;

+	    pt = (struct optstruct *) pt->nextarg;

 	}

     } else {

 	logg("!Clamuko: please include at least one path.\n");

@@ -142,7 +142,7 @@ void *clamukoth(void *arg)

 	return NULL;

     }

-    if((pt = cfgopt(tharg->copt, "ClamukoExcludePath"))->enabled) {

+    if((pt = optget(tharg->opts, "ClamukoExcludePath"))->enabled) {

 	while(pt) {

 	    if((dazukoAddExcludePath(pt->strarg))) {

 		logg("!Clamuko: Dazuko -> Can't exclude path %s\n", pt->strarg);

@@ -151,11 +151,11 @@ void *clamukoth(void *arg)

 	    } else

 		logg("Clamuko: Excluded path %s\n", pt->strarg);

-	    pt = (struct cfgstruct *) pt->nextarg;

+	    pt = (struct optstruct *) pt->nextarg;

 	}

     }

-    sizelimit = cfgopt(tharg->copt, "ClamukoMaxFileSize")->numarg;

+    sizelimit = optget(tharg->opts, "ClamukoMaxFileSize")->numarg;

     if(sizelimit)

 	logg("Clamuko: Max file size limited to %d bytes.\n", sizelimit);

     else

@@ -177,7 +177,7 @@ void *clamukoth(void *arg)

 	    if(scan && cl_scanfile(acc->filename, &virname, NULL, tharg->engine, tharg->options) == CL_VIRUS) {

 		logg("Clamuko: %s: %s FOUND\n", acc->filename, virname);

-		virusaction(acc->filename, virname, tharg->copt);

+		virusaction(acc->filename, virname, tharg->opts);

 		acc->deny = 1;

 	    } else

 		acc->deny = 0;

@@ -37,8 +37,7 @@

 #include "libclamav/clamav.h"

-#include "shared/options.h"

-#include "shared/cfgparser.h"

+#include "shared/optparser.h"

 #include "others.h"

 #include "server.h"

@@ -46,7 +45,7 @@

 #include "localserver.h"

 #ifdef C_WINDOWS

-int localserver(const struct cfgstruct *copt)

+int localserver(const struct optstruct *opts)

 {

     logg("!Localserver is not supported on this platform");

     return -1;

@@ -54,7 +53,7 @@ int localserver(const struct cfgstruct *copt)

 #else

-int localserver(const struct cfgstruct *copt)

+int localserver(const struct optstruct *opts)

 {

 	struct sockaddr_un server;

 	int sockfd, backlog;

@@ -63,7 +62,7 @@ int localserver(const struct cfgstruct *copt)

     memset((char *) &server, 0, sizeof(server));

     server.sun_family = AF_UNIX;

-    strncpy(server.sun_path, cfgopt(copt, "LocalSocket")->strarg, sizeof(server.sun_path));

+    strncpy(server.sun_path, optget(opts, "LocalSocket")->strarg, sizeof(server.sun_path));

     server.sun_path[sizeof(server.sun_path)-1]='\0';

     if((sockfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {

@@ -79,7 +78,7 @@ int localserver(const struct cfgstruct *copt)

 		close(sockfd);

 		return -1;

 	    }

-	    if(cfgopt(copt, "FixStaleSocket")->enabled) {

+	    if(optget(opts, "FixStaleSocket")->enabled) {

 		logg("#LOCAL: Removing stale socket file %s\n", server.sun_path);

 		if(unlink(server.sun_path) == -1) {

 		    estr = strerror(errno);

@@ -108,7 +107,7 @@ int localserver(const struct cfgstruct *copt)

     logg("#LOCAL: Unix socket file %s\n", server.sun_path);

-    backlog = cfgopt(copt, "MaxConnectionQueueLength")->numarg;

+    backlog = optget(opts, "MaxConnectionQueueLength")->numarg;

     logg("#LOCAL: Setting connection queue length to %d\n", backlog);

     if(listen(sockfd, backlog) == -1) {

@@ -19,8 +19,8 @@

 #ifndef __LOCALSERVER_H

 #define __LOCALSERVER_H

-#include "shared/cfgparser.h"

+#include "shared/optparser.h"

-int localserver(const struct cfgstruct *copt);

+int localserver(const struct optstruct *opts);

 #endif

@@ -74,7 +74,7 @@

 #endif /* HAVE_POLL_H */

 #endif /* HAVE_POLL */

-#include "shared/cfgparser.h"

+#include "shared/optparser.h"

 #include "shared/output.h"

 #include "session.h"

@@ -84,24 +84,24 @@

 #define ENV_VIRUS "CLAM_VIRUSEVENT_VIRUSNAME"

 #ifdef	C_WINDOWS

-void virusaction(const char *filename, const char *virname, const struct cfgstruct *copt)

+void virusaction(const char *filename, const char *virname, const struct optstruct *opts)

 {

-    if(cfgopt(copt, "VirusEvent")->enabled)

+    if(optget(opts, "VirusEvent")->enabled)

 	logg("^VirusEvent is not supported on this platform");	/* Yet */

 }

 #else

 static pthread_mutex_t virusaction_lock = PTHREAD_MUTEX_INITIALIZER;

-void virusaction(const char *filename, const char *virname, const struct cfgstruct *copt)

+void virusaction(const char *filename, const char *virname, const struct optstruct *opts)

 {

 	pid_t pid;

-	const struct cfgstruct *cpt;

+	const struct optstruct *opt;

 	char *buffer, *pt, *cmd, *buffer_file, *buffer_vir;

 	size_t j;

 	char *env[4];

-	if(!(cpt = cfgopt(copt, "VirusEvent"))->enabled)

+	if(!(opt = optget(opts, "VirusEvent"))->enabled)

 		return;

 	env[0] = getenv("PATH");

@@ -120,7 +120,7 @@ void virusaction(const char *filename, const char *virname, const struct cfgstru

 	}

 	env[j++] = NULL;

-	cmd = strdup(cpt->strarg);

+	cmd = strdup(opt->strarg);

 	if(cmd && (pt = strstr(cmd, "%v"))) {

 		buffer = (char *) malloc(strlen(cmd) + strlen(virname) + 10);

@@ -24,12 +24,12 @@

 #endif

 #include <stdlib.h>

-#include "shared/cfgparser.h"

+#include "shared/optparser.h"

 int poll_fds(int *fds, int nfds, int timeout_sec, int check_signals);

 int poll_fd(int fd, int timeout_sec, int check_signals);

 int is_fd_connected(int fd);

-void virusaction(const char *filename, const char *virname, const struct cfgstruct *copt);

+void virusaction(const char *filename, const char *virname, const struct optstruct *opts);

 int writen(int fd, void *buff, unsigned int count);

 int readsock(int sockfd, char *buf, size_t size, unsigned char delim, int timeout_sec, int force_delim, int read_command);

@@ -56,7 +56,7 @@

 #include "libclamav/clamav.h"

 #include "libclamav/others.h"