summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fml/lib/FML/Command/subscribe.pm8
-rw-r--r--fml/lib/FML/Command/unsubscribe.pm8
-rw-r--r--fml/lib/FML/Credential.pm6
-rw-r--r--fml/lib/IO/Adapter.pm (renamed from fml/lib/IO/MapAdapter.pm)14
-rw-r--r--fml/lib/IO/Adapter/File.pm12
-rw-r--r--fml/lib/IO/Adapter/MySQL.pm4
-rw-r--r--fml/lib/IO/Adapter/NIS.pm6
-rw-r--r--fml/lib/IO/Adapter/UnixGroup.pm6
-rwxr-xr-xfml/lib/IO/t/append.pl8
-rwxr-xr-xfml/lib/IO/t/array_map.pl6
-rwxr-xr-xfml/lib/IO/t/delete.pl8
-rwxr-xr-xfml/lib/IO/t/file_map.pl6
-rwxr-xr-xfml/lib/IO/t/file_map_getpos.pl6
-rwxr-xr-xfml/lib/IO/t/replace.pl8
-rwxr-xr-xfml/lib/IO/t/unixgroup_map.pl6
-rw-r--r--fml/lib/Mail/Delivery/SMTP.pm22
-rwxr-xr-xregress/base/search.pl6
-rwxr-xr-xregress/mysql/getline.pl4
-rw-r--r--regress/simulation/todo/MailingList_diagnostic2
-rw-r--r--regress/simulation/todo/doc2
20 files changed, 74 insertions, 74 deletions
diff --git a/fml/lib/FML/Command/subscribe.pm b/fml/lib/FML/Command/subscribe.pm
index 19dbb839..cd84aef7 100644
--- a/fml/lib/FML/Command/subscribe.pm
+++ b/fml/lib/FML/Command/subscribe.pm
@@ -5,7 +5,7 @@
# redistribute it and/or modify it under the same terms as Perl itself.
#
# $Id$
-# $FML$
+# $FML: subscribe.pm,v 1.7 2001/04/03 09:45:42 fukachan Exp $
#
package FML::Command::subscribe;
@@ -41,11 +41,11 @@ sub subscribe
croak("\$member_map is not specified") unless $member_map;
croak("\$recipient_map is not specified") unless $recipient_map;
- use IO::MapAdapter;
- my $obj = new IO::MapAdapter $member_map;
+ use IO::Adapter;
+ my $obj = new IO::Adapter $member_map;
$obj->add( $address );
- $obj = new IO::MapAdapter $recipient_map;
+ $obj = new IO::Adapter $recipient_map;
$obj->add( $address );
}
diff --git a/fml/lib/FML/Command/unsubscribe.pm b/fml/lib/FML/Command/unsubscribe.pm
index fb618588..3690fc04 100644
--- a/fml/lib/FML/Command/unsubscribe.pm
+++ b/fml/lib/FML/Command/unsubscribe.pm
@@ -5,7 +5,7 @@
# redistribute it and/or modify it under the same terms as Perl itself.
#
# $Id$
-# $FML$
+# $FML: unsubscribe.pm,v 1.7 2001/04/03 09:45:42 fukachan Exp $
#
package FML::Command::unsubscribe;
@@ -39,11 +39,11 @@ sub unsubscribe
croak("\$member_map is not specified") unless $member_map;
croak("\$recipient_map is not specified") unless $recipient_map;
- use IO::MapAdapter;
- my $obj = new IO::MapAdapter $member_map;
+ use IO::Adapter;
+ my $obj = new IO::Adapter $member_map;
$obj->delete( $address );
- $obj = new IO::MapAdapter $recipient_map;
+ $obj = new IO::Adapter $recipient_map;
$obj->delete( $address );
}
diff --git a/fml/lib/FML/Credential.pm b/fml/lib/FML/Credential.pm
index 2edae49a..b7c6697b 100644
--- a/fml/lib/FML/Credential.pm
+++ b/fml/lib/FML/Credential.pm
@@ -5,7 +5,7 @@
# redistribute it and/or modify it under the same terms as Perl itself.
#
# $Id$
-# $FML: Credential.pm,v 1.7 2001/04/03 09:45:40 fukachan Exp $
+# $FML: Credential.pm,v 1.8 2001/04/15 09:07:12 fukachan Exp $
#
package FML::Credential;
@@ -111,10 +111,10 @@ sub is_member
my $address = $curproc->{'credential'}->{'sender'};
my ($user, $domain) = split(/\@/, $address);
- use IO::MapAdapter;
+ use IO::Adapter;
for my $map (split(/\s+/, $member_maps)) {
if ($map) {
- my $obj = new IO::MapAdapter $map;
+ my $obj = new IO::Adapter $map;
my $x = $obj->find( $user );
my ($r) = split(/\s+/, $x);
diff --git a/fml/lib/IO/MapAdapter.pm b/fml/lib/IO/Adapter.pm
index 28da523c..5d0453d6 100644
--- a/fml/lib/IO/MapAdapter.pm
+++ b/fml/lib/IO/Adapter.pm
@@ -5,10 +5,10 @@
# redistribute it and/or modify it under the same terms as Perl itself.
#
# $Id$
-# $FML: MapAdapter.pm,v 1.27 2001/04/08 13:25:39 fukachan Exp $
+# $FML: MapAdapter.pm,v 1.28 2001/04/15 08:41:59 fukachan Exp $
#
-package IO::MapAdapter;
+package IO::Adapter;
use vars qw(@ISA @ORIG_ISA $FirstTime);
use strict;
use Carp;
@@ -19,12 +19,12 @@ END {}
=head1 NAME
-IO::MapAdapter - adapter for several IO interfaces
+IO::Adapter - adapter for several IO interfaces
=head1 SYNOPSIS
- use IO::MapAdapter;
- $obj = new IO::MapAdapter ($map, $map_params);
+ use IO::Adapter;
+ $obj = new IO::Adapter ($map, $map_params);
$obj->open || croak("cannot open $map");
while ($x = $obj->getline) { ... }
$obj->close;
@@ -150,7 +150,7 @@ sub new
$pkg = 'IO::Adapter::LDAP';
}
else {
- my $s = "IO::MapAdapter::new: map='$map' is unknown.";
+ my $s = "IO::Adapter::new: map='$map' is unknown.";
error_set($me, $s);
}
}
@@ -384,7 +384,7 @@ redistribute it and/or modify it under the same terms as Perl itself.
=head1 HISTORY
-IO::MapAdapter appeared in fml5 mailing list driver package.
+IO::Adapter appeared in fml5 mailing list driver package.
See C<http://www.fml.org/> for more details.
=cut
diff --git a/fml/lib/IO/Adapter/File.pm b/fml/lib/IO/Adapter/File.pm
index 585209d8..4da370ac 100644
--- a/fml/lib/IO/Adapter/File.pm
+++ b/fml/lib/IO/Adapter/File.pm
@@ -5,7 +5,7 @@
# redistribute it and/or modify it under the same terms as Perl itself.
#
# $Id$
-# $FML: File.pm,v 1.20 2001/04/03 09:45:45 fukachan Exp $
+# $FML: File.pm,v 1.21 2001/04/08 13:25:40 fukachan Exp $
#
package IO::Adapter::File;
@@ -25,15 +25,15 @@ IO::Adapter::File - IO functions for a file
To read list
- use IO::MapAdapter;
- $obj = new IO::MapAdapter $map;
+ use IO::Adapter;
+ $obj = new IO::Adapter $map;
$obj->open || croak("cannot open $map");
while ($x = $obj->getline) { ... }
$obj->close;
To add the address
- $obj = new IO::MapAdapter $map;
+ $obj = new IO::Adapter $map;
$obj->add( $address );
To delete it
@@ -44,7 +44,7 @@ To delete it
=head1 DESCRIPTION
This module provides real IO functions for a file used in
-IO::MapAdapter.
+IO::Adapter.
The map is the fully path-ed file name or a file name with 'file:/'
prefix.
@@ -339,7 +339,7 @@ sub replace
=head1 SEE ALSO
-L<IO::MapAdapter>
+L<IO::Adapter>
=head1 AUTHOR
diff --git a/fml/lib/IO/Adapter/MySQL.pm b/fml/lib/IO/Adapter/MySQL.pm
index cbc97a96..ad006f92 100644
--- a/fml/lib/IO/Adapter/MySQL.pm
+++ b/fml/lib/IO/Adapter/MySQL.pm
@@ -22,7 +22,7 @@ IO::Adapter::MySQL - interface to talk with a MySQL server
=head1 SYNOPSIS
- use IO::MapAdapter;
+ use IO::Adapter;
my $map = 'mysql:toymodel';
my $map_params = {
@@ -39,7 +39,7 @@ IO::Adapter::MySQL - interface to talk with a MySQL server
},
};
- my $obj = new IO::MapAdapter ($map, $map_params);
+ my $obj = new IO::Adapter ($map, $map_params);
$obj->open();
$obj->add( 'rudo@nuinui.net' );
$obj->close();
diff --git a/fml/lib/IO/Adapter/NIS.pm b/fml/lib/IO/Adapter/NIS.pm
index 850ec4c4..1bf78f6a 100644
--- a/fml/lib/IO/Adapter/NIS.pm
+++ b/fml/lib/IO/Adapter/NIS.pm
@@ -5,7 +5,7 @@
# redistribute it and/or modify it under the same terms as Perl itself.
#
# $Id$
-# $FML$
+# $FML: NIS.pm,v 1.13 2001/04/03 09:45:46 fukachan Exp $
#
package IO::Adapter::NIS;
@@ -39,8 +39,8 @@ IO::Adapter::NIS - NIS map operations
$map = 'nis.group:fml';
- use IO::MapAdapter;
- $obj = new IO::MapAdapter $map;
+ use IO::Adapter;
+ $obj = new IO::Adapter $map;
$obj->open || croak("cannot open $map");
while ($x = $obj->getline) { ... }
$obj->close;
diff --git a/fml/lib/IO/Adapter/UnixGroup.pm b/fml/lib/IO/Adapter/UnixGroup.pm
index c9a4726c..dfec77f1 100644
--- a/fml/lib/IO/Adapter/UnixGroup.pm
+++ b/fml/lib/IO/Adapter/UnixGroup.pm
@@ -5,7 +5,7 @@
# redistribute it and/or modify it under the same terms as Perl itself.
#
# $Id$
-# $FML$
+# $FML: UnixGroup.pm,v 1.11 2001/04/03 09:45:46 fukachan Exp $
#
package IO::Adapter::UnixGroup;
@@ -38,8 +38,8 @@ IO::Adapter::UnixGroup - IO wrapper to read /etc/group
$map = 'unix.group:fml';
- use IO::MapAdapter;
- $obj = new IO::MapAdapter $map;
+ use IO::Adapter;
+ $obj = new IO::Adapter $map;
$obj->open || croak("cannot open $map");
while ($x = $obj->getline) { ... }
$obj->close;
diff --git a/fml/lib/IO/t/append.pl b/fml/lib/IO/t/append.pl
index 86a6b8e5..dba8aa2b 100755
--- a/fml/lib/IO/t/append.pl
+++ b/fml/lib/IO/t/append.pl
@@ -5,7 +5,7 @@
# redistribute it and/or modify it under the same terms as Perl itself.
#
# $Id$
-# $FML$
+# $FML: append.pl,v 1.3 2001/04/03 09:45:47 fukachan Exp $
#
use strict;
@@ -24,8 +24,8 @@ print "${map}->add() ";
system "cp $org_file /tmp/";
# append
-use IO::MapAdapter;
-my $obj = new IO::MapAdapter $map;
+use IO::Adapter;
+my $obj = new IO::Adapter $map;
$obj->add( $buffer ) || croak("cannot add to $map");
if ($obj->error) { croak( $obj->error );}
@@ -46,7 +46,7 @@ else {
$map = 'unix.group:fml';
print "${map}->add() ... ";
-$obj = new IO::MapAdapter $map;
+$obj = new IO::Adapter $map;
eval q{ $obj->add( $buffer ); };
if ($@) {
print "ok\n"; # XXX fail (non null $@) is ok here.
diff --git a/fml/lib/IO/t/array_map.pl b/fml/lib/IO/t/array_map.pl
index 4fc14578..aced3a8b 100755
--- a/fml/lib/IO/t/array_map.pl
+++ b/fml/lib/IO/t/array_map.pl
@@ -5,7 +5,7 @@
# redistribute it and/or modify it under the same terms as Perl itself.
#
# $Id$
-# $FML$
+# $FML: array_map.pl,v 1.2 2001/04/03 09:45:47 fukachan Exp $
#
use Carp;
@@ -13,8 +13,8 @@ use strict;
my $map = ['a', 'b', 'c'];
-use IO::MapAdapter;
-my $obj = new IO::MapAdapter $map;
+use IO::Adapter;
+my $obj = new IO::Adapter $map;
$obj->open || croak("cannot open $map");
if ($obj->error) { croak( $obj->error );}
diff --git a/fml/lib/IO/t/delete.pl b/fml/lib/IO/t/delete.pl
index d2749e1f..18a5660e 100755
--- a/fml/lib/IO/t/delete.pl
+++ b/fml/lib/IO/t/delete.pl
@@ -5,7 +5,7 @@
# redistribute it and/or modify it under the same terms as Perl itself.
#
# $Id$
-# $FML$
+# $FML: delete.pl,v 1.2 2001/04/03 09:45:47 fukachan Exp $
#
use strict;
@@ -25,8 +25,8 @@ system "head -1 $org_file > $tmpf";
system "cp $org_file /tmp/";
# append
-use IO::MapAdapter;
-my $obj = new IO::MapAdapter $map;
+use IO::Adapter;
+my $obj = new IO::Adapter $map;
$obj->delete( $buffer ) || croak("cannot add to $map");
if ($obj->error) { croak( $obj->error );}
@@ -46,7 +46,7 @@ else {
$map = 'unix.group:fml';
print "${map}->delete() ... ";
-$obj = new IO::MapAdapter $map;
+$obj = new IO::Adapter $map;
eval q{ $obj->delete( $buffer ); };
if ($@) {
print "ok\n"; # XXX fail (non null $@) is ok here.
diff --git a/fml/lib/IO/t/file_map.pl b/fml/lib/IO/t/file_map.pl
index c2aef106..9e4b3f3d 100755
--- a/fml/lib/IO/t/file_map.pl
+++ b/fml/lib/IO/t/file_map.pl
@@ -5,7 +5,7 @@
# redistribute it and/or modify it under the same terms as Perl itself.
#
# $Id$
-# $FML$
+# $FML: file_map.pl,v 1.3 2001/04/03 09:45:47 fukachan Exp $
#
use Carp;
@@ -21,8 +21,8 @@ while (1) {
}
close($file);
-use IO::MapAdapter;
-$obj = new IO::MapAdapter $map;
+use IO::Adapter;
+$obj = new IO::Adapter $map;
$obj->open || croak("cannot open $map");
if ($obj->error) { croak( $obj->error );}
while ($x = $obj->getline) { $buf .= $x; }
diff --git a/fml/lib/IO/t/file_map_getpos.pl b/fml/lib/IO/t/file_map_getpos.pl
index 2ed778ad..910e033f 100755
--- a/fml/lib/IO/t/file_map_getpos.pl
+++ b/fml/lib/IO/t/file_map_getpos.pl
@@ -5,7 +5,7 @@
# redistribute it and/or modify it under the same terms as Perl itself.
#
# $Id$
-# $FML$
+# $FML: file_map_getpos.pl,v 1.4 2001/04/03 09:45:47 fukachan Exp $
#
use strict;
@@ -17,8 +17,8 @@ my $map = "file:". $file;
print STDERR "roll back test\n" if $debug;
-use IO::MapAdapter;
-my $obj = new IO::MapAdapter $map;
+use IO::Adapter;
+my $obj = new IO::Adapter $map;
$obj->open || croak("cannot open $map");
if ($obj->error) { croak( $obj->error );}
diff --git a/fml/lib/IO/t/replace.pl b/fml/lib/IO/t/replace.pl
index 111abb57..ff9a71bd 100755
--- a/fml/lib/IO/t/replace.pl
+++ b/fml/lib/IO/t/replace.pl
@@ -5,7 +5,7 @@
# redistribute it and/or modify it under the same terms as Perl itself.
#
# $Id$
-# $FML$
+# $FML: replace.pl,v 1.2 2001/04/03 09:45:47 fukachan Exp $
#
use strict;
@@ -26,8 +26,8 @@ system "sed 1d $org_file > $tmpf";
system "cp $org_file /tmp/";
# append
-use IO::MapAdapter;
-my $obj = new IO::MapAdapter $map;
+use IO::Adapter;
+my $obj = new IO::Adapter $map;
$obj->replace( $regexp, $value ) || croak("cannot add to $map");
if ($obj->error) { croak( $obj->error );}
@@ -47,7 +47,7 @@ else {
$map = 'unix.group:fml';
print "${map}->replace() ... ";
-$obj = new IO::MapAdapter $map;
+$obj = new IO::Adapter $map;
eval q{ $obj->replace( $regexp, $value ); };
if ($@) {
print "ok\n"; # XXX fail (non null $@) is ok here.
diff --git a/fml/lib/IO/t/unixgroup_map.pl b/fml/lib/IO/t/unixgroup_map.pl
index c4ef7719..ea2c1f05 100755
--- a/fml/lib/IO/t/unixgroup_map.pl
+++ b/fml/lib/IO/t/unixgroup_map.pl
@@ -5,7 +5,7 @@
# redistribute it and/or modify it under the same terms as Perl itself.
#
# $Id$
-# $FML$
+# $FML: unixgroup_map.pl,v 1.3 2001/04/03 09:45:47 fukachan Exp $
#
use Carp;
@@ -16,8 +16,8 @@ my $map = 'unix.group:wheel';
my @group = getgrnam( 'wheel' );
my @member = split(/\s+/,$group[3]);
-use IO::MapAdapter;
-my $obj = new IO::MapAdapter $map;
+use IO::Adapter;
+my $obj = new IO::Adapter $map;
$obj->open || croak("cannot open $map");
if ($obj->error) { croak( $obj->error );}
diff --git a/fml/lib/Mail/Delivery/SMTP.pm b/fml/lib/Mail/Delivery/SMTP.pm
index 5baaed1e..a0720273 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.3 2001/04/08 06:01:38 fukachan Exp $
+# $FML: SMTP.pm,v 1.4 2001/04/15 04:58:40 fukachan Exp $
#
@@ -85,9 +85,9 @@ C<Mail::Delivery::Net::INET4> and
C<Mail::Delivery::Net::INET6>.
It sends a list of all recipients indicated by $recipient_maps.
-C<IO::MapAdapter> resolves $recipient_maps and provides the abstract
+C<IO::Adapter> resolves $recipient_maps and provides the abstract
IO layer. It provides the usual file IO methods for each C<map>.
-See L<IO::MapAdapter> for more details.
+See L<IO::Adapter> for more details.
=head1 METHODS
@@ -320,7 +320,7 @@ C<smtp_sender> is the sender's email address.
It is used at MAIL FROM: command.
C<recipient_maps> is a list of C<maps>.
-See L<IO::MapAdapter> for more details.
+See L<IO::Adapter> for more details.
For example,
To read addresses from a file, specify the map as
@@ -388,8 +388,8 @@ sub deliver
# try to open $map
eval q{
- use IO::MapAdapter;
- my $obj = new IO::MapAdapter ($map, $args->{ map_params });
+ use IO::Adapter;
+ my $obj = new IO::Adapter ($map, $args->{ map_params });
if (defined $obj) {
$obj->open || croak("cannot open $map");
}
@@ -584,7 +584,7 @@ sub _send_mail_from
# Example: recipient_maps = file:members
# unix.group:admin
# mysql:toymodel
-# IO::MapAdapter class is essential to handle abstract
+# IO::Adapter class is essential to handle abstract
# $recipient_map.
# Arguments: $self $args
# Side Effects: $self->{ _retry_recipient_table } has recipients which
@@ -600,11 +600,11 @@ sub _send_recipient_list_by_recipient_map
# open abstract recipient list objects.
# $map syntax is "type:parameter", e.g.,
# file:$filename mysql:$schema_name
- use IO::MapAdapter;
- my $obj = new IO::MapAdapter $map;
+ use IO::Adapter;
+ my $obj = new IO::Adapter $map;
unless (defined $obj) {
- Log("Error: cannot get object for $map by IO::MapAdapter");
+ Log("Error: cannot get object for $map by IO::Adapter");
}
else { # $obj is good.
my $rcpt;
@@ -776,7 +776,7 @@ L<IO::Socket>,
L<Mail::Delivery::Utils>,
L<Mail::Delivery::INET4>,
L<Mail::Delivery::INET6>,
-L<IO::MapAdapter>
+L<IO::Adapter>
See I<http://www.postfix.org/> on C<Postfix>
which replaces sendmail with little effort
diff --git a/regress/base/search.pl b/regress/base/search.pl
index a5e2312e..c3a16b4f 100755
--- a/regress/base/search.pl
+++ b/regress/base/search.pl
@@ -5,13 +5,13 @@
# All rights reserved. This program is free software; you can
# redistribute it and/or modify it under the same terms as Perl itself.
#
-# $FML: copy.pl,v 1.3 2001/04/03 09:51:12 fukachan Exp $
+# $FML: search.pl,v 1.1 2001/04/15 09:09:03 fukachan Exp $
#
-use IO::MapAdapter;
+use IO::Adapter;
my $map = shift || 'file:/var/spool/ml/elena/actives';
-my $obj = new IO::MapAdapter $map;
+my $obj = new IO::Adapter $map;
$obj->open || croak("cannot open $map");
while ($x = $obj->getline) { print "<< ", $x if $x =~ /\S+/;}
diff --git a/regress/mysql/getline.pl b/regress/mysql/getline.pl
index 50d15258..3f16b509 100755
--- a/regress/mysql/getline.pl
+++ b/regress/mysql/getline.pl
@@ -5,7 +5,7 @@
use strict;
use Carp;
-use IO::MapAdapter;
+use IO::Adapter;
my $map = 'mysql:toymodel';
@@ -25,7 +25,7 @@ my $map_params = {
};
-my $obj = new IO::MapAdapter ($map, $map_params);
+my $obj = new IO::Adapter ($map, $map_params);
_dump($obj); print "\n";
diff --git a/regress/simulation/todo/MailingList_diagnostic b/regress/simulation/todo/MailingList_diagnostic
index 4a29cf04..45334045 100644
--- a/regress/simulation/todo/MailingList_diagnostic
+++ b/regress/simulation/todo/MailingList_diagnostic
@@ -3,7 +3,7 @@ ErrorMessages::Status qw(error_set error error_clear);
IO::File::Atomic;
IO::Adapter::Array;
IO::Adapter::DBI;
-IO::MapAdapter;
+IO::Adapter;
Mail::Delivery;
MailingList::ESMTP;
diff --git a/regress/simulation/todo/doc b/regress/simulation/todo/doc
index b73bf78b..8c7abbbd 100644
--- a/regress/simulation/todo/doc
+++ b/regress/simulation/todo/doc
@@ -55,7 +55,7 @@ File/Rotate.pm
File/Sequence.pm
File/SimpleLock.pm
File/Utils.pm
-IO/MapAdapter.pm
+IO/Adapter.pm
IO/Adapter/Array.pm
IO/Adapter/DBI.pm
IO/Adapter/File.pm
generated by cgit v1.2.1 (git 2.18.0) at 2026-09-08 04:10:01 +0000