[mosh] Initialize options only if not provided on the command line

mobile-shell#431

Declare option variables as undef, and only provide a default value
if options were not provided on the command line in preparation for
obtaining values from a configuration file.

Signed-off-by: Earl Chew <earl_chew@yahoo.com>

scripts/mosh.pl

@@ -435,31 +435,32 @@ BEGIN
 
 my $configFile = ConfigFile->new([ '~', '.mosh', 'config' ]);
 
-my $client = 'mosh-client';
-my $server = 'mosh-server';
+my $client = undef;
+my $server = undef;
 
 my $predict = undef;
 
 my $overwrite = 0;
 
 my $bind_ip = undef;
 
-my $use_remote_ip = 'proxy';
+my $use_remote_ip = undef;
+
+my $family = undef;
 
-my $family = 'prefer-inet';
 my $port_request = undef;
 my %port_setting = (
     firewall_port => 0,
     server_port => 0,
     port_range => 0 );
 
-my @ssh = ('ssh');
+my @ssh = ();
 
-my $term_init = 1;
+my $term_init = undef;
 
 my $localhost = undef;
 
-my $ssh_pty = 1;
+my $ssh_pty = undef;
 
 my $help = undef;
 my $version = undef;
@@ -630,6 +631,14 @@ sub predict_check {
 my $userhost = shift;
 my @command = @ARGV;
 
+$client = 'mosh-client' unless defined($client);
+$server = 'mosh-server' unless defined($server);
+@ssh = ('ssh') unless @ssh;
+$term_init = 1 unless defined($term_init);
+$ssh_pty = 1 unless defined($ssh_pty);
+$family = 'prefer-inet' unless defined($family);
+$use_remote_ip = 'proxy' unless defined($use_remote_ip);
+
 if ( defined $predict ) {
   predict_check( $predict, 0 );
 } elsif ( defined $ENV{ 'MOSH_PREDICTION_DISPLAY' } ) {