X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fclient.pl;h=1914ab3179e53e54365c685a05b1022c95937f05;hb=63f443706c0121d92cbd5c73662e54bc1528f488;hp=4a4069f07313c0a6d567bbb14a90e76eb499224d;hpb=cc91428ca79b3cdfdc7733505384f5983ad6c7fa;p=spider.git

diff --git a/perl/client.pl b/perl/client.pl
index 4a4069f0..1914ab31 100755
--- 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);	
 }
@@ -96,7 +98,7 @@ sub rec_socket
 		cease(1);
 	}
 	if (defined $msg) {
-		my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
+		my ($sort, $call, $line) = $msg =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
 		
 		if ($sort eq 'D') {
 			my $snl = $mynl;
@@ -161,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;
@@ -187,9 +191,7 @@ sub rec_stdin
 		} else {
 			$conn->send_later("I$call|$buf");
 		}
-	} elsif ($r == 0) {
-		cease(1);
-	}
+	} 
 	$lasttime = time;
 }
 
@@ -223,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 {
@@ -323,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';
@@ -472,7 +476,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 {