Dspam should be lower case (lib must normalize it).

Label loop so it next's the right one.
This commit is contained in:
Bradley M. Kuhn 2010-11-20 17:32:03 -05:00
parent 59258c3dfd
commit a31c482e2b

View file

@ -38,7 +38,7 @@ foreach my $dir (@msgDirs) {
die "$MAILDIR_FOLDER must not be a maildir folder (or is unreadable by you), since $dir isn't a readable directory: $!" die "$MAILDIR_FOLDER must not be a maildir folder (or is unreadable by you), since $dir isn't a readable directory: $!"
unless (-d $dir); unless (-d $dir);
} }
foreach my $dir (@msgDirs) { MAIL: foreach my $dir (@msgDirs) {
opendir(MAILDIR, $dir) or die "Unable to open directory $dir for reading: $!"; opendir(MAILDIR, $dir) or die "Unable to open directory $dir for reading: $!";
while (my $file = readdir MAILDIR) { while (my $file = readdir MAILDIR) {
next if -d $file; # skip directories next if -d $file; # skip directories
@ -51,7 +51,7 @@ foreach my $dir (@msgDirs) {
my %dspamVal; my %dspamVal;
foreach my $val ('Confidence', 'Probability') { foreach my $val ('Confidence', 'Probability') {
foreach my $dv (@{$fields->{"X-DSPAM-$val"}}) { foreach my $dv (@{$fields->{"X-Dspam-$val"}}) {
if (not defined $dspamVal{$val}) { if (not defined $dspamVal{$val}) {
$dspamVal{$val} = $dv; $dspamVal{$val} = $dv;
} else { } else {
@ -59,8 +59,8 @@ foreach my $dir (@msgDirs) {
} }
} }
if (not defined $dspamVal{$val}) { if (not defined $dspamVal{$val}) {
print STDERR "File $file has no X-DSPAM-$val header. Skipping.\n"; print STDERR "File $file has no X-Dspam-$val header. Skipping.\n";
next; next MAIL;
} }
} }
$total++; $total++;