[cvs] bogofilter/src bogotune.c,1.198,1.199

[<re...@us...>]

Update of /cvsroot/bogofilter/bogofilter/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23352/src

Modified Files:
	bogotune.c 
Log Message:
Require filename with '-M' option.

Index: bogotune.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/bogotune.c,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- bogotune.c	18 Jan 2005 04:11:44 -0000	1.198
+++ bogotune.c	18 Jan 2005 05:11:39 -0000	1.199
@@ -882,7 +882,7 @@
 		  "\t  -D      - don't read a wordlist file.\n"
 		  "\t  -d path - specify directory for wordlists.\n"
 		  "\t  -E      - disable ESF (effective size factor) tuning.\n"
-		  "\t  -M      - rewrite input file in message count format.\n"
+		  "\t  -M file - rewrite input file in message count format.\n"
 		  "\t  -r num  - specify robx value\n");
     (void)fprintf(stderr,
 		  "\t  -T num  - specify fp target value\n"
@@ -908,7 +908,7 @@
     _wildcard (&argc, &argv);	/* expand wildcards (*.*) */
 #endif
 
-#define	OPTIONS	":c:Cd:DEI:Mn:qr:s:tT:vVx:"
+#define	OPTIONS	":c:Cd:DEM:n:qr:s:tT:vVx:"
 
     while (1)
     {
@@ -935,11 +935,9 @@
 	case 'E':
 	    esf_flag ^= true;
 	    break;
-	case 'I':
-	    bogolex_file = optarg;
-	    break;
 	case 'M':
 	    bogolex = true;
+	    bogolex_file = optarg;
 	    break;
 	case 'n':
 	    run_type = REG_GOOD;
@@ -1408,7 +1406,7 @@
     /* Note: memory usage highest while reading messages */
     /* usage decreases as distribute() converts to count format */
 
-    if (bogolex && bogolex_file != NULL) {
+    if (bogolex_file != NULL) {
 	robx = ROBX;			/* needed for degen */
 	read_mailbox(bogolex_file, NULL);
 	return status;
@@ -1424,9 +1422,6 @@
 	show_elapsed_time(beg, end, ns_cnt + sp_cnt, (double)cnt/(end-beg), "messages", "msg/sec");
     }
 
-    if (bogolex)
-	return status;
-
     distribute(REG_GOOD, ns_msglists);
     distribute(REG_SPAM, sp_msglists);