From cd4e4bbb0e776ad653629914463192fe610cb1b2 Mon Sep 17 00:00:00 2001 From: fukachan Date: Sat, 24 Feb 2001 15:35:45 +0000 Subject: resolve perl -cw warning --- fml/lib/FML/Config.pm | 9 ------ fml/lib/FML/Process/QMail.pm | 74 +++++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 45 deletions(-) diff --git a/fml/lib/FML/Config.pm b/fml/lib/FML/Config.pm index 1e286dd0..b3baf606 100644 --- a/fml/lib/FML/Config.pm +++ b/fml/lib/FML/Config.pm @@ -63,15 +63,6 @@ sub dump_variables } -sub _fml_config_sort -{ - my ($x, $y) = ($a, $b); - $x =~ s/^use_//ig; - $y =~ s/^use_//ig; - $x cmp $y; -} - - sub _log { my ($self, $msg) = @_; diff --git a/fml/lib/FML/Process/QMail.pm b/fml/lib/FML/Process/QMail.pm index 482a1691..0916008b 100644 --- a/fml/lib/FML/Process/QMail.pm +++ b/fml/lib/FML/Process/QMail.pm @@ -12,9 +12,7 @@ package FML::Process::QMail; use strict; use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD); use Carp; - -require Exporter; -@ISA = qw(Exporter); +use FML::Log; sub new @@ -28,60 +26,44 @@ sub new =head1 NAME -NOT YET MERGED - qmail-ext +FML::Process::QMail - emulate C address =head1 SYNOPSIS -=head1 DESCRIPTION +NOT YET MERGED -=head1 CLASSES +=head1 DESCRIPTION =head1 METHODS -=item C - -... what is this ... - -=head1 AUTHOR - -Ken'ichi Fukamachi - -=head1 COPYRIGHT - -Copyright (C) 2001 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. - -=head1 HISTORY - -FML::Process::QMail appeared in fml5 mailing list driver package. -See C for more details. - =cut sub DotQmailExt { - local(*e) = @_; - local($ext, $key, $keyctl); + my ($curproc) = @_; + my $config = $curproc->{ config }; # get ? - ($ext = $ENV{'EXT'}) || return $NULL; + my $ext = $ENV{'EXT'}; - &Log("dot-qmail-ext[0]: $ext") if $debug_qmail; + unless ($ext) { + Log("no extension address"); + return; + } - $key = (split(/\@/, $MAIL_LIST))[0]; - $keyctl = (split(/\@/, $CONTROL_ADDRESS))[0]; + &Log("dot-qmail-ext[0]: $ext"); + my ($key) = (split(/\@/, $config->{ address_for_post }))[0]; + my ($keyctl) = (split(/\@/, $config->{ address_for_command }))[0]; if ($ext =~ /^($key)$/i) { - return $NULL; + return ''; } elsif ($keyctl&& ($ext =~ /^($keyctl)$/i)) { - return $NULL; + return ''; } - &Log("dot-qmail-ext: $ext") if $debug_qmail; + &Log("dot-qmail-ext: $ext"); $ext =~ s/^$key//i; $ext =~ s/\-\-/\@/i; # since @ cannot be used $ext =~ s/\-/ /g; @@ -89,7 +71,27 @@ sub DotQmailExt &Log("\$ext -> $ext"); # XXX: "# command" is internal represention - $e{'Body'} = sprintf("# %s", $ext); + return sprintf("# %s", $ext); } + +=head1 AUTHOR + +Ken'ichi Fukamachi + +=head1 COPYRIGHT + +Copyright (C) 2001 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. + +=head1 HISTORY + +FML::Process::QMail appeared in fml5 mailing list driver package. +See C for more details. + +=cut + + 1; -- cgit v1.2.1