1. cluster seems to have a memory leak, put DESTROY functions in where

[spider.git] / perl / client.pl

diff --git a/perl/client.pl b/perl/client.pl
index 9e948a181a64bee603208586c1573d65ddccf327..fb86542f394dbfdf760d56acb1fe0402c5d0eceb 100755 (executable)
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -163,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;
@@ -189,9 +191,7 @@ sub rec_stdin
                } else {
                        $conn->send_later("I$call|$buf");
                }
-       } elsif ($r == 0) {
-               cease(1);
-       }
+       } 
        $lasttime = time;
 }
 
@@ -225,6 +225,8 @@ sub doconnect
                $rfh = new IO::File;
                $wfh = new IO::File;
                $pid = open2($rfh, $wfh, "$line") or die "can't do $line $!";
+               die "no receive channel $!" unless $rfh;
+               die "no transmit channel $!" unless $wfh;
                dbg('connect', "got pid $pid");
                $wfh->autoflush(1);
        } else {
@@ -325,9 +327,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';