not use str.str

8 files changed, 42 insertions, 38 deletions

diff --git a/fml/lib/FML/Config/Tiny.pm b/fml/lib/FML/Config/Tiny.pm
index b8434231..9fb725f6 100644
--- a/fml/lib/FML/Config/Tiny.pm
+++ b/fml/lib/FML/Config/Tiny.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2003 Ken'ichi Fukamachi
+#  Copyright (C) 2003,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: Tiny.pm,v 1.1 2003/03/11 06:17:11 fukachan Exp $
+# $FML: Tiny.pm,v 1.2 2003/08/23 04:35:34 fukachan Exp $
 #
 
 package FML::Config::Tiny;
@@ -74,7 +74,7 @@ sub read
                 $config->{$key}   = $value;
             }
             if ($buf =~ /^\s+(.*)/) {
-                $config->{ $curkey }  .= " ". $1;
+                $config->{ $curkey } .= " $1";
             }
         }
         $fh->close;
@@ -97,7 +97,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2003 Ken'ichi Fukamachi
+Copyright (C) 2003,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/FML/Filter/MimeComponent.pm b/fml/lib/FML/Filter/MimeComponent.pm
index 0006e2a4..d16f35fe 100644
--- a/fml/lib/FML/Filter/MimeComponent.pm
+++ b/fml/lib/FML/Filter/MimeComponent.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2002,2003,2004 Ken'ichi Fukamachi
+#  Copyright (C) 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: MimeComponent.pm,v 1.11 2004/04/23 04:10:34 fukachan Exp $
+# $FML: MimeComponent.pm,v 1.12 2004/07/23 12:41:12 fukachan Exp $
 #
 
 package FML::Filter::MimeComponent;
@@ -12,7 +12,7 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD
 	    $recursive_level $recursive_max_level);
 use Carp;
-use ErrorStatus qw(error_set error error_clear);
+use FML::Filter::ErrorStatus qw(error_set error error_clear);
 
 =head1 NAME
 
@@ -214,7 +214,7 @@ sub mime_component_check
 	for my $key (keys %$reason) {
 	    if ($key ne 'reject') {
 		$_reason .=
-		    $_reason ? " + ".$reason->{ $key } : $reason->{ $key };
+		    $_reason ? " + $reason->{ $key }" : $reason->{ $key };
 	    }
 
 	    if ($key eq 'permit') {
@@ -625,7 +625,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2002,2003,2004 Ken'ichi Fukamachi
+Copyright (C) 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/FML/Header/MessageID.pm b/fml/lib/FML/Header/MessageID.pm
index 67bac059..588455d8 100644
--- a/fml/lib/FML/Header/MessageID.pm
+++ b/fml/lib/FML/Header/MessageID.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: MessageID.pm,v 1.22 2004/03/12 04:22:54 fukachan Exp $
+# $FML: MessageID.pm,v 1.23 2004/07/23 12:43:55 fukachan Exp $
 #
 
 package FML::Header::MessageID;
@@ -169,10 +169,13 @@ generate and return a new message-id.
 sub gen_id
 {
     my ($self, $config) = @_;
+    my $addr = $config->{ article_post_address };
 
     # XXX-TODO: if $config->{ article_post_address } undefined ?
     $Counter++;
-    return "<".time.".$$.$Counter." . $config->{ article_post_address } . ">";
+
+    # "<".time.".$$.$Counter." . $config->{ article_post_address } . ">";
+    return sprintf("<%d.%d.%s.%s>", time, $$, $Counter, $addr);
 }
 
 
@@ -186,7 +189,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/FML/Header/Subject.pm b/fml/lib/FML/Header/Subject.pm
index 90b0a795..c01b9c52 100644
--- a/fml/lib/FML/Header/Subject.pm
+++ b/fml/lib/FML/Header/Subject.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: Subject.pm,v 1.46 2004/07/23 12:44:49 fukachan Exp $
+# $FML: Subject.pm,v 1.47 2004/07/23 15:59:06 fukachan Exp $
 #
 
 package FML::Header::Subject;
@@ -66,7 +66,7 @@ sub rewrite_article_subject_tag
     my ($self, $header, $config, $rw_args) = @_;
     my ($in_code, $out_code);
 
-    # XXX-TODO: need $article_subject_tag expaned already e.g. "\Lmlname\E"
+    # XXX-TODO: need $article_subject_tag expanded already e.g. "\Lmlname\E"
     # XXX-TODO: we should include this exapansion method within this module?
     my $tag     = $config->{ article_subject_tag };
     my $subject = $header->get('subject');
@@ -91,7 +91,7 @@ sub rewrite_article_subject_tag
 
     # add(prepend) the rewrited tag with mime encoding.
     $tag = sprintf($tag, $rw_args->{ id });
-    my $new_subject = $tag." ".$subject;
+    my $new_subject = sprintf("%s %s", $tag, $subject);
     $new_subject = $obj->encode_mime_string($new_subject, 'base64', $in_code);
     $header->replace('Subject', $new_subject);
 }
@@ -281,7 +281,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/FML/MTA/Control/Procmail.pm b/fml/lib/FML/MTA/Control/Procmail.pm
index bfdcd91b..cbc193e9 100644
--- a/fml/lib/FML/MTA/Control/Procmail.pm
+++ b/fml/lib/FML/MTA/Control/Procmail.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2002,2003,2004 Ken'ichi Fukamachi
+#  Copyright (C) 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: Procmail.pm,v 1.4 2004/04/10 12:41:29 fukachan Exp $
+# $FML: Procmail.pm,v 1.5 2004/07/23 13:16:40 fukachan Exp $
 #
 
 package FML::MTA::Control::Procmail;
@@ -44,7 +44,7 @@ sub procmail_install_alias
     use File::Spec;
     my $alias = $config->{ procmail_aliases_file };
     my $src   = File::Spec->catfile($template_dir, 'procmailrc');
-    my $dst   = $alias . "." . $$;
+    my $dst   = sprintf("%s.%s", $alias, $$);
 
     $self->_install($src, $dst, $params);
 
@@ -64,7 +64,7 @@ sub procmail_remove_alias
     my ($self, $curproc, $params, $optargs) = @_;
     my $config    = $curproc->config();
     my $alias     = $config->{ procmail_aliases_file };
-    my $alias_new = $alias."new.$$";
+    my $alias_new = sprintf("%s.%s.%s", $alias, "new", $$);
     my $ml_name   = $params->{ ml_name  };
     my $ml_domain = $params->{ ml_domain };
     my $removed   = 0;
@@ -110,7 +110,7 @@ sub procmail_remove_alias
 }
 
 
-# Descriptions: regenerate aliases.db.
+# Descriptions: regenerate aliases.db (not needed, so dummy).
 #    Arguments: OBJ($self)
 #               OBJ($curproc) HASH_REF($params) HASH_REF($optargs)
 # Side Effects: update aliases
@@ -172,6 +172,7 @@ sub procmail_get_aliases_as_hash_ref
     my $maps       = $self->procmail_alias_maps($curproc, $optargs);
     my $aliases    = {};
 
+    # XXX-TODO: correct ?
     # $0 -n shows fml only aliases
     if ($mode eq 'fmlonly') {
 	$maps = [ $alias_file ];
@@ -301,7 +302,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2002,2003,2004 Ken'ichi Fukamachi
+Copyright (C) 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/FML/Process/DocViewer.pm b/fml/lib/FML/Process/DocViewer.pm
index 0b1164b7..2d3e4be4 100644
--- a/fml/lib/FML/Process/DocViewer.pm
+++ b/fml/lib/FML/Process/DocViewer.pm
@@ -1,9 +1,9 @@
 #-*- perl -*-
 #
-# Copyright (C) 2000,2001,2002,2003,2004 Ken'ichi Fukamachi
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: DocViewer.pm,v 1.32 2004/04/23 04:10:36 fukachan Exp $
+# $FML: DocViewer.pm,v 1.33 2004/07/11 15:43:39 fukachan Exp $
 #
 
 package FML::Process::DocViewer;
@@ -49,7 +49,7 @@ load default configuration files and fix @INC.
 
 =head2 verify_request($args)
 
-show help unless @ARGV.
+show help unless @ARGV specified.
 
 =cut
 
@@ -156,7 +156,7 @@ sub _fmldoc
     # add path for perl executatbles e.g. /usr/local/bin
     eval q{
 	use Config;
-	$ENV{'PATH'} .= ":". $Config{ scriptdir };
+	$ENV{'PATH'} .= sprintf(":%s", $Config{ scriptdir });
 	exec 'perldoc', @opts, @$argv;
     };
     croak($@);
@@ -230,7 +230,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2000,2001,2002,2003,2004 Ken'ichi Fukamachi
+Copyright (C) 2000,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/IO/Adapter/AtomicFile.pm b/fml/lib/IO/Adapter/AtomicFile.pm
index c1d5ab30..ed3757c9 100644
--- a/fml/lib/IO/Adapter/AtomicFile.pm
+++ b/fml/lib/IO/Adapter/AtomicFile.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: AtomicFile.pm,v 1.14 2004/07/11 15:25:52 fukachan Exp $
+# $FML: AtomicFile.pm,v 1.15 2004/07/23 15:59:13 fukachan Exp $
 #
 
 package IO::Adapter::AtomicFile;
@@ -135,7 +135,7 @@ sub open
     # temporary file
     unless (defined $Counter) { $Counter = 0;}
     $Counter++;
-    my $temp = $file.".new.".$$.$Counter;
+    my $temp = sprintf("%s.%s.%s.%s", $file, "new", $$, $Counter);
     ${*$self}{ _orig_file } = $file;
     ${*$self}{ _temp_file } = $temp;
 
@@ -306,7 +306,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/Message/ToHTML.pm b/fml/lib/Mail/Message/ToHTML.pm
index 26eaff64..f9dc0978 100644
--- a/fml/lib/Mail/Message/ToHTML.pm
+++ b/fml/lib/Mail/Message/ToHTML.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2002,2003,2004 Ken'ichi Fukamachi
+#  Copyright (C) 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: ToHTML.pm,v 1.71 2004/07/26 05:47:23 fukachan Exp $
+# $FML: ToHTML.pm,v 1.72 2004/11/14 14:14:14 tmu Exp $
 #
 
 package Mail::Message::ToHTML;
@@ -17,7 +17,7 @@ my $debug = 0;
 my $URL   =
     "<A HREF=\"http://www.fml.org/software/\">Mail::Message::ToHTML</A>";
 
-my $version = q$FML: ToHTML.pm,v 1.71 2004/07/26 05:47:23 fukachan Exp $;
+my $version = q$FML: ToHTML.pm,v 1.72 2004/11/14 14:14:14 tmu Exp $;
 my $versionid = 0;
 if ($version =~ /,v\s+([\d\.]+)\s+/) {
     $versionid = "$1";
@@ -473,7 +473,7 @@ sub _init_htmlfy_rfc822_message
     }
     # last resort: give unique identifier
     elsif (defined $args->{ dst }) {
-	$id  = time.".".$$;
+	$id  = sprintf("%s.%s", time, $$);
 	$dst = $args->{ dst };
     }
     # oops ;) wrong call of this function
@@ -2534,7 +2534,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2002,2003,2004 Ken'ichi Fukamachi
+Copyright (C) 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.