version 1.18, 2006/05/10 01:08:01
|
version 1.25, 2007/02/08 10:08:02
|
Line 31
|
Line 31
|
# |
# |
|
|
use Expect; |
use Expect; |
use IPC::Open3; |
|
use IO::Select; |
use IO::Select; |
use IO::Socket; |
use IO::Socket; |
use IO::File; |
use IO::File; |
Line 254 sub make_new_child {
|
Line 253 sub make_new_child {
|
for (my $i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) { |
for (my $i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) { |
&status('Accepting connections'); |
&status('Accepting connections'); |
my $client = $server->accept() or last; |
my $client = $server->accept() or last; |
print $command "kill(all);reset();\n"; |
print $command "kill(all);\n"; |
&getmaximaoutput($command); |
&getmaximaoutput($command); |
|
&sync($command); |
while (my $cmd=<$client>) { |
while (my $cmd=<$client>) { |
&status('Processing command'); |
&status('Processing command'); |
&sync($command); |
|
print $command &unescape($cmd); |
print $command &unescape($cmd); |
my $reply=&getmaximaoutput($command); |
my ($reply,$finished,$syntaxerr) = &getmaximaoutput($command,1); |
print $client &escape($reply)."\n"; |
print $client &escape($reply)."\n"; |
if ($reply=~/^Error\:/) { |
if ($reply=~/^Error\:/) { |
&logthis('Died through '.$reply); |
&logthis('Died through '.$reply); |
$client->close(); |
$client->close(); |
$command->hard_close(); |
$command->hard_close(); |
exit; |
exit; |
} |
} |
|
&sync($command); |
&status('Waiting for commands'); |
&status('Waiting for commands'); |
} |
} |
} |
} |
Line 291 sub make_new_child {
|
Line 291 sub make_new_child {
|
my $expect=$counter.time; |
my $expect=$counter.time; |
print $command "$expect;\n"; |
print $command "$expect;\n"; |
while (1) { |
while (1) { |
my $output=&getmaximaoutput($command); |
my $output=&getmaximaoutput($command,1); |
if (($output=~/\Q$expect\E/) || ($output=~/^Error\:/)) { |
if (($output=~/\Q$expect\E/) || ($output=~/^Error\:/)) { |
return; |
return; |
} |
} |
Line 300 sub make_new_child {
|
Line 300 sub make_new_child {
|
} |
} |
|
|
sub getmaximaoutput { |
sub getmaximaoutput { |
my ($command)=@_; |
my ($command,$numcheck)=@_; |
my (undef,$error,undef,$output)=$command->expect(20, -re => '\(\%i\d+\)'); |
my $regexp = '\(\%i\d+\)'; |
|
if ($numcheck) { |
|
if ($command->match() =~ /\(\%i(\d+)\)/) { |
|
my $nextmatch = $1+1; |
|
$regexp = '\(\%i'.$nextmatch.'\)'; |
|
} |
|
} |
|
my (undef,$error,undef,$output)=$command->expect(20, -re => $regexp); |
if ($error) { |
if ($error) { |
return 'Error: '.$error; |
return 'Error: '.$error; |
} |
} |
|
$output =~ s/\r+//g; # Remove Windows-style linebreaks |
|
my $hasoutput=0; |
my $foundoutput=0; |
my $foundoutput=0; |
|
my $syntaxerr=0; |
my $realoutput=''; |
my $realoutput=''; |
foreach my $line (split(/\n/,$output)) { |
foreach my $line (split(/\n/,$output)) { |
if ($line=~/\;/) { $foundoutput=1; next; } |
if ($line=~/\;/) { $foundoutput=1; next; } |
if (!$foundoutput) { next; } |
if (!$foundoutput) { next; } |
my ($label)=($line=~s/^(\(\%o\d+\))//); |
if ($line=~/^Incorrect syntax:/) { $syntaxerr = 1; next; } |
|
(my $label, $line) = ($line=~ /^(\(\%o\d+\))(.+)$/); |
if ($label) { |
if ($label) { |
$label=~s/\S/ /g; |
$label=~s/\S/ /g; |
$line=$label.$line; |
$line=$label.$line; |
|
$hasoutput = 1; |
} |
} |
$realoutput.=$line."\n"; |
$realoutput.=$line."\n"; |
} |
} |
return $realoutput; |
if (wantarray) { |
|
return ($realoutput,$hasoutput,$syntaxerr); |
|
} else { |
|
return $realoutput; |
|
} |
} |
} |