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

+Tue Oct  7 22:35:22 CEST 2008 (tk)

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

+  * shared/options.c: handle obsolete options in cmdline parser (bb#1213)

+

 Tue Oct  7 23:21:35 EEST 2008 (edwin)

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

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

     }

 #endif

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

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

     if(!opt) {

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

 	return 1;

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

 				  NULL };

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

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

     if(!opt) {

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

 	return 2;

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

     sigprocmask(SIG_SETMASK, &sigset, NULL);

 #endif

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

+    opt = opt_parse(argc, argv, clamscan_shortopt, clamscan_longopt, NULL, clamscan_deprecated);

     if(!opt) {

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

 	return 40;

@@ -88,7 +88,40 @@ static struct option clamscan_longopt[] = {

     {"dev-ac-only", 0, 0, 0},

     {"dev-ac-depth", 1, 0, 0},

     {"fdpass", 0, 0, 0},

+

+    /* deprecated (please also add to clamscan_deprecated[]) */

+    {"no-phishing-restrictedscan", 0, 0, 0},

+    {"max-ratio", 1, 0, 0},

+    {"max-space", 1, 0, 0},

+    {"block-max", 0, 0, 0},

+    {"unzip", 2, 0, 0},

+    {"unrar", 2, 0, 0},

+    {"arj", 2, 0, 0},

+    {"unzoo", 2, 0, 0},

+    {"lha", 2, 0, 0},

+    {"jar", 2, 0, 0},

+    {"tar", 2, 0, 0},

+    {"tgz", 2, 0, 0},

+    {"deb", 2, 0, 0},

+

     {0, 0, 0, 0}

 };

+const char *clamscan_deprecated[] = {

+    "no-phishing-restrictedscan",

+    "max-ratio",

+    "max-space",

+    "block-max",

+    "unzip",

+    "unrar",

+    "arj",

+    "unzoo",

+    "lha",

+    "jar",

+    "tar",

+    "tgz",

+    "deb",

+    NULL

+};

+

 #endif

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

     	};

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

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

     if(!opt) {

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

 	return 40;

@@ -31,10 +31,10 @@

 #include "output.h"

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

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

 {

 	struct optnode *newnode;

-	int i, found = 0;

+	int i, found;

 	const char *longname = NULL;

@@ -54,9 +54,12 @@ static int register_option(struct optstruct *opt, const char *optlong, char opts

     }

     if(accepted_long) {

+	found = 0;

 	for(i = 0; accepted_long[i]; i++)

-	    if(!strcmp(accepted_long[i], longname))

+	    if(!strcmp(accepted_long[i], longname)) {

 		found = 1;

+		break;

+	    }

 	if(!found) {

 	    if(optshort)

@@ -68,6 +71,25 @@ static int register_option(struct optstruct *opt, const char *optlong, char opts

 	}

     }

+    if(deprecated_long) {

+	found = 0;

+	for(i = 0; deprecated_long[i]; i++) {

+	    if(!strcmp(deprecated_long[i], longname)) {

+		found = 1;

+		break;

+	    }

+	}

+

+	if(found) {

+	    if(optshort)

+		mprintf("WARNING: Ignoring deprecated option --%s (-%c)\n", longname, optshort);

+	    else

+		mprintf("WARNING: Ignoring deprecated option --%s\n", longname);

+

+	    return 0;

+	}

+    }

+

     newnode = (struct optnode *) malloc(sizeof(struct optnode));

     if(!newnode) {

 	mprintf("!register_long_option: malloc failed\n");

@@ -125,7 +147,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 * const *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, const char * const *deprecated_long)

 {

 	int ret, opt_index, i, len;

 	struct optstruct *opt;

@@ -147,7 +169,7 @@ struct optstruct *opt_parse(int argc, char * const *argv, const char *getopt_sho

 	switch(ret) {

 	    case 0:

-		if(register_option(opt, options_long[opt_index].name, 0, options_long, accepted_long) == -1) {

+		if(register_option(opt, options_long[opt_index].name, 0, options_long, accepted_long, deprecated_long) == -1) {

 		    opt_free(opt);

 		    return NULL;

 		}

@@ -160,7 +182,7 @@ struct optstruct *opt_parse(int argc, char * const *argv, const char *getopt_sho

 		    else

 			longname = NULL;

-		    if(register_option(opt, longname, ret, options_long, accepted_long) == -1) {

+		    if(register_option(opt, longname, ret, options_long, accepted_long, deprecated_long) == -1) {

 			opt_free(opt);

 			return NULL;

 		    }

@@ -36,7 +36,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 * const *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, const char * const *deprecated_long);

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

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

 	    {0, 0, 0, 0}

     	};

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

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

     if(!opt) {

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

 	return 1;