diff options
| author | fukachan <fukachan> | 2006-01-09 14:00:53 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2006-01-09 14:00:53 +0000 |
| commit | 998d6457399e07b82ee606d2cff85a3261fd6743 (patch) | |
| tree | 446fe1c910bfc9243914fb7ecc4ed0337bb37eed /fml/lib/FML/Process | |
| parent | 7e1d1a36de7bb1d42262bcf5573a52b56fe22804 (diff) | |
| download | fml8-998d6457399e07b82ee606d2cff85a3261fd6743.tar.gz fml8-998d6457399e07b82ee606d2cff85a3261fd6743.tar.bz2 fml8-998d6457399e07b82ee606d2cff85a3261fd6743.zip | |
white space cosmetics.
fix copyright.
Diffstat (limited to 'fml/lib/FML/Process')
| -rw-r--r-- | fml/lib/FML/Process/CGI/Kernel.pm | 8 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Configure.pm | 10 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Distribute.pm | 10 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Fake.pm | 16 | ||||
| -rw-r--r-- | fml/lib/FML/Process/FetchFML.pm | 8 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Kernel.pm | 36 | ||||
| -rw-r--r-- | fml/lib/FML/Process/PGP.pm | 10 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Switch.pm | 12 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Utils.pm | 12 |
9 files changed, 61 insertions, 61 deletions
diff --git a/fml/lib/FML/Process/CGI/Kernel.pm b/fml/lib/FML/Process/CGI/Kernel.pm index 03dabb99..c4768b1f 100644 --- a/fml/lib/FML/Process/CGI/Kernel.pm +++ b/fml/lib/FML/Process/CGI/Kernel.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 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: Kernel.pm,v 1.88 2005/08/17 10:33:18 fukachan Exp $ +# $FML: Kernel.pm,v 1.89 2005/08/19 11:23:03 fukachan Exp $ # package FML::Process::CGI::Kernel; @@ -432,7 +432,7 @@ sub cgi_execute_command my $comname = $command_args->{ comname }; my $config = $curproc->config(); - # XXX $comname is one of strings defined in the config file, + # XXX $comname is one of strings defined in the config file, # XXX NOT user defined one. unless ($config->has_attribute("admin_cgi_allowed_commands", $comname)) { $curproc->logerror("cgi deny command: mode=$commode level=cgi"); @@ -897,7 +897,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 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/Configure.pm b/fml/lib/FML/Process/Configure.pm index 4296df5c..a9f758ea 100644 --- a/fml/lib/FML/Process/Configure.pm +++ b/fml/lib/FML/Process/Configure.pm @@ -1,9 +1,9 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Configure.pm,v 1.69 2005/06/04 08:49:09 fukachan Exp $ +# $FML: Configure.pm,v 1.70 2005/08/10 15:03:25 fukachan Exp $ # package FML::Process::Configure; @@ -140,7 +140,7 @@ sub run } -# Descriptions: send a report mail +# Descriptions: send a report mail # if --allow-send-message or --allow-reply-message # option specified. # Arguments: OBJ($curproc) HASH_REF($args) @@ -311,7 +311,7 @@ sub _makefml options => \@options, argv => $argv, - # save raw argv for {new,rm}domain commands, which need + # save raw argv for {new,rm}domain commands, which need # for some programs to interprete $ml_name as ml_domain. canon_argv => { ml_name => $argv_ml_name, @@ -379,7 +379,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 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/Distribute.pm b/fml/lib/FML/Process/Distribute.pm index 136c7dd2..8320b17a 100644 --- a/fml/lib/FML/Process/Distribute.pm +++ b/fml/lib/FML/Process/Distribute.pm @@ -1,9 +1,9 @@ #-*- perl -*- # -# Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2000,2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Distribute.pm,v 1.166 2005/11/30 23:30:38 fukachan Exp $ +# $FML: Distribute.pm,v 1.167 2005/12/19 03:06:02 fukachan Exp $ # package FML::Process::Distribute; @@ -580,7 +580,7 @@ sub _deliver_article $curproc->unlock($lock_channel); } else { - # XXX-TODO: o.k. ? + # XXX-TODO: o.k. ? $curproc->logerror("queue: cannot initialize queue system"); $fatal = 1; } @@ -716,7 +716,7 @@ sub _new_thread_check_post $article->add_outline($tdb_args); } - + # Descriptions: the top level entry to create HTML article. # Arguments: OBJ($curproc) # Side Effects: update html database @@ -772,7 +772,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2000,2001,2002,2003,2004,2005,2006 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/Fake.pm b/fml/lib/FML/Process/Fake.pm index 22b3aae8..46114061 100644 --- a/fml/lib/FML/Process/Fake.pm +++ b/fml/lib/FML/Process/Fake.pm @@ -1,9 +1,9 @@ #-*- perl -*- # -# Copyright (C) 2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Fake.pm,v 1.14 2005/08/10 15:03:27 fukachan Exp $ +# $FML: Fake.pm,v 1.15 2005/08/17 10:54:09 fukachan Exp $ # package FML::Process::Fake; @@ -227,13 +227,13 @@ sub _faker_init $curproc->log_message_init(); # we assume - # + # # [/etc/postfix/virtual] # @domain faker=domain@${default_domain} - # + # # [default_domain's alias file] # faker=domain: "|/usr/local/libexec/fml/faker @domain" - # + # if ($curproc->is_valid_domain_syntax($faker_domain)) { $curproc->_set_emul_domain($faker_domain); } @@ -513,7 +513,7 @@ sub _set_emul_ml_list } -# Descriptions: +# Descriptions: # Arguments: OBJ($curproc) # Side Effects: none # Return Value: ARRAY_REF @@ -548,7 +548,7 @@ sub _set_emul_user_list } -# Descriptions: +# Descriptions: # Arguments: OBJ($curproc) # Side Effects: none # Return Value: ARRAY_REF @@ -570,7 +570,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2003,2004,2005,2006 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/FetchFML.pm b/fml/lib/FML/Process/FetchFML.pm index 0b9a21b6..4c50a386 100644 --- a/fml/lib/FML/Process/FetchFML.pm +++ b/fml/lib/FML/Process/FetchFML.pm @@ -1,9 +1,9 @@ #-*- perl -*- # -# Copyright (C) 2005 Ken'ichi Fukamachi +# Copyright (C) 2005,2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: FetchFML.pm,v 1.5 2005/08/23 12:32:06 fukachan Exp $ +# $FML: FetchFML.pm,v 1.6 2005/12/17 13:47:32 fukachan Exp $ # package FML::Process::FetchFML; @@ -274,7 +274,7 @@ sub _fetchfml_retrieve $curproc->logerror("object undefined."); } - if ($mua->error()) { + if ($mua->error()) { $curproc->logerror($mua->error()); next MUA; } @@ -402,7 +402,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2005 Ken'ichi Fukamachi +Copyright (C) 2005,2006 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/Kernel.pm b/fml/lib/FML/Process/Kernel.pm index 71a64756..76128eba 100644 --- a/fml/lib/FML/Process/Kernel.pm +++ b/fml/lib/FML/Process/Kernel.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 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: Kernel.pm,v 1.270 2005/12/18 12:24:09 fukachan Exp $ +# $FML: Kernel.pm,v 1.271 2005/12/19 03:06:02 fukachan Exp $ # package FML::Process::Kernel; @@ -648,7 +648,7 @@ sub simple_loop_check $config->get_as_array_ref( 'incoming_mail_header_loop_check_rules' ); my $match = 0; - if ($config->yes('use_incoming_mail_header_loop_check')) { + if ($config->yes('use_incoming_mail_header_loop_check')) { RULE: for my $rule (@$rules) { if ($header->can($rule)) { @@ -829,12 +829,12 @@ sub ml_variables_resolve # Example: when fml.pl firstly runs without config.cf (fml8) file, # fml.pl should generate config.cf and continue to run. my $config_ph_path = $config_cf_path; - $config_ph_path =~ s/config.cf/config.ph/; + $config_ph_path =~ s/config.cf/config.ph/; use File::stat; my $stat_ph = -f $config_ph_path ? stat($config_ph_path) : undef; my $stat_cf = -f $config_cf_path ? stat($config_cf_path) : undef; - if ((! -f $config_cf_path) || - (defined $stat_ph && defined $stat_cf && + if ((! -f $config_cf_path) || + (defined $stat_ph && defined $stat_cf && $stat_ph->mtime > $stat_cf->mtime)) { my $fallback = $resolver_args->{ fallback } || undef; my $fallback_args = { @@ -919,10 +919,10 @@ sub __debug_ml_xxx @delayed_buffer = (); for my $var (qw(ml_name ml_domain ml_home_prefix ml_home_dir)) { - $curproc->logdebug(sprintf("%-25s = %s", + $curproc->logdebug(sprintf("%-25s = %s", "(debug)$str $var", - (defined $config->{ $var } ? - $config->{ $var } : + (defined $config->{ $var } ? + $config->{ $var } : ''))); } } @@ -1584,7 +1584,7 @@ sub logdebug msg_args => $msg_args, level => 'debug', caller => \@c, - }); + }); } } else { @@ -1656,8 +1656,8 @@ If given, makefml/fml ignores message output. # Descriptions: top level reply message interface. -# It injects the specified message into the system -# global message queue on memory in fact. +# It injects the specified message into the system +# global message queue on memory in fact. # reply_message_inform() recollects them and send it later. # Arguments: OBJ($curproc) OBJ($msg) HASH_REF($rm_args) # Side Effects: none @@ -1786,7 +1786,7 @@ sub _analyze_recipients # if both specified, use default sender. unless (@$recipient || @$recipient_maps) { - my $cred = $curproc->credential(); + my $cred = $curproc->credential(); my $sender = $cred->sender(); $recipient = [ $sender ]; } @@ -2454,7 +2454,7 @@ sub queue_in # default recipient if undefined. unless ($rcptkey) { - my $cred = $curproc->credential(); + my $cred = $curproc->credential(); my $sender = $cred->sender() || undef; if (defined $cred) { $rcptkey = $sender; @@ -2757,7 +2757,7 @@ sub incoming_message_cleanup_queue # XXX ONLY WHEN VALID $ml_home_dir EXISTS. if ($curproc->_is_valid_ml_home_dir()) { # 1. remove incoming queue files. - # 2. remove queues marked as removal in incoming/ queue. + # 2. remove queues marked as removal in incoming/ queue. # XXX cond. 1 must include cond. 2, # XXX but we try again to ensure garbage collection. $curproc->incoming_message_remove_queue(); @@ -2768,7 +2768,7 @@ sub incoming_message_cleanup_queue use Mail::Delivery::Queue; my $queue_dir = $config->{ mail_queue_dir }; - my $queue = new Mail::Delivery::Queue { + my $queue = new Mail::Delivery::Queue { directory => $queue_dir, }; $queue->set_log_function($fp); @@ -3083,7 +3083,7 @@ sub sysflow_reopen_stderr_channel $curproc->is_under_mta_process() || defined $option->{ quiet } || defined $option->{ q } || $config->yes('use_log_dup') || $option->{ 'log-dup' } || - $config->yes('use_log_computer_output') || + $config->yes('use_log_computer_output') || $option->{'log-computer-output'}) { my $tmpfile = $curproc->tmp_file_path(); my $pcb = $curproc->pcb(); @@ -3292,7 +3292,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 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/PGP.pm b/fml/lib/FML/Process/PGP.pm index e5127912..64c5eff8 100644 --- a/fml/lib/FML/Process/PGP.pm +++ b/fml/lib/FML/Process/PGP.pm @@ -1,9 +1,9 @@ #-*- perl -*- # -# Copyright (C) 2005 Ken'ichi Fukamachi +# Copyright (C) 2005,2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: PGP.pm,v 1.4 2005/08/06 07:48:04 fukachan Exp $ +# $FML: PGP.pm,v 1.5 2005/08/10 15:03:27 fukachan Exp $ # package FML::Process::PGP; @@ -287,9 +287,9 @@ sub _setup_pgp_environment $curproc->mkdir($gpg_config_dir, "mode=private"); } - # + # # CONVENSIONAL NAME. - # + # $curproc->_symlink_admin_dir("pgp"); $curproc->_symlink_admin_dir("gpg"); } @@ -348,7 +348,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2005 Ken'ichi Fukamachi +Copyright (C) 2005,2006 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/Switch.pm b/fml/lib/FML/Process/Switch.pm index 30892f87..b0a4e138 100644 --- a/fml/lib/FML/Process/Switch.pm +++ b/fml/lib/FML/Process/Switch.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 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: Switch.pm,v 1.111 2005/12/17 13:47:32 fukachan Exp $ +# $FML: Switch.pm,v 1.112 2005/12/18 11:52:49 fukachan Exp $ # package FML::Process::Switch; @@ -249,7 +249,7 @@ restart new another process (switch to it on running). # Descriptions: restart new another process (switch to it on running). -# Arguments: OBJ($curproc) +# Arguments: OBJ($curproc) # STR($new_myname) STR($ml_name) STR($ml_domain) # HASH_REF($hints) # Side Effects: none @@ -262,7 +262,7 @@ sub NewProcess use File::Basename; my $old_myname = basename($0); - # fake another $args as could as possible. + # fake another $args as could as possible. # XXX (ARGV options main_cf module_info argv curproc cf_list) # XXX these are references, which inherits the original value in $args. my $args = $curproc->dup_curproc_args(); @@ -275,7 +275,7 @@ sub NewProcess # overload options my $_opts = $hints->{ config_overload } || {}; - for my $k (keys %$_opts) { + for my $k (keys %$_opts) { $args->{ options }->{ o }->{ $k } = $_opts->{ $k }; } @@ -614,7 +614,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 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/Utils.pm b/fml/lib/FML/Process/Utils.pm index f262845c..60b64df3 100644 --- a/fml/lib/FML/Process/Utils.pm +++ b/fml/lib/FML/Process/Utils.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 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: Utils.pm,v 1.142 2005/12/17 13:47:58 fukachan Exp $ +# $FML: Utils.pm,v 1.143 2005/12/18 11:53:26 fukachan Exp $ # package FML::Process::Utils; @@ -279,7 +279,7 @@ sub incoming_message_get_current_queue sub incoming_message_stack_queue_for_removal { my ($curproc, $queue) = @_; - my $shm = $curproc->shared_hash_get("incoming_message", + my $shm = $curproc->shared_hash_get("incoming_message", "queue_stack_for_removal"); if (defined $queue) { @@ -307,7 +307,7 @@ sub incoming_message_remove_queue } # 2. additional todo (e.g. fetchfml requests). - my $shm = $curproc->shared_hash_get("incoming_message", + my $shm = $curproc->shared_hash_get("incoming_message", "queue_stack_for_removal"); my $rmlist = $shm->{ stack } || []; @@ -1817,7 +1817,7 @@ sub langinfo_get_charset } # search charset most preferred by Accpet-Language: in our templates. else { - my $found = 0; + my $found = 0; # XXX Accept-Language: affets $reply_message_charset and $cgi_charset. # XXX $reply_mesage_charset indirectly affets $template_file_charset. @@ -2147,7 +2147,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 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. |
