summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2002-11-10 14:50:18 +0000
committerfukachan <fukachan>2002-11-10 14:50:18 +0000
commitc5409a1d35332f9d7541c1127ecf0d53a535a4e6 (patch)
tree070f715c28519bce0bc3917d97a5e88e05e5c090
parentc299a9080b934436da4fb273741364ee80da3335 (diff)
downloadfml8-c5409a1d35332f9d7541c1127ecf0d53a535a4e6.tar.gz
fml8-c5409a1d35332f9d7541c1127ecf0d53a535a4e6.tar.bz2
fml8-c5409a1d35332f9d7541c1127ecf0d53a535a4e6.zip
cosmetic changes: white spaces
-rw-r--r--fml/lib/FML/Command/Admin/newml.pm4
-rw-r--r--fml/lib/FML/Filter/MimeComponent2.pm20
-rw-r--r--fml/lib/FML/Filter/MimeComponent3.pm20
-rw-r--r--fml/lib/FML/Process/Addr.pm4
4 files changed, 24 insertions, 24 deletions
diff --git a/fml/lib/FML/Command/Admin/newml.pm b/fml/lib/FML/Command/Admin/newml.pm
index 4ddc1d43..e699348f 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.53 2002/10/29 09:07:39 fukachan Exp $
+# $FML: newml.pm,v 1.54 2002/10/29 10:38:15 fukachan Exp $
#
package FML::Command::Admin::newml;
@@ -220,7 +220,7 @@ sub _update_aliases
my $ml_name = $config->{ ml_name };
my $ml_domain = $config->{ ml_domain };
my $alias = $config->{ mail_aliases_file };
- my $mask = umask( 022 );
+ my $mask = umask( 022 );
# append
if ($self->_is_mta_alias_maps_has_ml_entry($curproc, $params, $ml_name)) {
diff --git a/fml/lib/FML/Filter/MimeComponent2.pm b/fml/lib/FML/Filter/MimeComponent2.pm
index 22b676b6..c5c85f6c 100644
--- a/fml/lib/FML/Filter/MimeComponent2.pm
+++ b/fml/lib/FML/Filter/MimeComponent2.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: MimeComponent2.pm,v 1.5 2002/10/21 12:41:37 fukachan Exp $
+# $FML: MimeComponent2.pm,v 1.6 2002/10/21 13:13:35 fukachan Exp $
#
package FML::Filter::MimeComponent;
@@ -30,7 +30,7 @@ Our filter rule is a list of the following components:
(whole message type, message type, action)
-For example,
+For example,
$rules = (
(text/plain * permit),
@@ -126,7 +126,7 @@ sub mime_component_check
next MSG if ($data_type eq "text/rfc822-headers");
next MSG if ($data_type =~ "multipart\.");
- __dprint("\n\tmsg($i) $data_type");
+ __dprint("\n\tmsg($i) $data_type");
$action = $self->_rule_match($msg,$rule,$mp,$whole_data_type);
if ($action eq 'reject' || $action eq 'permit') {
__dprint("\n\t! action = $action. stop here.");
@@ -138,7 +138,7 @@ sub mime_component_check
$is_cutoff = 1;
$self->_cutoff($mp);
}
-
+
$i++; # prepare for the next _rule_match().
}
}
@@ -154,7 +154,7 @@ sub mime_component_check
}
-# Descriptions:
+# Descriptions:
# Arguments: OBJ($self) OBJ($msg) ARRAY_REF($rule)
# OBJ($mp) STR($whole_type)
# Side Effects: "reject" and "permit" affects nothing.
@@ -195,8 +195,8 @@ sub __regexp_match
$type =~ tr/A-Z/a-z/;
$regexp =~ tr/A-Z/a-z/;
- if ($regexp =~ /^\!/o) {
- $reverse = 1;
+ if ($regexp =~ /^\!/o) {
+ $reverse = 1;
$regexp =~ s/^\!//o;
$regexp =~ s/^\(\S+\)/$1/o;
}
@@ -331,13 +331,13 @@ sub dump_message_structure
sub dump_filter_rules
{
my $i = 0;
-
+
for my $rule (@$filter_rules) {
$i++;
printf STDERR "%15s: %20s %20s %10s\n", "rule ${i}", @$rule;
}
- printf STDERR "%15s: %20s %20s %10s\n", "default rule",
+ printf STDERR "%15s: %20s %20s %10s\n", "default rule",
"*", "*", $default_action;
}
@@ -363,7 +363,7 @@ sub __dprint
}
-#
+#
# debug
#
diff --git a/fml/lib/FML/Filter/MimeComponent3.pm b/fml/lib/FML/Filter/MimeComponent3.pm
index be93c92c..43e6c391 100644
--- a/fml/lib/FML/Filter/MimeComponent3.pm
+++ b/fml/lib/FML/Filter/MimeComponent3.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: MimeComponent3.pm,v 1.2 2002/10/26 04:03:15 fukachan Exp $
+# $FML: MimeComponent3.pm,v 1.3 2002/10/27 02:30:15 fukachan Exp $
#
package FML::Filter::MimeComponent;
@@ -30,7 +30,7 @@ Our filter rule is a list of the following components:
(whole message type, message type, action)
-For example,
+For example,
$rules = (
(text/plain * permit),
@@ -122,7 +122,7 @@ sub mime_component_check
next MSG if ($data_type eq "text/rfc822-headers");
next MSG if ($data_type =~ "multipart\.");
- __dprint("\n msg($i) $data_type");
+ __dprint("\n msg($i) $data_type");
RULE:
for my $rule (@$filter_rules) {
@@ -143,7 +143,7 @@ sub mime_component_check
$is_cutoff = 1;
$self->_cutoff($mp);
}
-
+
$i++; # prepare for the next _rule_match().
}
}
@@ -172,7 +172,7 @@ sub mime_component_check
}
-# Descriptions:
+# Descriptions:
# Arguments: OBJ($self) OBJ($msg) ARRAY_REF($rule)
# OBJ($mp) STR($whole_type)
# Side Effects: "reject" and "permit" affects nothing.
@@ -213,8 +213,8 @@ sub __regexp_match
$type =~ tr/A-Z/a-z/;
$regexp =~ tr/A-Z/a-z/;
- if ($regexp =~ /^\!/o) {
- $reverse = 1;
+ if ($regexp =~ /^\!/o) {
+ $reverse = 1;
$regexp =~ s/^\!//o;
$regexp =~ s/^\(\S+\)/$1/o;
}
@@ -349,13 +349,13 @@ sub dump_message_structure
sub dump_filter_rules
{
my $i = 0;
-
+
for my $rule (@$filter_rules) {
$i++;
printf STDERR "%15s: %20s %20s %10s\n", "rule ${i}", @$rule;
}
- printf STDERR "%15s: %20s %20s %10s\n", "default rule",
+ printf STDERR "%15s: %20s %20s %10s\n", "default rule",
"*", "*", $default_action;
}
@@ -381,7 +381,7 @@ sub __dprint
}
-#
+#
# debug
#
diff --git a/fml/lib/FML/Process/Addr.pm b/fml/lib/FML/Process/Addr.pm
index 6b761a81..f2d37fb4 100644
--- a/fml/lib/FML/Process/Addr.pm
+++ b/fml/lib/FML/Process/Addr.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2001,2002 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: Addr.pm,v 1.5 2002/09/22 14:56:51 fukachan Exp $
+# $FML: Addr.pm,v 1.1 2002/11/07 10:53:51 fukachan Exp $
#
package FML::Process::Addr;
@@ -230,7 +230,7 @@ sub _fmladdr
use FileHandle;
my $fh = new FileHandle "/etc/passwd";
if (defined $fh) {
- my ($user);
+ my ($user);
while (<$fh>) {
($user) = split(/:/, $_);