X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FExtMsg.pm;h=133a1513acdef46cba5bb2cefc808f601e104716;hb=refs%2Ftags%2F1.54;hp=4dbefbc594c13e7edc2b18071a6c5a442404ef26;hpb=49a14209678e26e31b2a9c89aec330c1a7a87b80;p=spider.git

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index 4dbefbc5..133a1513 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;
 
@@ -32,6 +32,11 @@ use vars qw(@ISA $deftimeout);
 @ISA = qw(Msg);
 $deftimeout = 60;
 
+sub login
+{
+	goto &main::login;        # save some writing, this was the default
+}
+
 sub enqueue
 {
 	my ($conn, $msg) = @_;
@@ -272,49 +277,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)");
 	}