@@ -1,9 +1,15 @@

+Sun Oct 29 14:55:20 CET 2006 (tk)

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

+  * shared/options.[ch]: fix 'const' declarations (closes bug#69)

+			 Thanks to Mark Pizzolato

+

 Sun Oct 29 13:54:38 GMT 2006 (njh)

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

   * libclamav/mbox.c:	Honour maxarchivelevel when scanning email messages.

 			It would be better to have a separate limit for that

 			Bugzilla 104

+>>>>>>> 1.1568

 Sun Oct 29 14:40:14 CET 2006 (tk)

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

   * clamd/session.c: NAME_MAX was not defined (closes bug#60)

@@ -314,7 +314,7 @@ int scanmanager(const struct optstruct *opt)

 int scanfile(const char *filename, struct cl_node *root, const struct passwd *user, const struct optstruct *opt, const struct cl_limits *limits, int options)

 {

 	int ret, included, printclean = 1;

-	struct optnode *optnode;

+	const struct optnode *optnode;

 	char *argument;

 #ifdef C_LINUX

 	struct stat sb;

@@ -50,7 +50,7 @@ int treewalk(const char *dirname, struct cl_node *root, const struct passwd *use

 	char *fname;

 	int scanret = 0, included;

 	unsigned int maxdepth;

-	struct optnode *optnode;

+	const struct optnode *optnode;

 	char *argument;

@@ -33,7 +33,7 @@

 #include "output.h"

-static int register_option(struct optstruct *opt, const char *optlong, char optshort, const struct option *options_long, const char **accepted_long)

+static int register_option(struct optstruct *opt, const char *optlong, char optshort, const struct option *options_long, const char * const *accepted_long)

 {

 	struct optnode *newnode;

 	int i, found = 0;

@@ -123,7 +123,7 @@ void opt_free(struct optstruct *opt)

     free(opt);

 }

-struct optstruct *opt_parse(int argc, char * const *argv, const char *getopt_short, const struct option *options_long, const char **accepted_long)

+struct optstruct *opt_parse(int argc, char * const *argv, const char *getopt_short, const struct option *options_long, const char * const *accepted_long)

 {

 	int ret, opt_index, i, len;

 	struct optstruct *opt;

@@ -240,7 +240,7 @@ char *opt_arg(const struct optstruct *opt, char *optlong)

 char *opt_firstarg(const struct optstruct *opt, const char *optlong, const struct optnode **optnode)

 {

-	struct optnode *handler;

+	const struct optnode *handler;

     if(!opt) {

 	mprintf("!opt_firstarg: opt == NULL\n");

@@ -37,7 +37,7 @@ struct optstruct {

 void opt_free(struct optstruct *opt);

-struct optstruct *opt_parse(int argc, char * const *argv, const char *getopt_short, const struct option *options_long, const char **accepted_long);

+struct optstruct *opt_parse(int argc, char * const *argv, const char *getopt_short, const struct option *options_long, const char * const *accepted_long);

 int opt_check(const struct optstruct *opt, char *optlong);