$curproc->resolve_ml_specific_variables( $args );

$curproc->load_config_files( $args->{ cf_list } );
  =>
$curproc->resolve_ml_specific_variables();
my $cf_list = $curproc->get_config_files_list();
$curproc->load_config_files($cf_list);

$curproc->parse_incoming_message($args);
  =>
$curproc->parse_incoming_message();

14 files changed, 56 insertions, 44 deletions

diff --git a/fml/lib/FML/Process/Addr.pm b/fml/lib/FML/Process/Addr.pm
index 6a5a44a1..870fe805 100644
--- a/fml/lib/FML/Process/Addr.pm
+++ b/fml/lib/FML/Process/Addr.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Addr.pm,v 1.12 2003/12/24 14:29:35 fukachan Exp $
+# $FML: Addr.pm,v 1.13 2003/12/28 13:23:21 fukachan Exp $
 #
 
 package FML::Process::Addr;
@@ -80,8 +80,9 @@ sub prepare
     my $eval = $config->get_hook( 'fmladdr_prepare_start_hook' );
     if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
 
-    # $curproc->resolve_ml_specific_variables( $args );
-    $curproc->load_config_files( $args->{ cf_list } );
+    # $curproc->resolve_ml_specific_variables();
+    my $cf_list = $curproc->get_config_files_list();
+    $curproc->load_config_files($cf_list);
     $curproc->fix_perl_include_path();
 
     $eval = $config->get_hook( 'fmladdr_prepare_end_hook' );
diff --git a/fml/lib/FML/Process/Alias.pm b/fml/lib/FML/Process/Alias.pm
index 6ee2623b..56ff84e5 100644
--- a/fml/lib/FML/Process/Alias.pm
+++ b/fml/lib/FML/Process/Alias.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Alias.pm,v 1.13 2003/12/24 14:29:35 fukachan Exp $
+# $FML: Alias.pm,v 1.14 2003/12/28 13:23:21 fukachan Exp $
 #
 
 package FML::Process::Alias;
@@ -76,8 +76,9 @@ sub prepare
     my $eval = $config->get_hook( 'fmlalias_prepare_start_hook' );
     if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
 
-    # $curproc->resolve_ml_specific_variables( $args );
-    $curproc->load_config_files( $args->{ cf_list } );
+    # $curproc->resolve_ml_specific_variables();
+    my $cf_list = $curproc->get_config_files_list();
+    $curproc->load_config_files($cf_list);
     $curproc->fix_perl_include_path();
 
     $eval = $config->get_hook( 'fmlalias_prepare_end_hook' );
diff --git a/fml/lib/FML/Process/CGI/Kernel.pm b/fml/lib/FML/Process/CGI/Kernel.pm
index e8abfe1b..60e41099 100644
--- a/fml/lib/FML/Process/CGI/Kernel.pm
+++ b/fml/lib/FML/Process/CGI/Kernel.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Kernel.pm,v 1.70 2004/01/01 08:48:40 fukachan Exp $
+# $FML: Kernel.pm,v 1.71 2004/01/01 23:52:18 fukachan Exp $
 #
 
 package FML::Process::CGI::Kernel;
@@ -92,7 +92,8 @@ sub prepare
     my ($curproc, $args) = @_;
 
     $curproc->_cgi_resolve_ml_specific_variables( $args );
-    $curproc->load_config_files( $args->{ cf_list } );
+    my $cf_list = $curproc->get_config_files_list();
+    $curproc->load_config_files($cf_list);
     $curproc->fix_perl_include_path();
 
     # modified for admin/*.cgi
diff --git a/fml/lib/FML/Process/Calendar.pm b/fml/lib/FML/Process/Calendar.pm
index 44f121f1..d1c76be2 100644
--- a/fml/lib/FML/Process/Calendar.pm
+++ b/fml/lib/FML/Process/Calendar.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2002,2003 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Calendar.pm,v 1.6 2003/09/02 09:18:45 fukachan Exp $
+# $FML: Calendar.pm,v 1.7 2003/12/24 14:29:36 fukachan Exp $
 #
 
 package FML::Process::Calendar;
@@ -73,7 +73,8 @@ sub prepare
     # load default configurations.
     use FML::Config;
     $curproc->{ config } = new FML::Config;
-    $curproc->load_config_files( $args->{ cf_list } );
+    my $cf_list = $curproc->get_config_files_list();
+    $curproc->load_config_files($cf_list);
 }
 
 
diff --git a/fml/lib/FML/Process/Command.pm b/fml/lib/FML/Process/Command.pm
index 71ffa3b6..8b089e82 100644
--- a/fml/lib/FML/Process/Command.pm
+++ b/fml/lib/FML/Process/Command.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2000,2001,2002,2003 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Command.pm,v 1.92 2003/11/30 09:59:19 fukachan Exp $
+# $FML: Command.pm,v 1.93 2004/01/01 23:52:15 fukachan Exp $
 #
 
 package FML::Process::Command;
@@ -80,14 +80,15 @@ sub prepare
     my $eval = $config->get_hook( 'command_prepare_start_hook' );
     if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
 
-    $curproc->resolve_ml_specific_variables( $args );
-    $curproc->load_config_files( $args->{ cf_list } );
+    $curproc->resolve_ml_specific_variables();
+    my $cf_list = $curproc->get_config_files_list();
+    $curproc->load_config_files($cf_list);
     $curproc->fix_perl_include_path();
     $curproc->scheduler_init();
     $curproc->log_message_init();
 
     if ($config->yes('use_command_mail_program')) {
-	$curproc->parse_incoming_message($args);
+	$curproc->parse_incoming_message();
     }
     else {
 	$curproc->logerror("use of command_mail_program prohibited");
diff --git a/fml/lib/FML/Process/ConfViewer.pm b/fml/lib/FML/Process/ConfViewer.pm
index 88016885..43aec6a6 100644
--- a/fml/lib/FML/Process/ConfViewer.pm
+++ b/fml/lib/FML/Process/ConfViewer.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2000,2001,2002,2003 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: ConfViewer.pm,v 1.24 2003/08/29 15:34:07 fukachan Exp $
+# $FML: ConfViewer.pm,v 1.25 2003/12/24 14:29:36 fukachan Exp $
 #
 
 package FML::Process::ConfViewer;
@@ -77,8 +77,9 @@ sub prepare
 	$curproc->logwarn($@) if $@;
     }
 
-    $curproc->resolve_ml_specific_variables( $args );
-    $curproc->load_config_files( $args->{ cf_list } );
+    $curproc->resolve_ml_specific_variables();
+    my $cf_list = $curproc->get_config_files_list();
+    $curproc->load_config_files($cf_list);
     $curproc->fix_perl_include_path();
 
     $eval = $config->get_hook( 'fmlconf_prepare_end_hook' );
diff --git a/fml/lib/FML/Process/Configure.pm b/fml/lib/FML/Process/Configure.pm
index f641df41..93feebf7 100644
--- a/fml/lib/FML/Process/Configure.pm
+++ b/fml/lib/FML/Process/Configure.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Configure.pm,v 1.57 2003/11/16 12:23:48 fukachan Exp $
+# $FML: Configure.pm,v 1.58 2003/11/29 10:24:28 fukachan Exp $
 #
 
 package FML::Process::Configure;
@@ -77,8 +77,9 @@ sub prepare
     my $eval = $config->get_hook( 'makefml_prepare_start_hook' );
     if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
 
-    $curproc->resolve_ml_specific_variables( $args );
-    $curproc->load_config_files( $args->{ cf_list } );
+    $curproc->resolve_ml_specific_variables();
+    my $cf_list = $curproc->get_config_files_list();
+    $curproc->load_config_files($cf_list);
     $curproc->fix_perl_include_path();
     $curproc->log_message_init();
 
diff --git a/fml/lib/FML/Process/Digest.pm b/fml/lib/FML/Process/Digest.pm
index c3d7b7de..3e6a0942 100644
--- a/fml/lib/FML/Process/Digest.pm
+++ b/fml/lib/FML/Process/Digest.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2002,2003 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Digest.pm,v 1.11 2003/08/29 15:34:07 fukachan Exp $
+# $FML: Digest.pm,v 1.12 2003/12/24 14:29:36 fukachan Exp $
 #
 
 package FML::Process::Digest;
@@ -81,8 +81,9 @@ sub prepare
     my $eval = $config->get_hook( 'digest_prepare_start_hook' );
     if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
 
-    $curproc->resolve_ml_specific_variables( $args );
-    $curproc->load_config_files( $args->{ cf_list } );
+    $curproc->resolve_ml_specific_variables();
+    my $cf_list = $curproc->get_config_files_list();
+    $curproc->load_config_files($cf_list);
     $curproc->fix_perl_include_path();
     $curproc->scheduler_init();
 
diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm
index 7b8cd539..90cbbbdc 100644
--- a/fml/lib/FML/Process/Distribute.pm
+++ b/fml/lib/FML/Process/Distribute.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2000,2001,2002,2003 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Distribute.pm,v 1.132 2003/12/25 10:52:23 tmu Exp $
+# $FML: Distribute.pm,v 1.133 2004/01/01 23:52:16 fukachan Exp $
 #
 
 package FML::Process::Distribute;
@@ -80,14 +80,15 @@ sub prepare
     my $eval = $config->get_hook( 'distribute_prepare_start_hook' );
     if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
 
-    $curproc->resolve_ml_specific_variables( $args );
-    $curproc->load_config_files( $args->{ cf_list } );
+    $curproc->resolve_ml_specific_variables();
+    my $cf_list = $curproc->get_config_files_list();
+    $curproc->load_config_files($cf_list);
     $curproc->fix_perl_include_path();
     $curproc->scheduler_init();
     $curproc->log_message_init();
 
     if ($config->yes('use_distribute_program')) {
-	$curproc->parse_incoming_message($args);
+	$curproc->parse_incoming_message();
     }
     else {
 	$curproc->logerror("use of distribute_program prohibited");
diff --git a/fml/lib/FML/Process/DocViewer.pm b/fml/lib/FML/Process/DocViewer.pm
index df46a034..2afefb43 100644
--- a/fml/lib/FML/Process/DocViewer.pm
+++ b/fml/lib/FML/Process/DocViewer.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2000,2001,2002,2003 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: DocViewer.pm,v 1.26 2003/08/29 15:34:07 fukachan Exp $
+# $FML: DocViewer.pm,v 1.27 2003/12/24 14:29:36 fukachan Exp $
 #
 
 package FML::Process::DocViewer;
@@ -80,8 +80,9 @@ sub prepare
     my $eval = $config->get_hook( 'fmldoc_prepare_start_hook' );
     if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
 
-    # $curproc->resolve_ml_specific_variables( $args );
-    $curproc->load_config_files( $args->{ cf_list } );
+    # $curproc->resolve_ml_specific_variables();
+    my $cf_list = $curproc->get_config_files_list();
+    $curproc->load_config_files($cf_list);
     $curproc->fix_perl_include_path();
 
     $eval = $config->get_hook( 'fmldoc_prepare_end_hook' );
diff --git a/fml/lib/FML/Process/Error.pm b/fml/lib/FML/Process/Error.pm
index e7815b61..1b665b57 100644
--- a/fml/lib/FML/Process/Error.pm
+++ b/fml/lib/FML/Process/Error.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2002,2003 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Error.pm,v 1.35 2003/11/29 10:24:29 fukachan Exp $
+# $FML: Error.pm,v 1.36 2004/01/01 23:52:16 fukachan Exp $
 #
 
 package FML::Process::Error;
@@ -76,14 +76,15 @@ sub prepare
     my $eval = $config->get_hook( 'error_prepare_start_hook' );
     if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
 
-    $curproc->resolve_ml_specific_variables( $args );
-    $curproc->load_config_files( $args->{ cf_list } );
+    $curproc->resolve_ml_specific_variables();
+    my $cf_list = $curproc->get_config_files_list();
+    $curproc->load_config_files($cf_list);
     $curproc->fix_perl_include_path();
     $curproc->scheduler_init();
     $curproc->log_message_init();
 
     if ($config->yes('use_error_analyzer_program')) {
-	$curproc->parse_incoming_message($args);
+	$curproc->parse_incoming_message();
     }
     else {
 	exit(0);
diff --git a/fml/lib/FML/Process/Fake.pm b/fml/lib/FML/Process/Fake.pm
index bb43cc42..dd1fcc56 100644
--- a/fml/lib/FML/Process/Fake.pm
+++ b/fml/lib/FML/Process/Fake.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2003 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Fake.pm,v 1.2 2003/12/30 03:57:05 fukachan Exp $
+# $FML: Fake.pm,v 1.3 2004/01/01 23:52:16 fukachan Exp $
 #
 
 package FML::Process::Fake;
@@ -208,7 +208,8 @@ sub _faker_init
     $config->set('ml_home_dir',    $ml_home_dir);
 
     # init
-    $curproc->load_config_files( $args->{ cf_list } );
+    my $cf_list = $curproc->get_config_files_list();
+    $curproc->load_config_files($cf_list);
     $curproc->fix_perl_include_path();
     $curproc->scheduler_init();
     $curproc->log_message_init();
diff --git a/fml/lib/FML/Process/HTMLify.pm b/fml/lib/FML/Process/HTMLify.pm
index 02599ddf..c7730125 100644
--- a/fml/lib/FML/Process/HTMLify.pm
+++ b/fml/lib/FML/Process/HTMLify.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: HTMLify.pm,v 1.29 2003/08/23 07:24:47 fukachan Exp $
+# $FML: HTMLify.pm,v 1.30 2003/08/29 15:34:08 fukachan Exp $
 #
 
 package FML::Process::HTMLify;
@@ -71,8 +71,9 @@ sub prepare
     my $eval = $config->get_hook( 'fmlhtmlify_prepare_start_hook' );
     if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; }
 
-    $curproc->resolve_ml_specific_variables( $args );
-    $curproc->load_config_files( $args->{ cf_list } );
+    $curproc->resolve_ml_specific_variables();
+    my $cf_list = $curproc->get_config_files_list();
+    $curproc->load_config_files($cf_list);
     $curproc->fix_perl_include_path();
 
     $eval = $config->get_hook( 'fmlhtmlify_prepare_end_hook' );
diff --git a/fml/lib/FML/Process/Kernel.pm b/fml/lib/FML/Process/Kernel.pm
index 5bf560d3..11b83249 100644
--- a/fml/lib/FML/Process/Kernel.pm
+++ b/fml/lib/FML/Process/Kernel.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Kernel.pm,v 1.200 2003/12/30 03:53:53 fukachan Exp $
+# $FML: Kernel.pm,v 1.201 2004/01/01 23:52:16 fukachan Exp $
 #
 
 package FML::Process::Kernel;
@@ -627,7 +627,7 @@ with considering virtual domains.
 # Return Value: none
 sub resolve_ml_specific_variables
 {
-    my ($curproc, $args) = @_;
+    my ($curproc) = @_;
     my ($ml_name, $ml_domain, $ml_home_prefix, $ml_home_dir);
     my ($command, @options, $config_cf_path);
     my $config  = $curproc->config();
@@ -778,8 +778,7 @@ sub resolve_ml_specific_variables
 	$curproc->__debug_ml_xxx('resolv:');
 
 	# add this ml's config.cf to the .cf list.
-	my $list = $args->{ cf_list };
-	push(@$list, $config_cf_path);
+	$curproc->append_to_config_files_list($config_cf_path);
     }
     else {
 	$curproc->logerror("cannot determine which ml_name");
@@ -956,7 +955,7 @@ The C<body> is C<Mail::Message> object.
 # Return Value: none
 sub parse_incoming_message
 {
-    my ($curproc, $args) = @_;
+    my ($curproc) = @_;
 
     # parse incoming mail to cut off it to the header and the body.
     use FML::Parse;