update copyright headers and email addresses

[public-inbox.git] / public-inbox-mda

diff --git a/public-inbox-mda b/public-inbox-mda
index 46a24a14b8df80ab9b084e784a78deedc0bda2d9..1a9469badfecd1c179601d5d7f7cba48b718ccc6 100755 (executable)
--- a/public-inbox-mda
+++ b/public-inbox-mda
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 use strict;
 use warnings;
@@ -64,7 +64,7 @@ if (PublicInbox::MDA->precheck($filter, $dst->{address}) &&
 } else {
        # Ensure emergency spam gets spamassassin headers.
        # This makes it easier to prioritize obvious spam from less obvious
-       if (defined($filtered) && length($filtered)) {
+       if (defined($filtered) && $filtered ne '') {
                my $drop = Email::MIME->new(\$filtered);
                $filtered = undef;
                $filter->simple($drop);
@@ -82,17 +82,13 @@ sub do_spamc {
                run([qw/spamc -E --headers/], \$orig, $out);
        };
 
-       return ($@ || $? || !defined($$out) || length($$out) == 0) ? 0 : 1;
+       return ($@ || $? || !defined($$out) || $$out eq '') ? 0 : 1;
 }
 
 sub search_index_sync {
        my ($git_dir) = @_;
        eval {
-               require PublicInbox::Search;
-               require PublicInbox::GitCatFile;
-               my $git = PublicInbox::GitCatFile->new($git_dir);
-               umask 0022; # XXX FIXME use git config core.sharedRepository
-               my $s = PublicInbox::Search->new($git_dir, 1);
-               $s->index_sync($git);
+               require PublicInbox::SearchIdx;
+               PublicInbox::SearchIdx->new($git_dir, 2)->index_sync;
        };
 }