Re: Spamprobe 1.1x5 released
Chris Ross <[email protected]>
| Newsgroups | gmane.mail.spam.spamprobe.general |
|---|---|
| Message-ID | <[email protected]> |
Brian Burton wrote:
> I just posted a new 1.1 experimental release. Consider this one to be a
> release candidate. I'd like to put out a 1.1 release during the
> upcoming holiday weekend. If folks could try out this release and let
> me know of any problems they encounter it would be a big help!
Guess that didn't happen? I didn't get a chance to look at this
one until now anyway. :-)
> If anyone encounters any problems please let me know.
I haven't really had any problems yet, but I haven't switched to
using it full time. I did fix a couple minor nits that were bugging
me in 1.0, tho.
The following patch does:
- Fixes the usage message. There was a missing character, and
I just fixed up the formatting a little. Minor.
- Updates the copyright date. Again, I just happened to be near
it. :-)
- Fixes it so that "spamprobe -V" and "spamprobe -V command" no
longer produce different output. You were shortcutting in the -V
case when there was no argument, and printing the version before
opening the database. So, it didn't tell you the database type.
Minor nit, but worth fixing IMHO.
Thanks. I'll let you know if I see anything unusual when I switch
to running it. This is the same database format (db4, in my case)
as 1.0?
- Chris
spamprobe-1.1x5.diff
(text/plain, 1.8 KB)
diff -u spamprobe-1.1x5.orig/spamprobe.cc spamprobe-1.1x5/spamprobe.cc
--- spamprobe-1.1x5.orig/spamprobe.cc 2004-11-21 17:36:35.000000000 -0500
+++ spamprobe-1.1x5/spamprobe.cc 2005-01-30 13:12:28.000000000 -0500
@@ -1168,7 +1168,7 @@
}
cout << " database." << endl
<< endl
- << "Copyright 2002 Burton Computer Corporation" << endl
+ << "Copyright 2002-2005 Burton Computer Corporation" << endl
<< "This program is distributed in the hope that it will be useful," << endl
<< "but WITHOUT ANY WARRANTY; without even the implied warranty of" << endl
<< "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the" << endl
@@ -1177,8 +1177,8 @@
static void print_usage()
{
- cerr << "usage: spamprobe [-chmTvVxY78] a char -d basedir -H headers command [filename...]"
- << endl;
+ cerr << "usage: spamprobe [-chmTvVxY78] [-a char] [-d basedir] [-H headers]"
+ << " command [filename...]" << endl;
}
static bool directory_test(File dir,
@@ -1508,14 +1508,9 @@
}
}
- if (usage_error) {
- if (wants_version) {
- print_version(s_filter.get());
- return 0;
- } else {
- print_usage();
- return 1;
- }
+ if (usage_error && !wants_version) {
+ print_usage();
+ return 1;
}
if (single_message_file || (command == CMD_RECEIVE && !force_mbox)) {
@@ -1527,11 +1522,11 @@
if (shared_db_dir.getPath().length() > 0) {
s_filter->open(File(shared_db_dir, DB_FILENAME),
File(basedir, DB_FILENAME),
- cmd->read_only,
+ cmd ? cmd->read_only : true,
MAX_CACHE_TERMS);
} else {
s_filter->open(File(basedir, DB_FILENAME),
- cmd->read_only,
+ cmd ? cmd->read_only : true,
MAX_CACHE_TERMS);
}