clean up.

FNF.
use self->address_clean_up($addr, $addr) to clean up address if could.

5 files changed, 32 insertions, 27 deletions

diff --git a/fml/lib/Mail/Bounce/Exim.pm b/fml/lib/Mail/Bounce/Exim.pm
index d7a35b55..ae3adabf 100644
--- a/fml/lib/Mail/Bounce/Exim.pm
+++ b/fml/lib/Mail/Bounce/Exim.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi
+#  Copyright (C) 2001,2002,2004,2005 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Exim.pm,v 1.12 2004/01/24 09:03:57 fukachan Exp $
+# $FML: Exim.pm,v 1.13 2004/06/30 03:05:16 fukachan Exp $
 #
 
 
@@ -14,6 +14,9 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
 
+@ISA = qw(Mail::Bounce);
+
+
 =head1 NAME
 
 Mail::Bounce::Exim - Exim error message format parser.
@@ -61,9 +64,8 @@ sub analyze
     my $addr = $m->get('X-Failed-Recipients') || '';
 
     # set up return buffer if $addr is found.
-    # XXX-TODO: we should use $self->address_clean_up() ?
     if ($addr) {
-	$addr =~ s/\s*$//o;
+	$addr = $self->address_clean_up($addr, $addr);
 	$result->{ $addr }->{ 'Final-Recipient' } = $addr;
 	$result->{ $addr }->{ 'Status' }          = '5.x.y';
 	$result->{ $addr }->{ 'hints' }           = 'exim';
@@ -81,7 +83,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi
+Copyright (C) 2001,2002,2004,2005 Ken'ichi Fukamachi
 
 All rights reserved. This program is free software; you can
 redistribute it and/or modify it under the same terms as Perl itself.
diff --git a/fml/lib/Mail/Bounce/Freeserve.pm b/fml/lib/Mail/Bounce/Freeserve.pm
index 8ff8002e..9ead91c3 100644
--- a/fml/lib/Mail/Bounce/Freeserve.pm
+++ b/fml/lib/Mail/Bounce/Freeserve.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2003,2004 MURASHITA Takuya
+#  Copyright (C) 2003,2004,2005 MURASHITA Takuya
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Freeserve.pm,v 1.5 2004/06/30 03:05:16 fukachan Exp $
+# $FML: Freeserve.pm,v 1.6 2004/07/10 00:42:00 fukachan Exp $
 #
 
 #
@@ -17,6 +17,8 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
 
+@ISA = qw(Mail::Bounce);
+
 =head1 NAME
 
 Mail::Bounce::Freeserve - Freeserve error message format parser.
@@ -64,8 +66,8 @@ sub analyze
 	my $addr = $1;
 
 	# set up return buffer if $addr is found.
-	# XXX-TODO: we should use $self->address_clean_up() ?
 	if ($addr) {
+	    $addr = $self->address_clean_up($addr, $addr);
 	    $result->{ $addr }->{ 'Final-Recipient' } = $addr;
 	    $result->{ $addr }->{ 'Status' }          = '4.x.y';
 	    $result->{ $addr }->{ 'hints' }           = 'freeserve.ne.jp';
@@ -84,7 +86,7 @@ MURASHITA Takuya
 
 =head1 COPYRIGHT
 
-Copyright (C) 2003,2004 MURASHITA Takuya
+Copyright (C) 2003,2004,2005 MURASHITA Takuya
 
 All rights reserved. This program is free software; you can
 redistribute it and/or modify it under the same terms as Perl itself.
diff --git a/fml/lib/Mail/Bounce/GOO.pm b/fml/lib/Mail/Bounce/GOO.pm
index 66ca51b1..29df7af7 100644
--- a/fml/lib/Mail/Bounce/GOO.pm
+++ b/fml/lib/Mail/Bounce/GOO.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi
+#  Copyright (C) 2001,2002,2004,2005 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: GOO.pm,v 1.11 2004/01/24 09:03:57 fukachan Exp $
+# $FML: GOO.pm,v 1.12 2004/06/30 03:05:16 fukachan Exp $
 #
 
 
@@ -14,6 +14,8 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
 
+@ISA = qw(Mail::Bounce);
+
 =head1 NAME
 
 Mail::Bounce::GOO - GOO error message format parser.
@@ -54,9 +56,8 @@ sub analyze
 	my $addr = $1;
 
 	# set up return buffer if $addr is found.
-	# XXX-TODO: we should use $self->address_clean_up() ?
 	if ($addr) {
-	    $addr =~ s/\s*$//o;
+	    $addr = $self->address_clean_up($addr, $addr);
 	    $result->{ $addr }->{ 'Final-Recipient' } = $addr;
 	    $result->{ $addr }->{ 'Status' }          = '5.x.y';
 	    $result->{ $addr }->{ 'hints' }           = 'goo.ne.jp';
@@ -75,7 +76,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi
+Copyright (C) 2001,2002,2004,2005 Ken'ichi Fukamachi
 
 All rights reserved. This program is free software; you can
 redistribute it and/or modify it under the same terms as Perl itself.
diff --git a/fml/lib/Mail/Bounce/Qmail.pm b/fml/lib/Mail/Bounce/Qmail.pm
index 8058ebcd..7eb7ec21 100644
--- a/fml/lib/Mail/Bounce/Qmail.pm
+++ b/fml/lib/Mail/Bounce/Qmail.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2001,2002,2003,2004 Ken'ichi Fukamachi
+#  Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Qmail.pm,v 1.10 2004/01/24 09:03:57 fukachan Exp $
+# $FML: Qmail.pm,v 1.11 2004/06/30 03:05:16 fukachan Exp $
 #
 
 
@@ -14,6 +14,8 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
 
+@ISA = qw(Mail::Bounce);
+
 =head1 NAME
 
 Mail::Bounce::Qmail - Qmail error message format parser.
@@ -59,8 +61,7 @@ sub analyze
 		    $data =~ s/\n/ /go;
 		    if ($data =~ /\<(\S+\@\S+)\>:\s*(.*)/) {
 			($addr, $reason) = ($1, $2);
-
-			# XXX-TODO: we should use $self->address_clean_up() ?
+			$addr = $self->address_clean_up($addr, $addr);
 
 			my $status = '5.x.y';
 			if ($data =~ /\#(\d+\.\d+\.\d+)/) {
@@ -97,7 +98,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2001,2002,2003,2004 Ken'ichi Fukamachi
+Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi
 
 All rights reserved. This program is free software; you can
 redistribute it and/or modify it under the same terms as Perl itself.
diff --git a/fml/lib/Mail/Bounce/Smtpfeed.pm b/fml/lib/Mail/Bounce/Smtpfeed.pm
index bdf20097..2af47222 100644
--- a/fml/lib/Mail/Bounce/Smtpfeed.pm
+++ b/fml/lib/Mail/Bounce/Smtpfeed.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi
+#  Copyright (C) 2001,2002,2004,2005 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Smtpfeed.pm,v 1.9 2004/01/24 09:03:57 fukachan Exp $
+# $FML: Smtpfeed.pm,v 1.10 2004/06/30 03:05:17 fukachan Exp $
 #
 
 
@@ -14,6 +14,8 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
 
+@ISA = qw(Mail::Bounce);
+
 =head1 NAME
 
 Mail::Bounce::Smtpfeed - Smtpfeed error message format parser.
@@ -49,17 +51,14 @@ sub analyze
     my $header = $m->nth_paragraph( 1 );
     my $addr   = '';
 
-    #
-    # XXX-TODO: code below is correct ?
-    #
-
     if ($header =~
 	/^To: \(original recipient in envelope at \S+\) <(\S+)>/) {
 	$addr = $1;
 	$addr =~ s/\s*$//o;
 
+	# set up return buffer
 	if ($addr) {
-	    # set up return buffer
+	    $addr = $self->address_clean_up($addr, $addr);
 	    $result->{ $addr }->{ 'Final-Recipient' } = $addr;
 	    $result->{ $addr }->{ 'Status' }          = '5.x.y';
 	    $result->{ $addr }->{ 'hints' }           = 'smtpfeed';
@@ -78,7 +77,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi
+Copyright (C) 2001,2002,2004,2005 Ken'ichi Fukamachi
 
 All rights reserved. This program is free software; you can
 redistribute it and/or modify it under the same terms as Perl itself.