X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FExtMsg.pm;h=146604169096a658270ec2e2681024f04911c00e;hb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;hp=7b33b6e2780d43e19d663d63f0fe4bdf59a0b14f;hpb=6624dcdf07d628e8d6a16fc6549edf40be25b7b2;p=spider.git

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index 7b33b6e2..14660416 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -21,6 +21,12 @@ use IO::File;
 use IO::Socket;
 use IPC::Open3;
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw(@ISA $deftimeout);
 
 @ISA = qw(Msg);
@@ -200,8 +206,8 @@ sub _docmd
 				last;
 			}  
 		}
-		if ($cmd =~ /^\s*\'.*\'\s+\'.*\'/i) {
-			$conn->_dochat($cmd, $msg);
+		if ($cmd =~ /^\s*\'([^\']*)\'\s+\'([^\']*)\'/) {
+			$conn->_dochat($cmd, $msg, $1, $2);
 			last;
 		}
 		if ($cmd =~ /^\s*cl\w+\s+(.*)/i) {
@@ -317,9 +323,10 @@ sub _dochat
 	my $conn = shift;
 	my $cmd = shift;
 	my $line = shift;
+	my $expect = shift;
+	my $send = shift;
 		
 	if ($line) {
-		my ($expect, $send) = $cmd =~ /^\s*\'(.*)\'\s+\'(.*)\'/;
 		if ($expect) {
 			dbg("connect $conn->{cnum}: expecting: \"$expect\" received: \"$line\"") if isdbg('connect');
 			if ($conn->{abort} && $line =~ /\Q$conn->{abort}/i) {