X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=public-inbox-mda;h=1a9469badfecd1c179601d5d7f7cba48b718ccc6;hb=f76f265a851944b5dedcc3be5f3b5224b6ebda89;hp=8e98d6ebe2a89c901895be1836fd3c6d7c1a476c;hpb=9d0d07a7a37c8a0a81646cb3a1e72ec1c937651c;p=public-inbox.git

diff --git a/public-inbox-mda b/public-inbox-mda
index 8e98d6eb..1a9469ba 100755
--- 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,13 +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::SearchIdx;
 		PublicInbox::SearchIdx->new($git_dir, 2)->index_sync;
 	};
 }