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

+Tue Dec 30 22:29:50 CET 2008 (tk)

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

+ * shared/optparser.c, clamdscan: use the new option parser (bb#1215)

+

 Tue Dec 30 11:43:10 CET 2008 (tk)

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

  * shared/optparser.c, clamscan: use the new option parser; changes in switches:

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

     }

 #endif

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

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

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

 	return 1;

     }

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

     /* parse the config file */

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

     pt = strdup(cfgfile);

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

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

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

 	free(pt);

 	return 1;

@@ -23,21 +23,18 @@ bin_PROGRAMS = clamdscan

 clamdscan_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/misc.c \

     $(top_srcdir)/shared/misc.h \

     $(top_srcdir)/shared/getopt.c \

     $(top_srcdir)/shared/getopt.h \

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

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

     $(top_srcdir)/libclamav/regex/strlcpy.c\

     clamd_fdscan.c \

     clamd_fdscan.h \

     clamdscan.c \

     client.c \

-    client.h \

-    defaults.h

+    client.h

 endif

@@ -72,18 +72,17 @@ am__installdirs = "$(DESTDIR)$(bindir)"

 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

 PROGRAMS = $(bin_PROGRAMS)

 am__clamdscan_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/misc.c \

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

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

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

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

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

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

 	$(top_srcdir)/libclamav/regex/strlcpy.c clamd_fdscan.c \

-	clamd_fdscan.h clamdscan.c client.c client.h defaults.h

+	clamd_fdscan.h clamdscan.c client.c client.h

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

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

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

-@BUILD_CLAMD_TRUE@	strlcpy.$(OBJEXT) clamd_fdscan.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	clamdscan.$(OBJEXT) client.$(OBJEXT)

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

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

+@BUILD_CLAMD_TRUE@	clamd_fdscan.$(OBJEXT) clamdscan.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	client.$(OBJEXT)

 clamdscan_OBJECTS = $(am_clamdscan_OBJECTS)

 clamdscan_LDADD = $(LDADD)

 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

@@ -262,21 +261,18 @@ top_srcdir = @top_srcdir@

 @BUILD_CLAMD_TRUE@clamdscan_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/misc.c \

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

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

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

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

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

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/libclamav/regex/strlcpy.c\

 @BUILD_CLAMD_TRUE@    clamd_fdscan.c \

 @BUILD_CLAMD_TRUE@    clamd_fdscan.h \

 @BUILD_CLAMD_TRUE@    clamdscan.c \

 @BUILD_CLAMD_TRUE@    client.c \

-@BUILD_CLAMD_TRUE@    client.h \

-@BUILD_CLAMD_TRUE@    defaults.h

+@BUILD_CLAMD_TRUE@    client.h

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamdscan$(EXEEXT)

@@ -368,13 +364,12 @@ 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_fdscan.Po@am__quote@

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

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

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

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.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)/output.Po@am__quote@

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

@@ -413,19 +408,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`

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

 @am__fastdepCC_TRUE@	$(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

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

-

 strlcpy.o: $(top_srcdir)/libclamav/regex/strlcpy.c

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

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

@@ -28,14 +28,11 @@

 #include <time.h>

 #include <signal.h>

-#include "options.h"

-#include "others.h"

-#include "defaults.h"

-#include "client.h"

-#include "output.h"

-#include "misc.h"

+#include "shared/output.h"

+#include "shared/misc.h"

+#include "shared/optparser.h"

-#include "clamscan/clamscan_opt.h"

+#include "client.h"

 void help(void);

@@ -65,62 +62,56 @@ int main(int argc, char **argv)

 	struct timeval t1, t2;

 	struct timezone tz;

 	time_t starttime;

-	struct optstruct *opt;

-	const char *clamdscan_accepted[] = { "help", "version", "verbose", "quiet",

-				  "stdout", "log", "move", "copy", "remove",

-				  "config-file", "no-summary",  "fdpass",

-				  "disable-summary", "multiscan", "reload",

-				  "infected",

-				  NULL };

-

-

-    opt = opt_parse(argc, argv, clamscan_shortopt, clamscan_longopt, clamdscan_accepted, NULL);

-    if(!opt) {

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

+        struct optstruct *opts;

+        const struct optstruct *opt;

+

+

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

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

 	return 2;

     }

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

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

 	mprintf_verbose = 1;

 	logg_verbose = 1;

     }

-    if(opt_check(opt, "quiet"))

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

 	mprintf_quiet = 1;

-    if(opt_check(opt, "stdout"))

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

 	mprintf_stdout = 1;

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

-	print_server_version(opt);

-	opt_free(opt);

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

+	print_server_version(opts);

+	optfree(opts);

 	exit(0);

     }

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

-	opt_free(opt);

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

+	optfree(opts);

     	help();

     }

-    if(opt_check(opt, "infected"))

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

 	printinfected = 1;

     /* initialize logger */

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

-	logg_file = opt_arg(opt, "log");

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

+	logg_file = opt->strarg;

 	if(logg("--------------------------------------\n")) {

 	    mprintf("!Problem with internal logger.\n");

-	    opt_free(opt);

+	    optfree(opts);

 	    exit(2);

 	}

     } else 

 	logg_file = NULL;

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

-	ret = reload_server_database(opt);

-	opt_free(opt);

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

+	ret = reload_server_database(opts);

+	optfree(opts);

 	logg_close();

 	exit(ret);

     }

@@ -130,10 +121,10 @@ int main(int argc, char **argv)

     gettimeofday(&t1, &tz);

-    ret = client(opt, &infected);

+    ret = client(opts, &infected);

     /* TODO: Implement STATUS in clamd */

-    if((infected || ret != 2) && !opt_check(opt, "disable-summary") && !opt_check(opt, "no-summary")) {

+    if((infected || ret != 2) && !optget(opts, "no-summary")->enabled) {

 	gettimeofday(&t2, &tz);

 	ds = t2.tv_sec - t1.tv_sec;

 	dms = t2.tv_usec - t1.tv_usec;

@@ -151,7 +142,7 @@ int main(int argc, char **argv)

     }

     logg_close();

-    opt_free(opt);

+    optfree(opts);

     exit(ret);

 }

@@ -40,23 +40,21 @@

 #include <sys/uio.h>

 #endif

-#include "others.h"

-#include "defaults.h"

-#include "options.h"

-#include "cfgparser.h"

-#include "output.h"

-#include "misc.h"

-#include "str.h"

+#include "shared/optparser.h"

+#include "shared/output.h"

+#include "shared/misc.h"

+#include "libclamav/str.h"

+

 #include "client.h"

 #include "clamd_fdscan.h"

 #define SOCKET_INET	AF_INET

-void move_infected(const char *filename, const struct optstruct *opt);

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

 int notremoved = 0, notmoved = 0;

 int printinfected = 0;

-static int dsresult(int sockd, const struct optstruct *opt)

+static int dsresult(int sockd, const struct optstruct *opts)

 {

 	int infected = 0, waserror = 0;

 	char buff[4096], *pt;

@@ -68,7 +66,7 @@ static int dsresult(int sockd, const struct optstruct *opt)

 #else /* FIXME: accoriding to YD OS/2 does not support dup() for sockets */

     if((fd = fdopen(sockd, "r")) == NULL) {

 #endif

-	logg("^Can't open descriptor for reading.\n");

+	logg("!Can't open descriptor for reading.\n");

 	return -1;

     }

@@ -76,16 +74,16 @@ static int dsresult(int sockd, const struct optstruct *opt)

 	if(strstr(buff, "FOUND\n")) {

 	    infected++;

 	    logg("%s", buff);

-	    if(opt_check(opt, "move") || opt_check(opt, "copy")) {

+	    if(optget(opts, "move")->enabled || optget(opts, "copy")->enabled) {

 		/* filename: Virus FOUND */

 		if((pt = strrchr(buff, ':'))) {

 		    *pt = 0;

-		    move_infected(buff, opt);

+		    move_infected(buff, opts);

 		} else {

-		    logg("!Incorrect output from clamd. File not %s.\n", opt_check(opt, "move") ? "moved" : "copied");

+		    logg("!Incorrect output from clamd. File not %s.\n", optget(opts, "move")->enabled ? "moved" : "copied");

 		}

-	    } else if(opt_check(opt, "remove")) {

+	    } else if(optget(opts, "remove")->enabled) {

 		if(!(pt = strrchr(buff, ':'))) {

 		    logg("!Incorrect output from clamd. File not removed.\n");

 		} else {

@@ -113,7 +111,7 @@ static int dsresult(int sockd, const struct optstruct *opt)

     return infected ? infected : (waserror ? -1 : 0);

 }

-static int dsfile(int sockd, const char *scantype, const char *filename, const struct optstruct *opt)

+static int dsfile(int sockd, const char *scantype, const char *filename, const struct optstruct *opts)

 {

 	int ret;

 	char *scancmd;

@@ -130,7 +128,7 @@ static int dsfile(int sockd, const char *scantype, const char *filename, const s

     free(scancmd);

-    ret = dsresult(sockd, opt);

+    ret = dsresult(sockd, opts);

     if(!ret && !printinfected)

 	logg("~%s: OK\n", filename);

@@ -138,7 +136,7 @@ static int dsfile(int sockd, const char *scantype, const char *filename, const s

     return ret;

 }

-static int dsstream(int sockd, const struct optstruct *opt)

+static int dsstream(int sockd, const struct optstruct *opts)

 {

 	int wsockd, loopw = 60, bread, port, infected = 0;

 	struct sockaddr_in server;

@@ -148,7 +146,7 @@ static int dsstream(int sockd, const struct optstruct *opt)

     if(write(sockd, "STREAM", 6) <= 0) {

-	logg("^Can't write to the socket.\n");

+	logg("!Can't write to the socket.\n");

 	return 2;

     }

@@ -165,7 +163,7 @@ static int dsstream(int sockd, const struct optstruct *opt)

     }

     if(!loopw) {

-	logg("^Daemon not ready for stream scanning.\n");

+	logg("!Daemon not ready for stream scanning.\n");

 	return -1;

     }

@@ -173,7 +171,7 @@ static int dsstream(int sockd, const struct optstruct *opt)

     if((wsockd = socket(SOCKET_INET, SOCK_STREAM, 0)) < 0) {

 	perror("socket()");

-	logg("^Can't create the socket.\n");

+	logg("!Can't create the socket.\n");

 	return -1;

     }

@@ -183,7 +181,7 @@ static int dsstream(int sockd, const struct optstruct *opt)

     peer_size = sizeof(peer);

     if(getpeername(sockd, (struct sockaddr *) &peer, &peer_size) < 0) {

 	perror("getpeername()");

-	logg("^Can't get socket peer name.\n");

+	logg("!Can't get socket peer name.\n");

 	return -1;

     }

@@ -195,20 +193,20 @@ static int dsstream(int sockd, const struct optstruct *opt)

 	    server.sin_addr.s_addr = peer.sin_addr.s_addr;

 	    break;

 	default:

-	    logg("^Unexpected socket type: %d.\n", peer.sin_family);

+	    logg("!Unexpected socket type: %d.\n", peer.sin_family);

 	    return -1;

     }

     if(connect(wsockd, (struct sockaddr *) &server, sizeof(struct sockaddr_in)) < 0) {

 	close(wsockd);

 	perror("connect()");

-	logg("^Can't connect to clamd [port: %d].\n", port);

+	logg("!Can't connect to clamd [port: %d].\n", port);

 	return -1;

     }

     while((bread = read(0, buff, sizeof(buff))) > 0) {

 	if(write(wsockd, buff, bread) <= 0) {

-	    logg("^Can't write to the socket.\n");

+	    logg("!Can't write to the socket.\n");

 	    close(wsockd);

 	    return -1;

 	}

@@ -256,23 +254,21 @@ static char *abpath(const char *filename)

     return fullpath;

 }

-static int dconnect(const struct optstruct *opt, int *is_unix)

+static int dconnect(const struct optstruct *opts, int *is_unix)

 {

 	struct sockaddr_un server;

 	struct sockaddr_in server2;

 	struct hostent *he;

-	struct cfgstruct *copt;

-	const struct cfgstruct *cpt;

-	const char *clamav_conf = opt_arg(opt, "config-file");

+	struct optstruct *clamdopts;

+	const struct optstruct *opt;

+	const char *clamd_conf = optget(opts, "config-file")->strarg;

 	int sockd;

     if(is_unix)

-	    *is_unix = 0;

-    if(!clamav_conf)

-	clamav_conf = DEFAULT_CFG;

+	*is_unix = 0;

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

-	logg("^Can't parse the configuration file.\n");

+    if((clamdopts = optparse(clamd_conf, 0, NULL, 1, OPT_CLAMD, 0, NULL)) == NULL) {

+	logg("!Can't parse clamd configuration file %s\n", clamd_conf);

 	return -1;

     }

@@ -282,46 +278,46 @@ static int dconnect(const struct optstruct *opt, int *is_unix)

     /* Set default address to connect to */

     server2.sin_addr.s_addr = inet_addr("127.0.0.1");    

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

+    if((opt = optget(clamdopts, "LocalSocket"))->enabled) {

 	server.sun_family = AF_UNIX;

-	strncpy(server.sun_path, cpt->strarg, sizeof(server.sun_path));

+	strncpy(server.sun_path, opt->strarg, sizeof(server.sun_path));

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

 	if((sockd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {

 	    perror("socket()");

-	    logg("^Can't create the socket.\n");

-	    freecfg(copt);

+	    logg("!Can't create the socket.\n");

+	    optfree(clamdopts);

 	    return -1;

 	}

 	if(connect(sockd, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) < 0) {

 	    close(sockd);

 	    perror("connect()");

-	    logg("^Can't connect to clamd.\n");

-	    freecfg(copt);

+	    logg("!Can't connect to clamd.\n");

+	    optfree(clamdopts);

 	    return -1;

 	}

 	if(is_unix)

 		*is_unix = 1;

-    } else if((cpt = cfgopt(copt, "TCPSocket"))->enabled) {

+    } else if((opt = optget(clamdopts, "TCPSocket"))->enabled) {

 	if((sockd = socket(SOCKET_INET, SOCK_STREAM, 0)) < 0) {

 	    perror("socket()");

-	    logg("^Can't create the socket.\n");

-	    freecfg(copt);

+	    logg("!Can't create the socket.\n");

+	    optfree(clamdopts);

 	    return -1;

 	}

 	server2.sin_family = AF_INET;

-	server2.sin_port = htons(cpt->numarg);

+	server2.sin_port = htons(opt->numarg);

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

-	    if ((he = gethostbyname(cpt->strarg)) == 0) {

+	if((opt = optget(clamdopts, "TCPAddr"))->enabled) {

+	    if ((he = gethostbyname(opt->strarg)) == 0) {

 		close(sockd);

 		perror("gethostbyname()");

-		logg("^Can't lookup clamd hostname.\n");

-		freecfg(copt);

+		logg("!Can't lookup clamd hostname.\n");

+		optfree(clamdopts);

 		return -1;

 	    }

 	    server2.sin_addr = *(struct in_addr *) he->h_addr_list[0];

@@ -330,33 +326,33 @@ static int dconnect(const struct optstruct *opt, int *is_unix)

 	if(connect(sockd, (struct sockaddr *) &server2, sizeof(struct sockaddr_in)) < 0) {

 	    close(sockd);

 	    perror("connect()");

-	    logg("^Can't connect to clamd.\n");

-	    freecfg(copt);

+	    logg("!Can't connect to clamd.\n");

+	    optfree(clamdopts);

 	    return -1;

 	}

     } else {

-	logg("^Clamd is not configured properly.\n");

-	freecfg(copt);

+	logg("!Clamd is not configured properly.\n");

+	optfree(clamdopts);

 	return -1;

     }

-    freecfg(copt);

+    optfree(clamdopts);

     return sockd;

 }

-int get_clamd_version(const struct optstruct *opt)

+int get_clamd_version(const struct optstruct *opts)

 {

 	char buff[64];

 	int bread, sockd;

-    if((sockd = dconnect(opt, NULL)) < 0)

+    if((sockd = dconnect(opts, NULL)) < 0)

 	return 2;

     if(write(sockd, "VERSION", 7) <= 0) {

-	logg("^Can't write to the socket.\n");

+	logg("!Can't write to the socket.\n");

 	close(sockd);

 	return 2;

     }

@@ -370,13 +366,13 @@ int get_clamd_version(const struct optstruct *opt)

     return 0;

 }

-int reload_clamd_database(const struct optstruct *opt)

+int reload_clamd_database(const struct optstruct *opts)

 {

 	char buff[64];

 	int bread, sockd;

-    if((sockd = dconnect(opt, NULL)) < 0)

+    if((sockd = dconnect(opts, NULL)) < 0)

 	return 2;

     if(write(sockd, "RELOAD", 6) <= 0) {

@@ -396,7 +392,7 @@ int reload_clamd_database(const struct optstruct *opt)

     return 0;

 }

-int client(const struct optstruct *opt, int *infected)

+int client(const struct optstruct *opts, int *infected)

 {

 	char cwd[PATH_MAX+1], *fullpath;

 	int sockd, ret, errors = 0;

@@ -406,41 +402,41 @@ int client(const struct optstruct *opt, int *infected)

     *infected = 0;

-    if(opt_check(opt, "multiscan"))

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

 	scantype = "MULTISCAN";

     /* parse argument list */

-    if(opt->filename == NULL || strlen(opt->filename) == 0) {

+    if(opts->filename == NULL || strlen(opts->filename) == 0) {

 	/* scan current directory */

 	if(!getcwd(cwd, PATH_MAX)) {

 	    logg("^Can't get absolute pathname of current working directory.\n");

 	    return 2;

 	}

-	if((sockd = dconnect(opt, NULL)) < 0)

+	if((sockd = dconnect(opts, NULL)) < 0)

 	    return 2;

-	if((ret = dsfile(sockd, scantype, cwd, opt)) >= 0)

+	if((ret = dsfile(sockd, scantype, cwd, opts)) >= 0)

 	    *infected += ret;

 	else

 	    errors++;

 	close(sockd);

-    } else if(!strcmp(opt->filename, "-")) { /* scan data from stdin */

+    } else if(!strcmp(opts->filename, "-")) { /* scan data from stdin */

         int is_unix;

-	if((sockd = dconnect(opt, &is_unix)) < 0)

+	if((sockd = dconnect(opts, &is_unix)) < 0)

 	    return 2;

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

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

 #ifndef HAVE_FD_PASSING

 		logg("^File descriptor pass support not compiled in, falling back to stream scan\n");

-		ret = dsstream(sockd, opt);

+		ret = dsstream(sockd, opts);

 #else

 		if(!is_unix) {

 			logg("^File descriptor passing can only work on local (unix) sockets! Falling back to stream scan\n");

 			/* fall back to stream */

-			ret = dsstream(sockd, opt);

+			ret = dsstream(sockd, opts);

 		} else {

 			char buff[4096];

 			memset(buff, 0, sizeof(buff));

@@ -452,7 +448,7 @@ int client(const struct optstruct *opt, int *infected)

 		}

 #endif

 	} else

-		ret = dsstream(sockd, opt);

+		ret = dsstream(sockd, opts);

 	if(ret >= 0)

 	    *infected += ret;

 	else

@@ -463,7 +459,7 @@ int client(const struct optstruct *opt, int *infected)

     } else {

 	int x;

 	char *thefilename;

-	for (x = 0; (thefilename = cli_strtok(opt->filename, x, "\t")) != NULL; x++) {

+	for (x = 0; (thefilename = cli_strtok(opts->filename, x, "\t")) != NULL; x++) {

 	    fullpath = thefilename;

 	    if(stat(fullpath, &sb) == -1) {

@@ -484,10 +480,10 @@ int client(const struct optstruct *opt, int *infected)

 		switch(sb.st_mode & S_IFMT) {

 		    case S_IFREG:

 		    case S_IFDIR:

-			if((sockd = dconnect(opt, NULL)) < 0)

+			if((sockd = dconnect(opts, NULL)) < 0)

 			    return 2;

-			if((ret = dsfile(sockd, scantype, fullpath, opt)) >= 0)

+			if((ret = dsfile(sockd, scantype, fullpath, opts)) >= 0)

 			    *infected += ret;

 			else

 			    errors++;

@@ -508,26 +504,26 @@ int client(const struct optstruct *opt, int *infected)

     return *infected ? 1 : (errors ? 2 : 0);

 }

-void move_infected(const char *filename, const struct optstruct *opt)

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

 {

 	char *movedir, *movefilename, numext[4 + 1];

 	const char *tmp;

 	struct stat ofstat, mfstat;

 	int n, len, movefilename_size;

-	int moveflag = opt_check(opt, "move");

+	int moveflag = optget(opts, "move")->enabled;

 	struct utimbuf ubuf;

-    if((moveflag && !(movedir = opt_arg(opt, "move"))) ||

-        (!moveflag && !(movedir = opt_arg(opt, "copy")))) {

+    if((moveflag && !(movedir = optget(opts, "move")->strarg)) ||

+        (!moveflag && !(movedir = optget(opts, "copy")->strarg))) {

         /* Should never reach here */

-        logg("^opt_arg() returned NULL\n");

+        logg("!optget() returned NULL\n");

         notmoved++;

         return;

     }

     if(access(movedir, W_OK|X_OK) == -1) {

-        logg("^error %s file '%s': cannot write to '%s': %s\n", (moveflag) ? "moving" : "copying", filename, movedir, strerror(errno));

+        logg("!problem %s file '%s': cannot write to '%s': %s\n", (moveflag) ? "moving" : "copying", filename, movedir, strerror(errno));

         notmoved++;

         return;

     }

@@ -545,12 +541,12 @@ void move_infected(const char *filename, const struct optstruct *opt)

     movefilename_size = sizeof(char) * (strlen(movedir) + strlen(tmp) + sizeof(numext) + 2);

     if(!(movefilename = malloc(movefilename_size))) {

-        logg("^Memory allocation error\n");

+        logg("!Memory allocation error\n");

 	exit(2);

     }

     if(!(cli_strrcpy(movefilename, movedir))) {

-        logg("^cli_strrcpy() returned NULL\n");

+        logg("!cli_strrcpy() returned NULL\n");

         notmoved++;

         free(movefilename);

         return;

@@ -559,7 +555,7 @@ void move_infected(const char *filename, const struct optstruct *opt)

     strcat(movefilename, "/");

     if(!(strcat(movefilename, tmp))) {

-        logg("^strcat() returned NULL\n");

+        logg("!strcat() returned NULL\n");

         notmoved++;

         free(movefilename);

         return;

@@ -19,10 +19,10 @@

 #ifndef __CLIENT_H

 #define __CLIENT_H

-#include "options.h"

+#include "shared/optparser.h"

-int client(const struct optstruct *opt, int *infected);

-int get_clamd_version(const struct optstruct *opt);

-int reload_clamd_database(const struct optstruct *opt);

+int client(const struct optstruct *opts, int *infected);

+int get_clamd_version(const struct optstruct *opts);

+int reload_clamd_database(const struct optstruct *opts);

 #endif

deleted file mode 100644

@@ -1,20 +0,0 @@

-/*

- *  Copyright (C) 2002 Tomasz Kojm <tkojm@clamav.net>

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation; either version 2 of the License, or

- *  (at your option) any later version.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

- *  MA 02110-1301, USA.

- */

-

-#define DEFAULT_CFG CONFDIR"/clamd.conf"

@@ -29,7 +29,6 @@ clamscan_SOURCES = \

     $(top_srcdir)/shared/misc.c \

     $(top_srcdir)/shared/misc.h \

     clamscan.c \

-    clamscan_opt.h \

     others.c \

     others.h \

     global.h \

@@ -260,7 +260,6 @@ clamscan_SOURCES = \

     $(top_srcdir)/shared/misc.c \

     $(top_srcdir)/shared/misc.h \

     clamscan.c \

-    clamscan_opt.h \

     others.c \

     others.h \

     global.h \

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

 #endif

-    if((opts = optparse(NULL, argc, argv, 1, OPT_CLAMSCAN, NULL)) == NULL) {

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

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

 	return 40;

     }

deleted file mode 100644

@@ -1,127 +0,0 @@

-/*

- *  Copyright (C) 2002 - 2006 Tomasz Kojm <tkojm@clamav.net>

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License version 2 as

- *  published by the Free Software Foundation.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

- *  MA 02110-1301, USA.

- *

- */

-

-#ifndef __CLAMSCAN_OPT_H

-#define __CLAMSCAN_OPT_H

-

-#if HAVE_CONFIG_H

-#include "clamav-config.h"

-#endif

-

-#include "getopt.h"

-

-const char *clamscan_shortopt = "hvd:wriVl:m";

-static struct option clamscan_longopt[] = {

-    {"help", 0, 0, 'h'},	    /* clamscan + clamdscan */

-    {"quiet", 0, 0, 0},		    /* clamscan + clamdscan */

-    {"stdout", 0, 0, 0},	    /* clamscan + clamdscan */

-    {"verbose", 0, 0, 'v'},	    /* clamscan + clamdscan */

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

-    {"version", 0, 0, 'V'},	    /* clamscan + clamdscan */

-    {"tempdir", 1, 0, 0},

-    {"leave-temps", 0, 0, 0},

-    {"config-file", 1, 0, 0},	    /* clamdscan */

-    {"reload", 0, 0, 0},           /* clamdscan */

-    {"multiscan", 0, 0, 'm'},

-    {"database", 1, 0, 'd'},

-    {"force", 0, 0, 0},

-    {"recursive", 0, 0, 'r'},

-    {"bell", 0, 0, 0},

-    {"disable-summary", 0, 0, 0},   /* obsolete */

-    {"no-summary", 0, 0, 0},

-    {"infected", 0, 0, 'i'},

-    {"log", 1, 0, 'l'},

-    {"move", 1, 0, 0},

-    {"copy", 1, 0, 0},

-    {"remove", 0, 0, 0},

-    {"exclude", 1, 0, 0},

-    {"exclude-dir", 1, 0, 0},

-    {"include", 1, 0, 0},

-    {"include-dir", 1, 0, 0},

-    {"max-files", 1, 0, 0},

-    {"max-filesize", 1, 0, 0},

-    {"max-scansize", 1, 0, 0},

-    {"max-recursion", 1, 0, 0},

-    {"max-dir-recursion", 1, 0, 0},

-    {"detect-pua", 0, 0, 0},

-    {"exclude-pua", 1, 0, 0},

-    {"include-pua", 1, 0, 0},

-    {"detect-structured", 0, 0, 0},

-    {"structured-ssn-format", 1, 0, 0},

-    {"structured-ssn-count", 1, 0, 0},

-    {"structured-cc-count", 1, 0, 0},

-    {"disable-archive", 0, 0, 0},

-    {"no-archive", 0, 0, 0},

-    {"detect-broken", 0, 0, 0},

-    {"block-encrypted", 0, 0, 0},

-    {"no-pe", 0, 0, 0},