From: djk <djk>
Date: Tue, 20 Apr 1999 17:55:49 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: R_1_25~5
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ca18864d1264fadfe9869b630f05c950876c2169;p=spider.git

*** empty log message ***
---

diff --git a/cmd/Aliases b/cmd/Aliases
index a34c6da5..33261a82 100644
--- a/cmd/Aliases
+++ b/cmd/Aliases
@@ -80,6 +80,7 @@ package CmdAlias;
 	  '^rcmd/(\S+)', 'rcmd $1', 'rcmd',
 	],
 	's' => [
+	  '^s/p$', 'send', 'send',
 	  '^set/nobe', 'unset/beep', 'unset/beep',
 	  '^set/nohe', 'unset/here', 'unset/here',
 	  '^set/noan', 'unset/announce', 'unset/announce',
diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 5a796935..97aaa355 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -76,7 +76,7 @@ sub alloc
 	$self->{msgno} = shift;
 	my $to = shift;
 	#  $to =~ s/-\d+$//o;
-	$self->{to} = $to;
+	$self->{to} = ($to eq $main::mycall) ? $main::myalias : $to;
 	my $from = shift;
 	$from =~ s/-\d+$//o;
 	$self->{from} = uc $from;
diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 97aca375..a9c7ea03 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -94,6 +94,7 @@ use strict;
 
 sub finish
 {
+	undef $dbm;
 	untie %u;
 }
 
diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index fe82721e..07e3f4cb 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -67,6 +67,7 @@ sub cltounix
 	my ($thisyear) = (gmtime)[5] + 1900;
 
 	return 0 unless $date =~ /^\s*(\d+)-(\w\w\w)-([12][90]\d\d)$/;
+	return 0 if $3 > 2036;
 	return 0 unless abs($thisyear-$3) <= 1;
 	$date = "$1 $2 $3";
 	return 0 unless $time =~ /^([012]\d)([012345]\d)Z$/;
diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index ba9ea2b9..8ea62b87 100644
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -24,6 +24,7 @@ $db = undef;					# the DB_File handle
 sub load
 {
 	if ($db) {
+		undef $db;
 		untie %pre;
 		%pre = ();
 		%prefix_loc = ();
@@ -76,7 +77,8 @@ sub store
 		$fh->print("$str ],\n");
 	}
 	$fh->print(");\n");
-	$fh->close;
+	undef $fh;
+	untie %pre; 
 }
 
 # what you get is a list that looks like:-
diff --git a/perl/cluster.pl b/perl/cluster.pl
index 2330bcda..4a4400a1 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -67,7 +67,7 @@ package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.24";				# the version no of the software
+$version = "1.25";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
       
@@ -159,6 +159,9 @@ sub login
 sub cease
 {
 	my $dxchan;
+
+	$SIG{'TERM'} = 'IGNORE';
+	$SIG{'INT'} = 'IGNORE';
 	
 	eval {
 		Local::finish();   # end local processing
@@ -172,8 +175,8 @@ sub cease
 	Msg->event_loop(1, 0.05);
 	Msg->event_loop(1, 0.05);
 	Msg->event_loop(1, 0.05);
-	Log('cluster', "DXSpider V$version stopped");
 	DXUser::finish();
+	Log('cluster', "DXSpider V$version stopped");
 	unlink $lockfn;
 	exit(0);
 }
@@ -335,5 +338,7 @@ for (;;) {
 		last if --$decease <= 0;
 	}
 }
+cease(0);
+exit(0);