--- loncom/lonmaxima	2007/05/26 16:00:30	1.29
+++ loncom/lonmaxima	2007/08/02 13:04:55	1.31
@@ -3,7 +3,7 @@
 # The LearningOnline Network with CAPA
 # Connect to MAXIMA CAS
 #
-# $Id: lonmaxima,v 1.29 2007/05/26 16:00:30 www Exp $
+# $Id: lonmaxima,v 1.31 2007/08/02 13:04:55 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -237,7 +237,7 @@ sub make_new_child {
         return;
     } else {
         # Child can *not* return from this subroutine.
-        $SIG{INT} = 'DEFAULT';      # make SIGINT kill us as it did before
+        
      
         # unblock signals
         sigprocmask(SIG_UNBLOCK, $sigset)
@@ -246,7 +246,15 @@ sub make_new_child {
         &logthis('New process started');
 
         my $command=Expect->spawn('maxima');
-        $command->log_stdout(0);
+	# soft/hard_close can take awhile and we really
+        # don't care we just want it gone
+	$SIG{INT} = sub {
+	    my $pid = $command->pid();
+	    kill('KILL'=>$pid);
+	    exit; 
+	};
+
+	$command->log_stdout(0);
 	#$command->log_file("$execdir/logs/lonmaxima.session.log");
         &getmaximaoutput($command);
 
@@ -338,9 +346,10 @@ sub getmaximaoutput {
        if ($line=~/\;/) { $foundoutput=1; next; }
        if (!$foundoutput) { next; }
        if ($line=~/^Incorrect syntax:/) { $syntaxerr = 1; next; }
-       (my $label, $line) = ($line=~ /^(\(\%o\d+\))(.+)$/);
-       if ($label) {
-           $label=~s/\S/ /g;
+       if ( $line=~ /^(\(\%o\d+\))(.+)$/){
+           my $label = $1;
+           $line = $2;
+           $label =~s/\S/ /g;
            $line=$label.$line;
        }
        $realoutput.=$line."\n";