X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FExtMsg.pm;h=4475f6a10cbf6623f5c8f12163acb6cf14f97198;hb=e39b738850b9a122b60b179e9723e546ddacfd62;hp=ae6c8a4c447a8d6bd5d56b528634589593f49b1b;hpb=503b6b1f503860def06f4e2121b0367e856081cd;p=spider.git diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm index ae6c8a4c..4475f6a1 100644 --- a/perl/ExtMsg.pm +++ b/perl/ExtMsg.pm @@ -115,9 +115,8 @@ sub to_connected delete $conn->{cmd}; $conn->{timeout}->del if $conn->{timeout}; delete $conn->{timeout}; - $conn->_send_file("$main::data/connected"); - Msg->sleep(1); &{$conn->{rproc}}($conn, "$dir$call|$sort"); + $conn->_send_file("$main::data/connected"); } sub new_client { @@ -253,7 +252,7 @@ sub _doconnect *STDOUT = IO::File->new_from_fd($b, 'w') or die; *STDERR = IO::File->new_from_fd($b, 'w') or die; close $a; - unless ($^O =~ /^MS/) { + unless ($main::is_win) { # $SIG{HUP} = 'IGNORE'; $SIG{HUP} = $SIG{CHLD} = $SIG{TERM} = $SIG{INT} = 'DEFAULT'; alarm(0); @@ -319,8 +318,10 @@ sub _dochat return; } if ($line =~ /\Q$expect/i) { - dbg('connect', "got: \"$expect\" sending: \"$send\""); - $conn->send_later("D$conn->{call}|$send"); + if (length $send) { + dbg('connect', "got: \"$expect\" sending: \"$send\""); + $conn->send_later("D$conn->{call}|$send"); + } delete $conn->{msg}; # get rid any input if a match return; } @@ -364,6 +365,7 @@ sub _send_file if ($f) { while (<$f>) { chomp; + dbg('connll', $_); $conn->send_raw($_ . $conn->{lineend}); } $f->close;