package Net::SSH;
use strict;
-use vars qw($VERSION @ISA @EXPORT_OK $ssh $equalspace $DEBUG);
+use vars qw($VERSION @ISA @EXPORT_OK $ssh $equalspace $DEBUG @ssh_options);
use Exporter;
+use POSIX ":sys_wait_h";
use IO::File;
+use IO::Select;
use IPC::Open2;
use IPC::Open3;
@ISA = qw(Exporter);
@EXPORT_OK = qw( ssh issh ssh_cmd sshopen2 sshopen3 );
-$VERSION = '0.06';
+$VERSION = '0.08';
$DEBUG = 0;
sub ssh {
my($host, @command) = @_;
- &_check_ssh_version unless defined $equalspace;
- my @cmd = ($ssh, '-o', 'BatchMode'.$equalspace.'yes', $host, @command);
+ @ssh_options = &_ssh_options unless @ssh_options;
+ my @cmd = ($ssh, @ssh_options, $host, @command);
warn "[Net::SSH::ssh] executing ". join(' ', @cmd). "\n"
if $DEBUG;
system(@cmd);
$host = $opt->{user}. '@'. $host if exists $opt->{user};
@command = ( $opt->{command} );
push @command, @{ $opt->{args} } if exists $opt->{args};
- my $stdin_string = $opt->{stdin_string};
+ $stdin_string = $opt->{stdin_string};
} else {
($host, @command) = @_;
undef $stdin_string;
my $writer = IO::File->new();
my $error = IO::File->new();
- sshopen3( $host, $writer, $reader, $error, @command ) or die $!;
+ my $pid = sshopen3( $host, $writer, $reader, $error, @command ) or die $!;
print $writer $stdin_string if defined $stdin_string;
close $writer;
- local $/ = undef;
- my $output_stream = <$reader>;
- my $error_stream = <$error>;
+ my $select = new IO::Select;
+ foreach ( $reader, $error ) { $select->add($_); }
+
+ my($output_stream, $error_stream) = ('', '');
+ while ( $select->count ) {
+ my @handles = $select->can_read;
+ foreach my $handle ( @handles ) {
+ my $buffer = '';
+ my $bytes = sysread($handle, $buffer, 4096);
+ if ( !defined($bytes) ) {
+ waitpid($pid, WNOHANG);
+ die "[Net::SSH::ssh_cmd] $!"
+ };
+ $select->remove($handle) if !$bytes;
+ if ( $handle eq $reader ) {
+ $output_stream .= $buffer;
+ } elsif ( $handle eq $error ) {
+ $error_stream .= $buffer;
+ }
+ }
- if ( length $error_stream ) {
- die "[Net:SSH::ssh_cmd] STDERR $error_stream";
}
+ waitpid($pid, WNOHANG);
+
+ die "$error_stream" if length($error_stream);
+
return $output_stream;
}
sub sshopen2 {
my($host, $reader, $writer, @command) = @_;
- &_check_ssh_version unless defined $equalspace;
- open2($reader, $writer, $ssh, '-o', 'BatchMode'.$equalspace.'yes', $host, @command);
+ @ssh_options = &_ssh_options unless @ssh_options;
+ open2($reader, $writer, $ssh, @ssh_options, $host, @command);
}
=item sshopen3 HOST, WRITER, READER, ERROR, COMMAND [, ARGS ... ]
sub sshopen3 {
my($host, $writer, $reader, $error, @command) = @_;
- &_check_ssh_version unless defined $equalspace;
- open3($writer, $reader, $error, $ssh, '-o', 'BatchMode'.$equalspace.'yes', $host, @command);
+ @ssh_options = &_ssh_options unless @ssh_options;
+ open3($writer, $reader, $error, $ssh, @ssh_options, $host, @command);
}
sub _yesno {
$x =~ /^y/i;
}
-sub _check_ssh_version {
+sub _ssh_options {
my $reader = IO::File->new();
my $writer = IO::File->new();
my $error = IO::File->new();
} else {
$equalspace = "=";
}
+ my @options = ( '-o', 'BatchMode'.$equalspace.'yes' );
+ if ( $ssh_version =~ /.*OpenSSH[-|_](\w+)\./ && $1 > 1 ) {
+ unshift @options, '-T';
+ }
+ @options;
}
=back
=head1 COPYRIGHT
-Copyright (c) 2002 Ivan Kohler.
+Copyright (c) 2004 Ivan Kohler.
Copyright (c) 2002 Freeside Internet Services, LLC
All rights reserved.
This program is free software; you can redistribute it and/or modify it under