[cvs] bogofilter/src bogoconfig.c,1.46,1.47 bogofilter.c,1.9,1.10 globals.c,1.14,1.15 globals.h,1.16,1.17

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

Update of /cvsroot/bogofilter/bogofilter/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14372

Modified Files:
	bogoconfig.c bogofilter.c globals.c globals.h 
Log Message:
Change option '-qv' to '-Q'.

Index: bogoconfig.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/bogoconfig.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- bogoconfig.c	21 Apr 2003 17:00:58 -0000	1.46
+++ bogoconfig.c	21 Apr 2003 17:03:17 -0000	1.47
@@ -296,6 +296,7 @@
     (void)fprintf(stderr,
 		  "\thelp options:\n"
 		  "\t  -h      - print this help message.\n"
+		  "\t  -Q      - query (display) bogofilter configuration.\n"
 		  "\t  -V      - print version information and exit.\n"
 	);
     (void)fprintf(stderr,
@@ -425,7 +426,7 @@
 #if HAVE_DECL_OPTRESET
     optreset = 1;
 #endif
-    while ((option = getopt(argc, argv, ":23bBc:Cd:DefFghI:lL:m:MnNo:O:pqRrsStTuvVx:y:" G R F)) != -1)
+    while ((option = getopt(argc, argv, ":23bBc:Cd:DefFghI:lL:m:MnNo:O:pqQRrsStTuvVx:y:" G R F)) != -1)
     {
 #if 0
 	if (getenv("BOGOFILTER_DEBUG_OPTIONS")) {
@@ -554,6 +555,10 @@
 
 	case 'q':
 	    quiet = true;
+	    break;
+
+	case 'Q':
+	    query = true;
 	    break;
 
 #ifdef	ROBINSON_OR_FISHER

Index: bogofilter.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/bogofilter.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- bogofilter.c	21 Apr 2003 14:58:24 -0000	1.9
+++ bogofilter.c	21 Apr 2003 17:03:17 -0000	1.10
@@ -59,7 +59,7 @@
 
     method->initialize();
 
-    if (quiet && verbose)	/* 'quiet + verbose' means 'query' */
+    if (query)
 	query_config();
 
     /* tokenize input text and save words in a wordhash. */

Index: globals.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/globals.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- globals.c	21 Apr 2003 14:58:24 -0000	1.14
+++ globals.c	21 Apr 2003 17:03:17 -0000	1.15
@@ -31,6 +31,7 @@
 bool	replace_nonascii_characters;	/* '-n' */
 bool	passthrough;			/* '-p' */
 bool	quiet;				/* '-q' */
+bool	query;				/* '-Q' */
 int	Rtable = 0;			/* '-R' */
 bool	terse;				/* '-t' */
 int	test = 0;			/* '-T' */

Index: globals.h
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/globals.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- globals.h	21 Apr 2003 14:58:24 -0000	1.16
+++ globals.h	21 Apr 2003 17:03:17 -0000	1.17
@@ -28,6 +28,7 @@
 extern	char	outfname[PATH_LEN];	/* '-O' */
 extern	bool	passthrough;		/* '-p' */
 extern	bool	quiet;			/* '-q' */
+extern	bool	query;			/* '-Q' */
 extern	int	Rtable;			/* '-R' */
 extern	bool	terse;			/* '-t' */
 extern	int	test;			/* '-T' */