removed unwanted pc21 for isolated nodes

[spider.git] / perl / client.pl

diff --git a/perl/client.pl b/perl/client.pl
index 2392dfa8662f0b1b2d16a83e863281254471c97d..8a19719ef54ec26333bc6f140d5af1fb3c11e1b2 100755 (executable)
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 #
 # A thing that implements dxcluster 'protocol'
 #
@@ -45,7 +45,7 @@ use IO::File;
 use IO::Socket;
 use IPC::Open2;
 use Net::Telnet qw(TELOPT_ECHO);
-use Carp;
+use Carp qw{cluck};
 
 # cease communications
 sub cease
@@ -59,6 +59,8 @@ sub cease
                dbg('connect', "killing $pid");
                kill(9, $pid);
        }
+       dbgclose();
+#      $SIG{__WARN__} = sub {my $a = shift; cluck($a); };
        sleep(1);
        exit(0);        
 }
@@ -127,7 +129,8 @@ sub rec_socket
                                $mode = $line;          # set echo mode from cluster
                                my $term = POSIX::Termios->new;
                                $term->getattr(fileno($sock));
-                               $term->setflag( &POSIX::ISIG );
+                               $term->setiflag( 0 );
+                               $term->setoflag( 0 );
                                $term->setattr(fileno($sock), &POSIX::TCSANOW );
                        }
                } elsif ($sort eq 'I') {
@@ -160,7 +163,9 @@ sub rec_stdin
        #  $prbuf =~ s/\r/\\r/;
        #  $prbuf =~ s/\n/\\n/;
        #  print "sys: $r ($prbuf)\n";
-       if ($r > 0) {
+       if (!defined $r || $r == 0) {
+               cease(1);
+       } elsif ($r > 0) {
                if ($mode) {
                        $buf =~ s/\r/\n/og if $mode == 1;
                        $buf =~ s/\r\n/\n/og if $mode == 2;
@@ -186,9 +191,7 @@ sub rec_stdin
                } else {
                        $conn->send_later("I$call|$buf");
                }
-       } elsif ($r == 0) {
-               cease(1);
-       }
+       } 
        $lasttime = time;
 }
 
@@ -322,9 +325,9 @@ $waitedpid = 0;
 # deal with args
 #
 
-$call = uc shift @ARGV;
+$call = uc shift @ARGV if @ARGV;
 $call = uc $myalias if !$call;
-$connsort = lc shift @ARGV;
+$connsort = lc shift @ARGV if @ARGV;
 $connsort = 'local' if !$connsort;
 
 $loginreq = $call eq 'LOGIN';
@@ -471,7 +474,7 @@ if (! $conn) {
                open IN, "$data/offline" or die;
                while (<IN>) {
                        s/\n/\r/og if $mode == 1;
-                       print $stdout;
+                       print $stdout $_;
                }
                close IN;
        } else {