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);
if ($conn->{msg} =~ /\cJ$/) {
delete $conn->{msg};
} else {
- $conn->{msg} = pop @lines;
+ $conn->{msg} =~ s/([^\cM\cJ]*)\cM?\cJ//g;
}
while (defined ($msg = shift @lines)) {
dbg("connect $conn->{cnum}: $msg") if $conn->{state} ne 'C' && isdbg('connect');
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) {
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) {