=================================================================== RCS file: /cvs/trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm 2007/02/01 17:58:33 1.29 +++ trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm 2007/02/02 17:51:52 1.30 @@ -1,5 +1,5 @@ package Net::Telnet::Trango; -# $RedRiver: Trango.pm,v 1.28 2007/02/01 17:10:07 mike Exp $ +# $RedRiver: Trango.pm,v 1.29 2007/02/01 17:58:33 andrew Exp $ use strict; use warnings; use base 'Net::Telnet'; @@ -396,9 +396,13 @@ } if (exists $COMMANDS{$method}) { - $COMMANDS{$method}{'String'} ||= $method; - $COMMANDS{$method}{'args'} .= ' ' . shift if (@_ == 1); - return $self->cmd(%{ $COMMANDS{$method} }, @_); + my %cmd; + foreach my $k (keys %{ $COMMANDS{$method} }) { + $cmd{$k} = $COMMANDS{$method}{$k}; + } + $cmd{'String'} ||= $method; + $cmd{'args'} .= ' ' . shift if (@_ == 1); + return $self->cmd(%cmd, @_); } if (exists $ACCESS{$method}) { @@ -938,12 +942,13 @@ if ($cfg{'args'}) { $cmd{'String'} .= ' ' . $cfg{'args'}; } + my @lines; - unless ($cfg{'no_prompt'}) { - @lines = $self->SUPER::cmd(%cmd); - } else { + if ($cfg{'no_prompt'}) { $self->print($cmd{'String'}); @lines = $self->lastline; + } else { + @lines = $self->SUPER::cmd(%cmd); } $self->last_lines(\@lines);