X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FExtMsg.pm;h=f1472789152fbfc3836142577d8831e86a4b591e;hb=3915e73f468fbcce9b7ee8a18e5bea6f605e216e;hp=2edd7537962a91bd06371f0805eaef841b27aedf;hpb=6d4734fbc4db9f84db74e9ffd8f81cd019f6c8ea;p=spider.git

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index 2edd7537..f1472789 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -23,7 +23,7 @@ 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;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -95,7 +95,7 @@ sub dequeue
 			dbg("connect $conn->{cnum}: $msg") if $conn->{state} ne 'C' && isdbg('connect');
 		
 			$msg =~ s/\xff\xfa.*\xff\xf0|\xff[\xf0-\xfe].//g; # remove telnet options
-			$msg =~ s/[\x00-\x08\x0a-\x19\x1b-\x1f\x80-\x9f]/./g;         # immutable CSI sequence + control characters
+#			$msg =~ s/[\x00-\x08\x0a-\x19\x1b-\x1f\x80-\x9f]/./g;         # immutable CSI sequence + control characters
 			
 			if ($conn->{state} eq 'C') {
 				&{$conn->{rproc}}($conn, "I$conn->{call}|$msg");
@@ -272,49 +272,7 @@ sub _doconnect
 		bless $conn, 'AGWMsg';
 		$r = $conn->connect($line);
 	} elsif ($sort eq 'ax25' || $sort eq 'prog') {
-		local $^F = 10000;		# make sure it ain't closed on exec
-		my ($a, $b) = IO::Socket->socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC);
-		if ($a && $b) {
-			$r = 1;
-			$a->autoflush(1);
-			$b->autoflush(1);
-			my $pid = fork;
-			if (defined $pid) {
-				if ($pid) {
-					close $b;
-					$conn->{sock} = $a;
-					$conn->{csort} = $sort;
-					$conn->{lineend} = "\cM" if $sort eq 'ax25';
-					$conn->{pid} = $pid;
-					if ($conn->{rproc}) {
-						my $callback = sub {$conn->_rcv};
-						Msg::set_event_handler ($a, read => $callback);
-					}
-					dbg("connect $conn->{cnum}: started pid: $conn->{pid} as $line") if isdbg('connect');
-				} else {
-					$^W = 0;
-					dbgclose();
-					STDIN->close;
-					STDOUT->close;
-					STDOUT->close;
-					*STDIN = IO::File->new_from_fd($b, 'r') or die;
-					*STDOUT = IO::File->new_from_fd($b, 'w') or die;
-					*STDERR = IO::File->new_from_fd($b, 'w') or die;
-					close $a;
-					unless ($main::is_win) {
-#						$SIG{HUP} = 'IGNORE';
-						$SIG{HUP} = $SIG{CHLD} = $SIG{TERM} = $SIG{INT} = 'DEFAULT';
-						alarm(0);
-					}
-					exec "$line" or dbg("exec '$line' failed $!");
-				} 
-			} else {
-				dbg("cannot fork");
-				$r = undef;
-			}
-		} else {
-			dbg("no socket pair $!");
-		}
+		$r = $conn->start_program($line, $sort);
 	} else {
 		dbg("invalid type of connection ($sort)");
 	}