You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2004/07/20 23:03:16 UTC
svn commit: rev 23100 - in spamassassin/trunk: . spamd
Author: felicity
Date: Tue Jul 20 14:03:16 2004
New Revision: 23100
Modified:
spamassassin/trunk/sa-learn.raw
spamassassin/trunk/spamassassin.raw
spamassassin/trunk/spamd/spamd.raw
Log:
sorting the options to getopts, fixing whitespace balancing, etc.
Modified: spamassassin/trunk/sa-learn.raw
==============================================================================
--- spamassassin/trunk/sa-learn.raw (original)
+++ spamassassin/trunk/sa-learn.raw Tue Jul 20 14:03:16 2004
@@ -92,35 +92,35 @@
);
GetOptions(
- 'spam' => sub { $isspam = 1; },
- 'ham|nonspam' => sub { $isspam = 0; },
+ 'forget' => \$forget,
+ 'ham|nonspam' => sub { $isspam = 0; },
+ 'spam' => sub { $isspam = 1; },
'sync|rebuild' => \$synconly,
- 'forget' => \$forget,
'configpath|config-file|config-dir|c|C=s' => \$opt{'configpath'},
'prefspath|prefs-file|p=s' => \$opt{'prefspath'},
'siteconfigpath=s' => \$opt{'siteconfigpath'},
- 'folders|f=s' => \$opt{'folders'},
- 'showdots' => \$opt{'showdots'},
+ 'folders|f=s' => \$opt{'folders'},
+ 'force-expire|expire' => \$opt{'force-expire'},
+ 'local|L' => \$opt{'local'},
'no-sync|nosync|no-rebuild|norebuild' => \$opt{'nosync'},
- 'local|L' => \$opt{'local'},
- 'force-expire|expire' => \$opt{'force-expire'},
- 'use-ignores' => \$opt{'use-ignores'},
+ 'showdots' => \$opt{'showdots'},
+ 'use-ignores' => \$opt{'use-ignores'},
- 'stopafter=i' => \$opt{'stopafter'},
'learnprob=f' => \$opt{'learnprob'},
'randseed=i' => \$opt{'randseed'},
+ 'stopafter=i' => \$opt{'stopafter'},
'debug-level|D:s' => \$opt{'debug-level'},
- 'version|V' => \$opt{'version'},
'help|h|?' => \$opt{'help'},
+ 'version|V' => \$opt{'version'},
'dump:s' => \$opt{'dump'},
'import' => \$opt{'import'},
- 'clear' => \$opt{'clear'},
- 'backup' => \$opt{'backup'},
+ 'backup' => \$opt{'backup'},
+ 'clear' => \$opt{'clear'},
'restore=s' => \$opt{'restore'},
'dir' => sub { $opt{'old_format'} = 'dir'; },
Modified: spamassassin/trunk/spamassassin.raw
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Tue Jul 20 14:03:16 2004
@@ -146,29 +146,29 @@
Getopt::Long::Configure(
qw(bundling no_getopt_compat no_auto_abbrev no_ignore_case));
GetOptions(
- 'remove-from-whitelist|R' => \$opt{'remove-from-whitelist'},
- 'add-to-whitelist|W' => \$opt{'add-to-whitelist'},
- 'add-to-blacklist' => \$opt{'add-to-blacklist'},
- 'remove-addr-from-whitelist=s' => \$opt{'remove-addr-from-whitelist'},
- 'add-addr-to-whitelist=s' => \$opt{'add-addr-to-whitelist'},
- 'add-addr-to-blacklist=s' => \$opt{'add-addr-to-blacklist'},
- 'local-only|local|L' => \$opt{'local'},
- 'remove-markup|despamassassinify|d' => \$opt{'remove-markup'},
- 'revoke|k' => \$opt{'revoke'},
- 'report|r' => \$opt{'report'},
+ 'add-addr-to-blacklist=s' => \$opt{'add-addr-to-blacklist'},
+ 'add-addr-to-whitelist=s' => \$opt{'add-addr-to-whitelist'},
+ 'add-to-blacklist' => \$opt{'add-to-blacklist'},
+ 'add-to-whitelist|W' => \$opt{'add-to-whitelist'},
'configpath|config-file|config-dir|c|C=s' => \$opt{'configpath'},
- 'prefspath|prefs-file|p=s' => \$opt{'prefspath'},
- 'siteconfigpath=s' => \$opt{'siteconfigpath'},
'create-prefs!' => \$opt{'create-prefs'},
- 'x' => sub { $opt{'create-prefs'} = 0 },
- 'error-code|exit-code|e:i' => \$opt{'error-code'},
- 'test-mode|test|t' => \$opt{'test-mode'},
- 'lint' => \$opt{'lint'},
'debug-level|debug|D:s' => \$opt{'debug-level'},
- 'version|V' => \$opt{'version'},
+ 'error-code|exit-code|e:i' => \$opt{'error-code'},
'help|h|?' => \$opt{'help'},
+ 'lint' => \$opt{'lint'},
+ 'local-only|local|L' => \$opt{'local'},
'mbox' => sub { $opt{'format'} = 'mbox'; },
'mbx' => sub { $opt{'format'} = 'mbx'; },
+ 'prefspath|prefs-file|p=s' => \$opt{'prefspath'},
+ 'remove-addr-from-whitelist=s' => \$opt{'remove-addr-from-whitelist'},
+ 'remove-from-whitelist|R' => \$opt{'remove-from-whitelist'},
+ 'remove-markup|despamassassinify|d' => \$opt{'remove-markup'},
+ 'report|r' => \$opt{'report'},
+ 'revoke|k' => \$opt{'revoke'},
+ 'siteconfigpath=s' => \$opt{'siteconfigpath'},
+ 'test-mode|test|t' => \$opt{'test-mode'},
+ 'version|V' => \$opt{'version'},
+ 'x' => sub { $opt{'create-prefs'} = 0 },
) or print_usage_and_exit();
if ( defined $opt{'help'} ) {
Modified: spamassassin/trunk/spamd/spamd.raw
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Tue Jul 20 14:03:16 2004
@@ -138,50 +138,50 @@
# Parse the command line
Getopt::Long::Configure("bundling");
GetOptions(
- 'socketpath=s' => \$opt{'socketpath'},
- 'socketowner=s' => \$opt{'socketowner'},
- 'socketgroup=s' => \$opt{'socketgroup'},
- 'socketmode=s' => \$opt{'socketmode'},
- 'create-prefs!' => \$opt{'create-prefs'},
+ 'allowed-ips|A=s' => \@{ $opt{'allowed-ip'} },
+ 'auth-ident' => \$opt{'auth-ident'},
+ 'configpath|C=s' => \$opt{'configpath'},
'c' => \$opt{'create-prefs'},
+ 'create-prefs!' => \$opt{'create-prefs'},
'daemonize!' => \$opt{'daemonize'},
+ 'debug!' => \$opt{'debug'},
'd' => \$opt{'daemonize'},
+ 'D' => \$opt{'debug'},
+ 'helper-home-dir|H:s' => \$opt{'home_dir_for_helpers'},
+ 'help|h' => \$opt{'help'},
+ 'ident-timeout=f' => \$opt{'ident-timeout'},
+ 'ldap-config!' => \$opt{'ldap-config'},
'listen-ip|ip-address|i:s' => \$opt{'listen-ip'},
+ 'local!' => \$opt{'local'},
+ 'L' => \$opt{'local'},
'max-children|m=i' => \$opt{'max-children'},
'max-conn-per-child=i' => \$opt{'max-conn-per-child'},
+ 'nouser-config|x' => sub { $opt{'user-config'} = 0 },
+ 'paranoid!' => \$opt{'paranoid'},
+ 'pidfile|r=s' => \$opt{'pidfile'},
+ 'P' => \$opt{'paranoid'},
'port|p=s' => \$opt{'port'},
- 'sql-config!' => \$opt{'sql-config'},
- 'ldap-config!' => \$opt{'ldap-config'},
+ 'Q' => \$opt{'setuid-with-sql'},
'q' => \$opt{'sql-config'},
- 'setuid-with-sql' => \$opt{'setuid-with-sql'},
+ 'server-cert=s' => \$opt{'server-cert'},
+ 'server-key=s' => \$opt{'server-key'},
'setuid-with-ldap' => \$opt{'setuid-with-ldap'},
- 'Q' => \$opt{'setuid-with-sql'},
- 'virtual-config-dir=s' => \$opt{'virtual-config-dir'},
- 'pidfile|r=s' => \$opt{'pidfile'},
- 'syslog|s=s' => \$opt{'syslog'},
- 'syslog-socket=s' => \$opt{'syslog-socket'},
- 'username|u=s' => \$opt{'username'},
- 'vpopmail!' => \$opt{'vpopmail'},
- 'v' => \$opt{'vpopmail'},
- 'configpath|C=s' => \$opt{'configpath'},
+ 'setuid-with-sql' => \$opt{'setuid-with-sql'},
'siteconfigpath=s' => \$opt{'siteconfigpath'},
- 'user-config' => \$opt{'user-config'},
- 'nouser-config|x' => sub { $opt{'user-config'} = 0 },
- 'allowed-ips|A=s' => \@{ $opt{'allowed-ip'} },
- 'local!' => \$opt{'local'},
- 'L' => \$opt{'local'},
- 'paranoid!' => \$opt{'paranoid'},
- 'P' => \$opt{'paranoid'},
- 'helper-home-dir|H:s' => \$opt{'home_dir_for_helpers'},
- 'auth-ident' => \$opt{'auth-ident'},
- 'ident-timeout=f' => \$opt{'ident-timeout'},
+ 'socketgroup=s' => \$opt{'socketgroup'},
+ 'socketmode=s' => \$opt{'socketmode'},
+ 'socketowner=s' => \$opt{'socketowner'},
+ 'socketpath=s' => \$opt{'socketpath'},
+ 'sql-config!' => \$opt{'sql-config'},
'ssl' => \$opt{'ssl'},
- 'server-key=s' => \$opt{'server-key'},
- 'server-cert=s' => \$opt{'server-cert'},
- 'debug!' => \$opt{'debug'},
- 'D' => \$opt{'debug'},
+ 'syslog-socket=s' => \$opt{'syslog-socket'},
+ 'syslog|s=s' => \$opt{'syslog'},
+ 'user-config' => \$opt{'user-config'},
+ 'username|u=s' => \$opt{'username'},
'version|V' => \$opt{'version'},
- 'help|h' => \$opt{'help'},
+ 'virtual-config-dir=s' => \$opt{'virtual-config-dir'},
+ 'v' => \$opt{'vpopmail'},
+ 'vpopmail!' => \$opt{'vpopmail'},
) or print_usage_and_exit();
if ($opt{'help'}) {