(filter_mail): Now that the formatting isn't spitting too many spaces,

[minc] / minc

diff --git a/minc b/minc
index 70f95d0c6e0f8edd33533a997a7e0e7d810fb38d..05a3b636c496d8f1d6ae51312b632000d0166477 100755 (executable)
--- a/minc
+++ b/minc
@@ -95,7 +95,7 @@ GetOptions(
            'p' => \$printfilenames,
           ) or pod2usage();
 $help and pod2usage(-exitstatus=>0, -verbose=>1);
-scalar(@ARGV) == 0 or pod2usage();
+@ARGV == 0 or pod2usage();
 
 our $run = !$norun;
 
@@ -181,7 +181,6 @@ marked unseen.
 =cut
 
 our @FILTERS;
-require "$HOME/.mincfilter";
 
 my $mh;
 my $logfile;
@@ -246,25 +245,14 @@ sub log_headers {
 # Utility procedures
 
 sub mkfolder {
-    my $mhfolder = shift;
-    my $folder;
+    my $folder = shift;
     my $target;
     my $component;
 
-    $folder = $mh . '/' . $mhfolder;
-    $target = '';
-
-    if (not -d $folder) {
-        foreach $component (split('/', $folder)) {
-            if (defined($component) and length($component) >= 1) {
-                $target = $target . '/' . $component;
-                if (-d $target or mkdir($target)) {
-                    next;
-                } else {
-                    die("Failed to create +$mhfolder ($component)");
-                }
-            }
-        }
+    $target = $mh;
+    foreach $component (split('/', $folder)) {
+        $target = join('/', $target, $component);
+        -d $target or mkdir($target) or die("mkdir($target): $!");
     }
 }
 
@@ -273,7 +261,7 @@ sub getfiles {
     my @result;
 
     if (not opendir(DIR, $dir)) {
-        die("Failed opendir($dir)");
+        die("opendir($dir): $!");
     }
 
     # Initialize $! to 0 (success) because stupid stupid Perl provides
@@ -282,21 +270,17 @@ sub getfiles {
     # to detect an error.  Real Programmers don't handle errors,
     # right?  >sigh<
     $! = 0;
-    @result = grep {
-        ($_ ne '.' and $_ ne '..')
-          and $_ = "$MAILDIR/new/$_"
-      } readdir(DIR);
-
+    @result = readdir(DIR);
     if ($! != 0) {
-        die("Failed readdir($dir)");
+        die("readdir($dir): $!");
     }
 
-    if (scalar(@result) == 0) {
+    if (@result <= 2) {
         exit(0);
     }
 
     STDOUT->autoflush(1);
-    print(scalar(@result), " messages...");
+    print(@result - 2, " messages...");
 
     closedir(DIR);
 
@@ -312,14 +296,15 @@ sub get_highest_msgnum {
 
     $dir = "$mh/$mhfolder";
     if (not opendir(DIR, $dir)) {
-        die("Failed opendir($dir)");
+        die("opendir($dir): $!");
     }
 
+    # Insert rant from getfiles here.
     $! = 0;
     @list = readdir(DIR);
 
     if ($! != 0) {
-        die("Failed readdir($dir)");
+        die("readdir($dir): $!");
     }
 
     closedir(DIR);
@@ -376,7 +361,7 @@ sub store_message {
                 # file is left behind as opposed to a duplicate
                 # message.  This is more easily detected by the user.
                 if ($run) {
-                    if (sysopen(MSG, "$mhmsg",
+                    if (sysopen(MSG, $mhmsg,
                                 O_WRONLY | O_EXCL | O_CREAT, 0600)) {
                         close(MSG);
                         last;
@@ -403,7 +388,7 @@ sub store_message {
 
     if ($run) {
         if (not rename($msg, $mhmsg)) {
-            die("Failed rename($msg, $mhmsg)");
+            die("rename($msg, $mhmsg): $!");
         }
 
         # Mark each message as soon as we store it and bomb if that
@@ -415,6 +400,8 @@ sub store_message {
         } else {
             $status = system('mark', "+$mhfolder", "$msgnum", '-sequence',
                              'unseen', '-add');
+            # XXX need to handle signalled and stopped, and print
+            # the exit code or signal number.
             if (not WIFEXITED($status)) {
                 die("Failed to run mark");
             } elsif (WEXITSTATUS($status) != 0) {
@@ -440,7 +427,7 @@ sub get_headers {
     my $fieldname;              # unmolested header name
     my $contents;               # contents of header
 
-    open(MSG, $msg);
+    open(MSG, $msg) or die("open(MSG, $msg): $!");
     while (<MSG>) {
         chomp;
         if (length == 0) {
@@ -543,8 +530,8 @@ sub find_mh_folder {
 
 sub filter_mail {
     my @msglist = @_;
-    my $msgcount = scalar(@msglist);
-    my $msgcountlen = length($msgcount);
+    my $msgcount = @msglist - 2; # don't count . and ..
+    my $len = length($msgcount);
     my @baton;
     my $msg;
     my $mhfolder;
@@ -560,16 +547,22 @@ sub filter_mail {
         eval "sub spam_check { return 0; }";
     }
 
+    if (-f "$HOME/.mincfilter") {
+        require "$HOME/.mincfilter";
+    }
+
     @baton = spam_start_hook();
 
     foreach $msg (@msglist) {
+        ($msg eq '.' or $msg eq '..') and next;
+
         if ($printfilenames) {
             print("$msg\n");
         }
 
         if (spam_check($msg, @baton)) {
             $mhfolder = 'SPAM';
-            $spam = scalar(@SPAM)+ 1;
+            $spam = @SPAM + 1;
         } else {
             $mhfolder = find_mh_folder($msg);
             $saved++;
@@ -579,12 +572,12 @@ sub filter_mail {
 
         print("\r");
         if (not $FOLDERS{$mhfolder}) {
-            print(' ' x $msgcountlen);
-            print("                                \r+$mhfolder\n");
+            print(' ' x $len);
+            print("                                 \r$mhfolder\n");
             $FOLDERS{$mhfolder} = 1;
         }
 
-        printf('%6d SPAM %6d saved %6d/%1d',
+        printf(" \%${len}d SPAM \%${len}d saved \%${len}d/%1d",
                $spam, $saved, $spam + $saved, $msgcount);
 
         defined($maxmsgs) and ($spam + $saved < $maxmsgs or last);
@@ -596,17 +589,17 @@ sub filter_mail {
 
 \f
 MAIN: {
-    my @msglist;
     my $st;
 
     if ($dumpfilters) {
+        require "$HOME/.mincfilter";
         $Data::Dumper::Indent = 1;
         print(Dumper(\@FILTERS));
         exit;
     }
 
-    @msglist = (
-                map { $_->[1] }
+    chdir("$MAILDIR/new") or die("chdir($MAILDIR/new): $!");
+    filter_mail(map { $_->[1] }
                 sort { $a->[0] <=> $b->[0] }
                 map {
                     if (not ($st = stat($_))) {
@@ -614,9 +607,7 @@ MAIN: {
                     }
                     [$st->mtime, $_]
                 }
-                getfiles("$MAILDIR/new"));
-
-    filter_mail(@msglist);
+                getfiles('.'));
 
     @SPAM and (exec('scan', '+SPAM', @SPAM) or die);
 }