izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mosh.pl: Run ssh directly instead of via sh

Browse Source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg
2015-08-07 19:57:55 -04:00
committed by John Hood
parent 57e54c46bc
commit f0f2aa7cce
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/mosh.pl
+4 -3
View File
@@ -34,6 +34,7 @@ use warnings;
use strict; use strict;
use Getopt::Long; use Getopt::Long;
use IO::Socket; use IO::Socket;
use Text::ParseWords;
$|=1; $|=1;
@@ -47,7 +48,7 @@ my $bind_ip = undef;
my $family = 'inet'; my $family = 'inet';
my $port_request = undef; my $port_request = undef;
my $ssh = 'ssh'; my @ssh = ('ssh');
my $term_init = 1; my $term_init = 1;
@@ -119,7 +120,7 @@ GetOptions( 'client=s' => \$client,
'4' => sub { $family = 'inet' }, '4' => sub { $family = 'inet' },
'6' => sub { $family = 'inet6' }, '6' => sub { $family = 'inet6' },
'p=s' => \$port_request, 'p=s' => \$port_request,
'ssh=s' => \$ssh, 'ssh=s' => sub { @ssh = shellwords($_[1]); },
'init!' => \$term_init, 'init!' => \$term_init,
'local' => \$localhost, 'local' => \$localhost,
'help' => \$help, 'help' => \$help,
@@ -296,7 +297,7 @@ if ( $pid == 0 ) { # child
die "Cannot exec $server: $!\n"; die "Cannot exec $server: $!\n";
} }
my $quoted_self = shell_quote( $0, "--family=$family" ); my $quoted_self = shell_quote( $0, "--family=$family" );
exec "$ssh " . shell_quote( '-S', 'none', '-o', "ProxyCommand=$quoted_self --fake-proxy -- %h %p", '-n', '-tt', $userhost, '--', "$server " . shell_quote( @server ) ); exec @ssh, '-S', 'none', '-o', "ProxyCommand=$quoted_self --fake-proxy -- %h %p", '-n', '-tt', $userhost, '--', "$server " . shell_quote( @server );
die "Cannot exec ssh: $!\n"; die "Cannot exec ssh: $!\n";
} else { # parent } else { # parent
my ( $ip, $port, $key ); my ( $ip, $port, $key );