From 2ee22881483e84ea8b5ef0a5125631c04d174617 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Sun, 28 Nov 1999 19:14:45 +0000 Subject: no_comment --- perl-install/ftp.pm | 64 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 28 deletions(-) (limited to 'perl-install/ftp.pm') diff --git a/perl-install/ftp.pm b/perl-install/ftp.pm index 6c498f2af..bfabc5abf 100644 --- a/perl-install/ftp.pm +++ b/perl-install/ftp.pm @@ -6,45 +6,53 @@ use install_any; use network; use log; -# non-rentrant!! - -my $retr; +my %hosts; 1; - -sub new { - my %options = (Passive => 1); - $options{Firewall} = $ENV{PROXY} if $ENV{PROXY}; - $options{Port} = $ENV{PROXYPORT} if $ENV{PROXYPORT}; - my @l; - unless ($ENV{HOST}) { - # must be in kickstart, using URLPREFIX to find out information - ($ENV{LOGIN}, $ENV{PASSWORD}, $ENV{HOST}, $ENV{PREFIX}) = @l = - $ENV{URLPREFIX} =~ m| +sub fromEnv() { + # using URLPREFIX to find out information if kickstart + ($ENV{LOGIN}, $ENV{PASSWORD}, $ENV{HOST}, $ENV{PREFIX}) = + $ENV{URLPREFIX} =~ m| :// (?: ([^:]*) # login (?: :([^@]*))? # password @)? ([^/]*) # host /?(.*) # prefix - |x; - } - unless ($ENV{LOGIN}) { - $ENV{LOGIN} = 'anonymous'; - $ENV{PASSWORD} = 'mdkinst@test'; - } - - my $ftp = Net::FTP->new(network::resolv($ENV{HOST}), %options) or die ''; - $ftp->login($ENV{LOGIN}, $ENV{PASSWORD}) or die ''; - $ftp->binary; - - $ftp; + |x unless $ENV{HOST}; + + @ENV{qw(HOST PREFIX LOGIN PASSWORD)}; } +sub new { + my ($host, $prefix, $login, $password) = @_; + my @l = do { if ($hosts{$host}) { + @{$hosts{$host}}; + } else { + my %options = (Passive => 1); + $options{Firewall} = $ENV{PROXY} if $ENV{PROXY}; + $options{Port} = $ENV{PROXYPORT} if $ENV{PROXYPORT}; + unless ($login) { + $login = 'anonymous'; + $password = 'DrakX@vivelinuxabaszindozs'; + } + + my $ftp = Net::FTP->new(network::resolv($host), %options) or die ''; + $ftp->login($login, $password) or die ''; + $ftp->binary; + $ftp->cwd($prefix); + + my @l = ($ftp, \ (my $retr = undef)); + $hosts{$host} = \@l; + @l; + }}; + wantarray ? @l : $l[0]; +} sub getFile($) { - $ftp ||= new(); - $retr->close if $retr; - $retr = $ftp->retr($ENV{PREFIX} . "/" . install_any::relGetFile($_[0])); + my $f = shift; + my ($ftp, $retr) = new(@_ ? @_ : fromEnv); + $$retr->close if $$retr; + $$retr = $ftp->retr(install_any::relGetFile($f)); } -- cgit v1.2.1