summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2002-03-17 06:24:29 +0000
committerfukachan <fukachan>2002-03-17 06:24:29 +0000
commitf2ab3fdc66cbc7911f0557fc08b1012c19d22be6 (patch)
tree3757eac980a4684bbb91f92385503afd001cc572
parentab1df9659060a39a97561c89084a6d794005ed98 (diff)
downloadfml8-f2ab3fdc66cbc7911f0557fc08b1012c19d22be6.tar.gz
fml8-f2ab3fdc66cbc7911f0557fc08b1012c19d22be6.tar.bz2
fml8-f2ab3fdc66cbc7911f0557fc08b1012c19d22be6.zip
nuke superflous \s*$
-rw-r--r--fml/lib/FML/Command/Admin/htmlify.pm4
-rw-r--r--fml/lib/FML/Command/User/chaddr.pm6
-rw-r--r--fml/lib/FML/Process/Command.pm16
-rw-r--r--fml/lib/FML/Process/ConfViewer.pm8
-rw-r--r--fml/lib/FML/Process/DocViewer.pm8
-rw-r--r--fml/lib/FML/Process/HTMLify.pm10
-rw-r--r--fml/lib/FML/Process/Kernel.pm12
-rw-r--r--fml/lib/FML/Process/ThreadTrack.pm8
-rw-r--r--fml/lib/FML/Process/Utils.pm4
9 files changed, 38 insertions, 38 deletions
diff --git a/fml/lib/FML/Command/Admin/htmlify.pm b/fml/lib/FML/Command/Admin/htmlify.pm
index c2031966..496c5a1a 100644
--- a/fml/lib/FML/Command/Admin/htmlify.pm
+++ b/fml/lib/FML/Command/Admin/htmlify.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: htmlify.pm,v 1.7 2002/02/18 14:24:12 fukachan Exp $
+# $FML: htmlify.pm,v 1.8 2002/02/20 14:10:37 fukachan Exp $
#
package FML::Command::Admin::htmlify;
@@ -40,7 +40,7 @@ or
--outdir=/var/www/htdocs/mlarchives/elena
if --srcdir is not specified, the source is taken from
-/var/spool/ml/$ml_name/spool/.
+/var/spool/ml/$ml_name/spool/.
=head1 METHODS
diff --git a/fml/lib/FML/Command/User/chaddr.pm b/fml/lib/FML/Command/User/chaddr.pm
index d07edbe7..54919d3f 100644
--- a/fml/lib/FML/Command/User/chaddr.pm
+++ b/fml/lib/FML/Command/User/chaddr.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: chaddr.pm,v 1.8 2002/03/17 04:21:38 fukachan Exp $
+# $FML: chaddr.pm,v 1.9 2002/03/17 05:27:32 fukachan Exp $
#
package FML::Command::User::chaddr;
@@ -35,7 +35,7 @@ After confirmation succeeds, chaddr process proceeds.
=head2 C<process($curproc, $command_args)>
-if the old address in chaddr arguments is a member,
+if the old address in chaddr arguments is a member,
try to confirm this request irrespective of "From:" address.
=cut
@@ -96,7 +96,7 @@ sub process
my $prompt = $config->{ command_prompt } || '>>>';
$curproc->reply_message("\n$prompt $command", $optargs);
- # if either old or new addresses in chaddr arguments is an ML member,
+ # if either old or new addresses in chaddr arguments is an ML member,
# try to confirm this request irrespective of "From:" address.
if ($cred->is_member($curproc, { address => $old_addr }) ||
$cred->is_member($curproc, { address => $new_addr })) {
diff --git a/fml/lib/FML/Process/Command.pm b/fml/lib/FML/Process/Command.pm
index 47d04df6..bc00c905 100644
--- a/fml/lib/FML/Process/Command.pm
+++ b/fml/lib/FML/Process/Command.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2000,2001,2002 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: Command.pm,v 1.35 2002/02/17 13:51:49 fukachan Exp $
+# $FML: Command.pm,v 1.36 2002/02/23 11:02:17 fukachan Exp $
#
package FML::Process::Command;
@@ -202,7 +202,7 @@ sub _pre_scan
# special traps
my $confirm_prefix = $config->{ confirm_command_prefix };
- my $admin_prefix = $config->{ privileged_command_prefix };
+ my $admin_prefix = $config->{ privileged_command_prefix };
my $confirm_found = '';
my $admin_found = '';
@@ -335,9 +335,9 @@ sub _evaluate_command
# preliminary scanning for message to find "confirm" or "admin"
my ($id, $admin_password) = $curproc->_pre_scan( \@body );
- # special traps are needed for "confirm" and "admin" commands.
+ # special traps are needed for "confirm" and "admin" commands.
my $confirm_prefix = $config->{ confirm_command_prefix };
- my $admin_prefix = $config->{ privileged_command_prefix };
+ my $admin_prefix = $config->{ privileged_command_prefix };
my $eval = $config->get_hook( 'command_run_start_hook' );
if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -375,9 +375,9 @@ sub _evaluate_command
Log("try $comname <$command>");
$command =~ s/^.*$comname/admin $comname/;
- my $opts = {
- mode => 'privileged_user',
- comname => $comname,
+ my $opts = {
+ mode => 'privileged_user',
+ comname => $comname,
command => $command };
unless ($curproc->_can_accpet_command($args, $opts)) {
# no, we do not accept this command.
@@ -392,7 +392,7 @@ sub _evaluate_command
# validate general command except for confirmation
# if $id is 1, this message must be confirmation reply.
else {
- my $opts = {
+ my $opts = {
mode => 'user', comname => $comname, command => $command };
unless ($curproc->_can_accpet_command($args, $opts)) {
# no, we do not accept this command.
diff --git a/fml/lib/FML/Process/ConfViewer.pm b/fml/lib/FML/Process/ConfViewer.pm
index d3518609..b4c0c9ba 100644
--- a/fml/lib/FML/Process/ConfViewer.pm
+++ b/fml/lib/FML/Process/ConfViewer.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2000,2001,2002 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: ConfViewer.pm,v 1.8 2002/02/17 03:07:55 fukachan Exp $
+# $FML: ConfViewer.pm,v 1.9 2002/02/17 13:45:10 fukachan Exp $
#
package FML::Process::ConfViewer;
@@ -64,7 +64,7 @@ sub new
sub prepare
{
my ($curproc, $args) = @_;
- my $config = $curproc->{ config };
+ my $config = $curproc->{ config };
my $eval = $config->get_hook( 'fmlconf_prepare_start_hook' );
if ($eval) {
@@ -89,7 +89,7 @@ sub verify_request
{
my ($curproc, $args) = @_;
my $argv = $curproc->command_line_argv();
- my $config = $curproc->{ config };
+ my $config = $curproc->{ config };
my $eval = $config->get_hook( 'fmlconf_verify_request_start_hook' );
if ($eval) {
@@ -188,7 +188,7 @@ _EOF_
sub finish
{
my ($curproc, $args) = @_;
- my $config = $curproc->{ config };
+ my $config = $curproc->{ config };
my $eval = $config->get_hook( 'fmlconf_finish_start_hook' );
if ($eval) {
diff --git a/fml/lib/FML/Process/DocViewer.pm b/fml/lib/FML/Process/DocViewer.pm
index 8410fdf8..6c80a948 100644
--- a/fml/lib/FML/Process/DocViewer.pm
+++ b/fml/lib/FML/Process/DocViewer.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2000,2001,2002 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: DocViewer.pm,v 1.13 2002/02/17 03:07:56 fukachan Exp $
+# $FML: DocViewer.pm,v 1.14 2002/02/17 13:45:10 fukachan Exp $
#
package FML::Process::DocViewer;
@@ -70,7 +70,7 @@ sub new
sub prepare
{
my ($curproc, $args) = @_;
- my $config = $curproc->{ config };
+ my $config = $curproc->{ config };
my $eval = $config->get_hook( 'fmldoc_prepare_start_hook' );
if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -89,7 +89,7 @@ sub verify_request
{
my ($curproc, $args) = @_;
my $argv = $curproc->command_line_argv();
- my $config = $curproc->{ config };
+ my $config = $curproc->{ config };
my $eval = $config->get_hook( 'fmldoc_verify_request_start_hook' );
if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -207,7 +207,7 @@ finalize.
sub finish
{
my ($curproc, $args) = @_;
- my $config = $curproc->{ config };
+ my $config = $curproc->{ config };
my $eval = $config->get_hook( 'fmldoc_finish_start_hook' );
if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
diff --git a/fml/lib/FML/Process/HTMLify.pm b/fml/lib/FML/Process/HTMLify.pm
index 5ad81241..e2a3029f 100644
--- a/fml/lib/FML/Process/HTMLify.pm
+++ b/fml/lib/FML/Process/HTMLify.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2000-2001,2002 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: HTMLify.pm,v 1.10 2002/02/17 03:07:56 fukachan Exp $
+# $FML: HTMLify.pm,v 1.11 2002/02/17 13:45:10 fukachan Exp $
#
package FML::Process::HTMLify;
@@ -66,7 +66,7 @@ sub new
sub prepare
{
my ($curproc, $args) = @_;
- my $config = $curproc->{ config };
+ my $config = $curproc->{ config };
my $eval = $config->get_hook( 'fmlhtmlify_prepare_start_hook' );
if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -83,7 +83,7 @@ sub prepare
sub verify_request
{
my ($curproc, $args) = @_;
- my $config = $curproc->{ config };
+ my $config = $curproc->{ config };
my $eval = $config->get_hook( 'fmlhtmlify_verify_request_start_hook' );
if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -106,7 +106,7 @@ call the actual thread tracking system.
sub run
{
my ($curproc, $args) = @_;
- my $config = $curproc->{ config };
+ my $config = $curproc->{ config };
my $argv = $curproc->command_line_argv();
my $options = $curproc->command_line_options();
my $src_dir = $argv->[0];
@@ -178,7 +178,7 @@ _EOF_
sub finish
{
my ($curproc, $args) = @_;
- my $config = $curproc->{ config };
+ my $config = $curproc->{ config };
my $eval = $config->get_hook( 'fmlhtmlify_finish_start_hook' );
if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
diff --git a/fml/lib/FML/Process/Kernel.pm b/fml/lib/FML/Process/Kernel.pm
index 5136864b..b2a17c48 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.79 2002/03/17 02:44:09 fukachan Exp $
+# $FML: Kernel.pm,v 1.80 2002/03/17 04:20:03 fukachan Exp $
#
package FML::Process::Kernel;
@@ -657,7 +657,7 @@ sub reply_message_nl
}
else {
LogWarn("no such file: $file");
- }
+ }
if (defined $buf) {
eval q{
@@ -707,7 +707,7 @@ sub inform_reply_messages
# We should classify reply messages by
# a set of ( category, recipient(s) , + more ? what ??? );
- # Hmm, it is better to sort message by
+ # Hmm, it is better to sort message by
# 1. recipients
# 2. pick up messages for it/them.
# merge messages by types if needed.
@@ -751,7 +751,7 @@ sub queue_in
my $is_multipart = 0;
my $rcptkey = '';
my $rcptlist = [];
- my $msg = '';
+ my $msg = '';
# override parameters (may be processed here always)
if (defined $optargs) {
@@ -847,7 +847,7 @@ sub queue_in
my $t = $m->{ type };
my $r = _gen_recipient_key( $m->{ recipient } );
- next QUEUE unless $r eq $rcptkey;
+ next QUEUE unless $r eq $rcptkey;
unless ($t eq 'text') {
$msg->attach(Type => $q->{ type },
@@ -869,7 +869,7 @@ sub queue_in
my $t = $m->{ type };
my $r = _gen_recipient_key( $m->{ recipient } );
- next QUEUE unless $r eq $rcptkey;
+ next QUEUE unless $r eq $rcptkey;
if ($t eq 'text') {
$s .= $q;
diff --git a/fml/lib/FML/Process/ThreadTrack.pm b/fml/lib/FML/Process/ThreadTrack.pm
index 13df4919..15d42ee5 100644
--- a/fml/lib/FML/Process/ThreadTrack.pm
+++ b/fml/lib/FML/Process/ThreadTrack.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2001,2002 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: ThreadTrack.pm,v 1.23 2002/02/17 13:45:10 fukachan Exp $
+# $FML: ThreadTrack.pm,v 1.24 2002/02/27 09:20:33 tmu Exp $
#
package FML::Process::ThreadTrack;
@@ -64,7 +64,7 @@ sub new
sub prepare
{
my ($curproc, $args) = @_;
- my $config = $curproc->{ config };
+ my $config = $curproc->{ config };
my $eval = $config->get_hook( 'fmlthread_prepare_start_hook' );
if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -82,7 +82,7 @@ sub verify_request
{
my ($curproc, $args) = @_;
my $argv = $curproc->command_line_argv();
- my $config = $curproc->{ config };
+ my $config = $curproc->{ config };
my $eval = $config->get_hook( 'fmlthread_verify_request_start_hook' );
if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -383,7 +383,7 @@ _EOF_
sub finish
{
my ($curproc, $args) = @_;
- my $config = $curproc->{ config };
+ my $config = $curproc->{ config };
my $eval = $config->get_hook( 'fmlthread_finish_start_hook' );
if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
diff --git a/fml/lib/FML/Process/Utils.pm b/fml/lib/FML/Process/Utils.pm
index b7584782..6b6b2529 100644
--- a/fml/lib/FML/Process/Utils.pm
+++ b/fml/lib/FML/Process/Utils.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: Utils.pm,v 1.12 2002/02/17 03:13:48 fukachan Exp $
+# $FML: Utils.pm,v 1.13 2002/02/24 08:23:59 fukachan Exp $
#
package FML::Process::Utils;
@@ -269,7 +269,7 @@ sub __ml_home_prefix_from_main_cf
if (defined $domain) {
my ($virtual_maps) = __get_virtual_maps($main_cf);
if (@$virtual_maps) {
- __ml_home_prefix_search_in_virtual_maps($main_cf,
+ __ml_home_prefix_search_in_virtual_maps($main_cf,
$domain,
$virtual_maps);
}