From cbfc74fa77a0c31a916531a30fa30eb459dd6208 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 21 Jan 2014 15:22:01 +0000 Subject: [PATCH] Tidy --- Emesinae/MIME.pm | 5 ++--- scripts/control.pl | 14 ++++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Emesinae/MIME.pm b/Emesinae/MIME.pm index 3be8a16..9b94916 100644 --- a/Emesinae/MIME.pm +++ b/Emesinae/MIME.pm @@ -5,9 +5,8 @@ use MIME::Parser; use warnings; use strict; -sub getmimeparser ($) -{ - my ( $tmp ) = @_; +sub getmimeparser ($) { + my ($tmp) = @_; my $p = new MIME::Parser; $p->tmp_to_core(1); $p->output_under($tmp); diff --git a/scripts/control.pl b/scripts/control.pl index d1e663e..42f20e0 100755 --- a/scripts/control.pl +++ b/scripts/control.pl @@ -42,13 +42,13 @@ sub get_mime($$) { my ( $fh, $tmp ) = @_; my $p = Emesinae::MIME::getmimeparser($tmp); - return $p->parse( $fh ); + return $p->parse($fh); } our $tempdir = File::Temp::tempdir(); -our $mime = get_mime( \*M, $tempdir ); -our $head = $mime->head; -our $body = Emesinae::MIME::getmailbody($mime)->open("r"); +our $mime = get_mime( \*M, $tempdir ); +our $head = $mime->head; +our $body = Emesinae::MIME::getmailbody($mime)->open("r"); rmtree $tempdir, 0, 1; @@ -158,7 +158,8 @@ sub validate_one_header ($$) { sub check_from_blacklist($) { my ($err) = @_; - return unless $head->get('from'); # validate_one_header already handled this. + return + unless $head->get('from'); # validate_one_header already handled this. return if not @{ $c{ControlBlacklist} }; my $addrhead = Mail::Field::AddrList->extract( 'from', $head ); @@ -444,7 +445,8 @@ while (<$body>) { chomp(); push @reply, "> $_"; - s/#.*//g; s/\s+$//; + s/#.*//g; + s/\s+$//; next if (m/^$/); my $done = 0; -- 2.39.5