summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fml/lib/FML/Config/Menu.pm4
-rw-r--r--fml/lib/FML/Filter/External/clamscan.pm4
-rw-r--r--fml/lib/FML/Filter/MimeComponent.pm8
-rw-r--r--fml/lib/FML/Process/Flow.pm6
-rw-r--r--fml/lib/FML/Process/Kernel.pm24
5 files changed, 23 insertions, 23 deletions
diff --git a/fml/lib/FML/Config/Menu.pm b/fml/lib/FML/Config/Menu.pm
index 74a3b52e..47ef96e8 100644
--- a/fml/lib/FML/Config/Menu.pm
+++ b/fml/lib/FML/Config/Menu.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: Menu.pm,v 1.4 2005/06/04 08:49:07 fukachan Exp $
+# $FML: Menu.pm,v 1.5 2005/06/04 08:51:29 fukachan Exp $
#
package FML::Config::Menu;
@@ -242,7 +242,7 @@ sub rewrite_config_cf
# 1. save output into $tmp_file.
my $output = $self->{ _output } || '';
- my $tmp_file = $curproc->temp_file_path();
+ my $tmp_file = $curproc->tmp_file_path();
my $wh = new FileHandle ">> $tmp_file";
if (defined $wh) {
print $wh "\n";
diff --git a/fml/lib/FML/Filter/External/clamscan.pm b/fml/lib/FML/Filter/External/clamscan.pm
index 78330e7a..8b179f02 100644
--- a/fml/lib/FML/Filter/External/clamscan.pm
+++ b/fml/lib/FML/Filter/External/clamscan.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: clamscan.pm,v 1.4 2004/07/23 15:59:06 fukachan Exp $
+# $FML: clamscan.pm,v 1.5 2005/05/26 12:17:34 fukachan Exp $
#
package FML::Filter::External::clamscan;
@@ -80,7 +80,7 @@ sub _check
my ($self, $curproc, $program) = @_;
use FileHandle;
- my $tmp_file = $curproc->temp_file_path();
+ my $tmp_file = $curproc->tmp_file_path();
my $wh = new FileHandle "> $tmp_file";
if (defined $wh) {
$wh->autoflush(1);
diff --git a/fml/lib/FML/Filter/MimeComponent.pm b/fml/lib/FML/Filter/MimeComponent.pm
index d227759d..cae20426 100644
--- a/fml/lib/FML/Filter/MimeComponent.pm
+++ b/fml/lib/FML/Filter/MimeComponent.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: MimeComponent.pm,v 1.13 2005/05/26 10:20:03 fukachan Exp $
+# $FML: MimeComponent.pm,v 1.14 2005/08/09 03:22:23 fukachan Exp $
#
package FML::Filter::MimeComponent;
@@ -410,7 +410,7 @@ sub _rfc822_mime_component_check
croak("too deep recursive call");
}
else {
- my $tmpf = $self->_temp_file_path();
+ my $tmpf = $self->_tmp_file_path();
use FileHandle;
my $wh = new FileHandle "> $tmpf";
@@ -435,13 +435,13 @@ sub _rfc822_mime_component_check
# Arguments: OBJ($self)
# Side Effects: none
# Return Value: none
-sub _temp_file_path
+sub _tmp_file_path
{
my ($self) = @_;
my $curproc = $self->{ _curproc };
if (defined $curproc) {
- return $curproc->temp_file_path();
+ return $curproc->tmp_file_path();
}
elsif ($debug) {
return "./fileter.debug.$$";
diff --git a/fml/lib/FML/Process/Flow.pm b/fml/lib/FML/Process/Flow.pm
index 0f439b3a..76a2b7bc 100644
--- a/fml/lib/FML/Process/Flow.pm
+++ b/fml/lib/FML/Process/Flow.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: Flow.pm,v 1.28 2005/05/26 12:56:35 fukachan Exp $
+# $FML: Flow.pm,v 1.29 2005/06/04 08:49:10 fukachan Exp $
#
package FML::Process::Flow;
@@ -54,7 +54,7 @@ programs kicked by MTA, command line interfaces and CGI's.
$process->finish($args);
# clean up tmporary files
- $process->tmp_files_clean_up();
+ $process->tmp_file_cleanup();
=cut
@@ -105,7 +105,7 @@ sub ProcessStart
$process->sysflow_finalize_stderr_channel($args);
# clean up temporary files
- $process->tmp_files_clean_up();
+ $process->tmp_file_cleanup();
$process->incoming_message_queue_clean_up();
# debug
diff --git a/fml/lib/FML/Process/Kernel.pm b/fml/lib/FML/Process/Kernel.pm
index 0d80f5d2..9b17773d 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.260 2005/07/01 10:05:35 fukachan Exp $
+# $FML: Kernel.pm,v 1.261 2005/08/08 03:52:30 fukachan Exp $
#
package FML::Process::Kernel;
@@ -2643,7 +2643,7 @@ sub queue_in
sub _append_rfc822_message
{
my ($curproc, $msg_in, $msg_out) = @_;
- my $tmpfile = $curproc->temp_file_path();
+ my $tmpfile = $curproc->tmp_file_path();
my $wh = new FileHandle "> $tmpfile";
if (defined $wh) {
@@ -2675,30 +2675,30 @@ sub _append_rfc822_message
# Descriptions: insert $file into garbage collection queue (clean_up_queue).
# Arguments: OBJ($curproc) STR($file)
-# Side Effects: update $curproc->{ __tmp_files_clean_up };
+# Side Effects: update $curproc->{ __tmp_file_cleanup };
# Return Value: none
sub _add_into_clean_up_queue
{
my ($curproc, $file) = @_;
- my $queue = $curproc->{ __tmp_files_clean_up };
+ my $queue = $curproc->{ __tmp_file_cleanup };
if (defined $queue) {
push(@$queue, $file);
}
else {
- $curproc->{ __tmp_files_clean_up } = [ $file ];
+ $curproc->{ __tmp_file_cleanup } = [ $file ];
}
}
# Descriptions: remove garbage collection queue (clean_up_queue).
# Arguments: OBJ($curproc)
-# Side Effects: remove files in $curproc->{ __tmp_files_clean_up }
+# Side Effects: remove files in $curproc->{ __tmp_file_cleanup }
# Return Value: none
-sub tmp_files_clean_up
+sub tmp_file_cleanup
{
my ($curproc) = @_;
- my $queue = $curproc->{ __tmp_files_clean_up };
+ my $queue = $curproc->{ __tmp_file_cleanup };
if (defined $queue) {
for my $q (@$queue) {
@@ -2780,7 +2780,7 @@ sub _is_valid_ml_home_dir
# Arguments: OBJ($curproc)
# Side Effects: update the counter to ensure file name uniqueness
# Return Value: STR
-sub temp_file_path
+sub tmp_file_path
{
my ($curproc) = @_;
my $config = $curproc->config();
@@ -2921,7 +2921,7 @@ sub reply_message_prepare_template
my ($curproc, $pf_args) = @_;
my $config = $curproc->config();
my $tmp_dir = $config->{ tmp_dir };
- my $tmpf = $curproc->temp_file_path();
+ my $tmpf = $curproc->tmp_file_path();
my $src_file = $pf_args->{ src };
my $charset_out = $pf_args->{ charset };
@@ -3030,7 +3030,7 @@ sub sysflow_reopen_stderr_channel
$config->yes('use_log_dup') || $option->{ 'log-dup' } ||
$config->yes('use_log_computer_output') ||
$option->{'log-computer-output'}) {
- my $tmpfile = $curproc->temp_file_path();
+ my $tmpfile = $curproc->tmp_file_path();
my $pcb = $curproc->pcb();
$pcb->set("stderr", "logfile", $tmpfile);
$pcb->set("stderr", "use_log_dup", 1);
@@ -3216,7 +3216,7 @@ sub exit_as_tempfail
my ($curproc) = @_;
# clean up temporary files
- $curproc->tmp_files_clean_up();
+ $curproc->tmp_file_cleanup();
$curproc->incoming_message_queue_clean_up();
# main.