*** empty log message ***

diff --git a/cmd/Aliases b/cmd/Aliases
index a34c6da539e666567b6e6371fd83e22bd9dede2e..33261a82c72121945929de8ce9e7fcf276433ce7 100644 (file)
--- 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 5a796935a65317bd79643a1311b073fe77b1a6bc..97aaa35514b21060cf8fc5ac78f09a47080a7a09 100644 (file)
--- 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 97aca375c325bccac68ac9fb609c46a4fc86ca19..a9c7ea030177eb75948a2c5954e9242ab121487e 100644 (file)
--- 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 fe82721e16c04e5bdf0095eb56f347b5a3e6609d..07e3f4cb3bede190e80ae629259be3b8df7da646 100644 (file)
--- 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 ba9ea2b93c1f91fa5a4530f7ba6f4025a7c6d667..8ea62b87fbda9e742fd0a481b925e753a9b2c65e 100644 (file)
--- 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 2330bcda5639f5ae02986ce7119d206b5f1990b5..4a4400a15f45c90fae90a76d36cd0fd515905efa 100755 (executable)
--- 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);