diff options
| author | fukachan <fukachan> | 2002-06-01 05:09:23 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2002-06-01 05:09:23 +0000 |
| commit | 65eb6df28e7506613c519744ef2977fbc06b6791 (patch) | |
| tree | cb96ae23fa4549c25661136f26ad830a6996b6b2 /fml | |
| parent | b59bd780d2e1c055cb03dc26c8fd2a321242a0f3 (diff) | |
| download | fml8-65eb6df28e7506613c519744ef2977fbc06b6791.tar.gz fml8-65eb6df28e7506613c519744ef2977fbc06b6791.tar.bz2 fml8-65eb6df28e7506613c519744ef2977fbc06b6791.zip | |
nuke white spaces \s*$
Diffstat (limited to 'fml')
| -rw-r--r-- | fml/lib/FML/Command/Admin/newml.pm | 6 | ||||
| -rw-r--r-- | fml/lib/FML/Command/Auth.pm | 6 | ||||
| -rw-r--r-- | fml/lib/FML/Config/Convert.pm | 4 | ||||
| -rw-r--r-- | fml/lib/FML/MTAControl.pm | 10 | ||||
| -rw-r--r-- | fml/lib/FML/MTAControl/Qmail.pm | 14 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Command.pm | 12 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Distribute.pm | 4 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Error.pm | 6 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Kernel.pm | 8 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Switch.pm | 4 | ||||
| -rw-r--r-- | fml/lib/IO/Adapter/File.pm | 4 | ||||
| -rw-r--r-- | fml/lib/Mail/Delivery/SMTP.pm | 4 | ||||
| -rw-r--r-- | fml/lib/Mail/Delivery/Utils.pm | 4 |
13 files changed, 43 insertions, 43 deletions
diff --git a/fml/lib/FML/Command/Admin/newml.pm b/fml/lib/FML/Command/Admin/newml.pm index 7f868497..57ffd57b 100644 --- a/fml/lib/FML/Command/Admin/newml.pm +++ b/fml/lib/FML/Command/Admin/newml.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: newml.pm,v 1.38 2002/05/28 14:55:31 fukachan Exp $ +# $FML: newml.pm,v 1.39 2002/06/01 05:02:32 fukachan Exp $ # package FML::Command::Admin::newml; @@ -150,7 +150,7 @@ sub _install_template_files my $config = $curproc->{ config }; my $template_dir = $curproc->template_files_dir_for_newml(); my $ml_home_dir = $params->{ ml_home_dir }; - my $templ_files = + my $templ_files = $config->get_as_array_ref('newml_command_template_files'); for my $file (@$templ_files) { @@ -163,7 +163,7 @@ sub _install_template_files use FML::MTAControl; - # setup include include-ctl ... + # setup include include-ctl ... my $postfix = new FML::MTAControl { mta_type => 'postfix' }; $postfix->setup($curproc, $params); diff --git a/fml/lib/FML/Command/Auth.pm b/fml/lib/FML/Command/Auth.pm index ba456b18..2ca9b48a 100644 --- a/fml/lib/FML/Command/Auth.pm +++ b/fml/lib/FML/Command/Auth.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: Auth.pm,v 1.7 2002/05/28 13:36:59 fukachan Exp $ +# $FML: Auth.pm,v 1.8 2002/06/01 04:57:51 fukachan Exp $ # package FML::Command::Auth; @@ -81,7 +81,7 @@ sub permit_anyone sub permit_admin_member_maps { my ($self, $curproc, $args, $optargs) = @_; - my $cred = $curproc->{ credential }; + my $cred = $curproc->{ credential }; my $match = $cred->is_privileged_member($curproc, $args); if ($match) { @@ -100,7 +100,7 @@ sub permit_admin_member_maps sub reject_system_accounts { my ($self, $curproc, $args, $optargs) = @_; - my $cred = $curproc->{ credential }; + my $cred = $curproc->{ credential }; my $match = $cred->match_system_accounts($curproc, $args); if ($match) { diff --git a/fml/lib/FML/Config/Convert.pm b/fml/lib/FML/Config/Convert.pm index 3c6e870d..f989e07c 100644 --- a/fml/lib/FML/Config/Convert.pm +++ b/fml/lib/FML/Config/Convert.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: Convert.pm,v 1.6 2002/03/20 03:19:24 fukachan Exp $ +# $FML: Convert.pm,v 1.7 2002/05/24 06:36:02 fukachan Exp $ # @@ -90,7 +90,7 @@ sub convert_file chmod 0644, "$dst.$$"; eval q{ convert($in, $out, $config);}; - croak($@) if $@; + croak($@) if $@; $out->close(); $in->close(); diff --git a/fml/lib/FML/MTAControl.pm b/fml/lib/FML/MTAControl.pm index c621e01c..032c14fc 100644 --- a/fml/lib/FML/MTAControl.pm +++ b/fml/lib/FML/MTAControl.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: MTAControl.pm,v 1.6 2002/05/27 08:53:24 fukachan Exp $ +# $FML: MTAControl.pm,v 1.7 2002/06/01 05:02:31 fukachan Exp $ # package FML::MTAControl; @@ -70,14 +70,14 @@ sub _update_isa $self->{ mta_type }; if ($mta_type eq 'postfix') { - eval q{ + eval q{ use FML::MTAControl::Postfix; push(@ISA, qw(FML::MTAControl::Postfix)); }; croak($@) if $@; } elsif ($mta_type eq 'qmail') { - eval q{ + eval q{ use FML::MTAControl::Qmail; push(@ISA, qw(FML::MTAControl::Qmail)); }; @@ -87,7 +87,7 @@ sub _update_isa # Descriptions: install configuration temaplate alias -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($curproc) HASH_REF($params) HASH_REF($optargs) # Side Effects: update aliases # Return Value: none @@ -173,7 +173,7 @@ sub get_aliases_as_hash_ref # Descriptions: install configuration temaplate alias -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($curproc) HASH_REF($params) HASH_REF($optargs) # Side Effects: update aliases # Return Value: none diff --git a/fml/lib/FML/MTAControl/Qmail.pm b/fml/lib/FML/MTAControl/Qmail.pm index abeba7f8..23cdc713 100644 --- a/fml/lib/FML/MTAControl/Qmail.pm +++ b/fml/lib/FML/MTAControl/Qmail.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: Qmail.pm,v 1.3 2002/05/27 08:53:24 fukachan Exp $ +# $FML: Qmail.pm,v 1.4 2002/06/01 05:02:32 fukachan Exp $ # package FML::MTAControl::Qmail; @@ -94,14 +94,14 @@ sub qmail_setup my $qmail_template_files = $config->get_as_array_ref('newml_command_qmail_template_files'); - my $fml_owner_home_dir = $config->{ fml_owner_home_dir }; + my $fml_owner_home_dir = $config->{ fml_owner_home_dir }; my $ml_name = $config->{ ml_name }; my $ml_domain = $config->{ ml_domain }; $ml_domain =~ s/\./:/g; for my $file (@$qmail_template_files) { - my $xfile = $file; - $xfile =~ s/dot-/\./; - $xfile =~ s/dot-/\./; - $xfile =~ s/qmail/qmail-$ml_domain-$ml_name/; + my $xfile = $file; + $xfile =~ s/dot-/\./; + $xfile =~ s/dot-/\./; + $xfile =~ s/qmail/qmail-$ml_domain-$ml_name/; my $src = File::Spec->catfile($template_dir, $file); my $dst = File::Spec->catfile($fml_owner_home_dir, $xfile); @@ -112,7 +112,7 @@ sub qmail_setup my $virtual_domain_conf = $config->{ qmail_control_virtualdomains_file }; unless (-f $virtual_domain_conf) { - print STDERR " XXX We assume $ml_domain:fml-$ml_domain\n"; + print STDERR " XXX We assume $ml_domain:fml-$ml_domain\n"; print STDERR " XXX in $virtual_domain_conf\n"; print STDERR " XXX\n"; } diff --git a/fml/lib/FML/Process/Command.pm b/fml/lib/FML/Process/Command.pm index 98e354ea..239e189a 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.59 2002/05/27 08:59:14 fukachan Exp $ +# $FML: Command.pm,v 1.60 2002/06/01 05:02:33 fukachan Exp $ # package FML::Process::Command; @@ -264,7 +264,7 @@ sub _is_valid_command # Descriptions: validate command syntax -# Arguments: OBJ($curproc) +# Arguments: OBJ($curproc) # HASH_REF($args) HASH_REF($status) HASH_REF($cominfo) # Side Effects: none # Return Value: NUM(1 or 0) @@ -310,7 +310,7 @@ sub _parse_command_args use FML::Command::DataCheck; my $check = new FML::Command::DataCheck; my $options = $check->parse_command_arguments($fixed_command, $comname); - + my $cominfo = { command => $fixed_command, comname => $comname, @@ -478,7 +478,7 @@ sub _get_command_mode # ignore all requests elsif ($is_confirm) { Log("ignore(confirm stage): $command"); - return '__NEXT__'; + return '__NEXT__'; } # Case: use command (commands "a usual member" can use) else { @@ -542,7 +542,7 @@ sub _gen_command_args { my ($curproc, $status, $cominfo) = @_; my $xargs = $cominfo; - my $mode = $status->{ mode }; + my $mode = $status->{ mode }; $xargs->{ command_mode } = $status->{ mode }; $xargs->{ command_level } = $status->{ level }; @@ -579,7 +579,7 @@ sub __stop_here my $prompt = $config->{ command_prompt } || '>>>'; my $key = $status->{ _stop_reason_key }; my $str = $status->{ _stop_reason_str }; - + use FML::Command; my $obj = new FML::Command; if (defined $obj) { diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm index 3276c7d4..cb0518fd 100644 --- a/fml/lib/FML/Process/Distribute.pm +++ b/fml/lib/FML/Process/Distribute.pm @@ -3,7 +3,7 @@ # Copyright (C) 2000,2001,2002 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Distribute.pm,v 1.77 2002/05/27 08:51:13 fukachan Exp $ +# $FML: Distribute.pm,v 1.78 2002/05/27 11:20:01 fukachan Exp $ # package FML::Process::Distribute; @@ -389,7 +389,7 @@ sub _deliver_article # distribute article my $fp = sub { Log(@_);}; # pointer to the log function my $sfp = sub { my ($s) = @_; print $s; print "\n" if $s !~ /\n$/o;}; - my $handle = undef; + my $handle = undef; my $wh = $curproc->open_outgoing_message_channel(); if (defined $wh) { diff --git a/fml/lib/FML/Process/Error.pm b/fml/lib/FML/Process/Error.pm index c091c3ce..f839d529 100644 --- a/fml/lib/FML/Process/Error.pm +++ b/fml/lib/FML/Process/Error.pm @@ -3,7 +3,7 @@ # Copyright (C) 2002 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Error.pm,v 1.5 2002/05/21 08:37:52 fukachan Exp $ +# $FML: Error.pm,v 1.6 2002/06/01 05:02:33 fukachan Exp $ # package FML::Process::Error; @@ -31,7 +31,7 @@ See L<FML::Process::Flow> for details of fml process flow. =head1 DESCRIPTION C<FML::Process::Error> is a command wrapper and top level -dispatcher for commands. +dispatcher for commands. =head1 METHODS @@ -79,7 +79,7 @@ sub prepare } else { exit(0); - } + } $eval = $config->get_hook( 'error_prepare_end_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 94982744..d70a8775 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.103 2002/06/01 03:01:54 fukachan Exp $ +# $FML: Kernel.pm,v 1.104 2002/06/01 04:59:09 fukachan Exp $ # package FML::Process::Kernel; @@ -464,7 +464,7 @@ sub parse_incoming_message # save input message for further investigation my $config = $curproc->{ config }; - if ($config->yes('use_incoming_mail_cache')) { + if ($config->yes('use_incoming_mail_cache')) { my $dir = $config->{ incoming_mail_dir }; my $modulus = $config->{ incoming_mail_cache_size }; my $obj = new File::CacheDir { @@ -1084,7 +1084,7 @@ sub queue_in } -# Descriptions: append message in $msg_in into $msg_out +# Descriptions: append message in $msg_in into $msg_out # Arguments: OBJ($curproc) OBJ($msg_in) OBJ($msg_out) # Side Effects: create a new $tmpfile # update garbage collection queue (clean_up_queue) @@ -1300,7 +1300,7 @@ sub open_outgoing_message_channel my $config = $curproc->{ config }; # save message for further investigation - if ($config->yes('use_outgoing_mail_cache')) { + if ($config->yes('use_outgoing_mail_cache')) { my $dir = $config->{ outgoing_mail_dir }; my $modulus = $config->{ outgoing_mail_cache_size }; my $obj = new File::CacheDir { diff --git a/fml/lib/FML/Process/Switch.pm b/fml/lib/FML/Process/Switch.pm index edda2e7f..bfd0508d 100644 --- a/fml/lib/FML/Process/Switch.pm +++ b/fml/lib/FML/Process/Switch.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: Switch.pm,v 1.68 2002/05/19 09:44:00 fukachan Exp $ +# $FML: Switch.pm,v 1.69 2002/05/29 16:34:26 fukachan Exp $ # package FML::Process::Switch; @@ -208,7 +208,7 @@ sub __log eval q{ use File::Spec; use FileHandle; - my $dir = $args->{ ml_home_prefix }; + my $dir = $args->{ ml_home_prefix }; my $logf = File::Spec->catfile($dir, '@log.crit@'); my $wh = new FileHandle ">> $logf"; if (defined $wh) { diff --git a/fml/lib/IO/Adapter/File.pm b/fml/lib/IO/Adapter/File.pm index 503298e5..ffe36c3c 100644 --- a/fml/lib/IO/Adapter/File.pm +++ b/fml/lib/IO/Adapter/File.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: File.pm,v 1.29 2002/06/01 03:01:55 fukachan Exp $ +# $FML: File.pm,v 1.30 2002/06/01 05:02:34 fukachan Exp $ # package IO::Adapter::File; @@ -173,7 +173,7 @@ my $ec = 0; # Side Effects: none # Return Value: none sub line_count -{ +{ my ($self) = @_; return "${ec}/${c}"; } diff --git a/fml/lib/Mail/Delivery/SMTP.pm b/fml/lib/Mail/Delivery/SMTP.pm index 15e0d3df..d41606d8 100644 --- a/fml/lib/Mail/Delivery/SMTP.pm +++ b/fml/lib/Mail/Delivery/SMTP.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: SMTP.pm,v 1.13 2002/01/27 13:11:57 fukachan Exp $ +# $FML: SMTP.pm,v 1.14 2002/05/27 11:20:02 fukachan Exp $ # @@ -760,7 +760,7 @@ sub _send_body_to_mta $msg->set_log_function( $SmtpLogFunctionPointer ); $msg->set_print_mode('smtp'); $msg->print($socket); - + if (defined $self->{ _smtp_log_handle }) { $msg->print( $self->{ _smtp_log_handle }); } diff --git a/fml/lib/Mail/Delivery/Utils.pm b/fml/lib/Mail/Delivery/Utils.pm index 8c872383..78583b1a 100644 --- a/fml/lib/Mail/Delivery/Utils.pm +++ b/fml/lib/Mail/Delivery/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.5 2002/01/13 07:28:54 fukachan Exp $ +# $FML: Utils.pm,v 1.6 2002/05/27 11:20:02 fukachan Exp $ # package Mail::Delivery::Utils; @@ -125,7 +125,7 @@ sub smtplog { my ($self, $buf) = @_; - if (defined $buf) { + if (defined $buf) { if (defined $self->{ _smtp_log_handle }) { my $wh = $self->{ _smtp_log_handle }; print $wh $buf; |
