standardise build number calc

diff --git a/Changes b/Changes
index cb7a35af48e1b3fda0d3f56252e502f9c2777e51..9452892f8867614b9fbfee2884ded2fbfeee2c1e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+11Apr01=======================================================================
+1. fixed more of the "xxx disappeared from yyy" messages
+2. altered the build no logic so that it always checksums the same files
+regardless of whatever else you might have in the directory.
 10Apr01=======================================================================
 1. altered PC21 logic somewhat to eliminate dup PC21s
 2. disconnect should remove dangling local users in the routing table.

diff --git a/perl/BBS.pm b/perl/BBS.pm
index 741fb116a15da803d27a9f24730f7ba3f4a72bec..a014ecfe225f7c92e9d6b9819f795f901108c9fd 100644 (file)
--- a/perl/BBS.pm
+++ b/perl/BBS.pm
@@ -16,11 +16,10 @@ use DXUser;
 use DXChannel;
 use DB_File;
 use DXDebug;
+use vars qw (@ISA %bid $bidfn $lastbidclean $bidcleanint %hash $maxbidage);
 
 @ISA = qw(DXChannel);
 
-use vars qw (%bid $bidfn $lastbidclean $bidcleanint);
-
 %bid = ();                                             # the bid hash
 $bidfn = "$main::root/msg/bid";        # the bid file filename
 $lastbidclean = time;                  # the last time the bid file was cleaned
@@ -115,7 +114,7 @@ sub normal
                }
     } elsif ($com =~ /^F/) {
                $self->disconnect;
-       } elsif ($com =~ /^(B|Q)) {
+       } elsif ($com =~ /^(B|Q)/) {
                $self->disconnect;
        }
 }

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 6ac7a3fb907265f6bb92dbedd29d599d9d2c1662..3bed469c69085a786766ddc96008769ce3a39151 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -41,11 +41,14 @@ BEGIN {
        $systime = time;
 }
 
+use DXVars;
 use Msg;
 use IntMsg;
+use Internet;
+use Listeners;
 use ExtMsg;
+use AGWConnect;
 use AGWMsg;
-use DXVars;
 use DXDebug;
 use DXLog;
 use DXLogPrint;
@@ -54,21 +57,30 @@ use DXChannel;
 use DXUser;
 use DXM;
 use DXCommandmode;
+use DXProtVars;
+use DXProtout;
 use DXProt;
 use DXMsg;
 use DXCluster;
 use DXCron;
 use DXConnect;
+use DXBearing;
+use DXDb;
+use DXHash;
+use DXDupe;
 use Prefix;
 use Bands;
+use Keps;
+use Minimuf;
+use Sun;
 use Geomag;
 use CmdAlias;
 use Filter;
-use DXDb;
 use AnnTalk;
+use BBS;
 use WCY;
-use DXDupe;
 use BadWords;
+use Timer;
 
 use Data::Dumper;
 use IO::File;
@@ -328,21 +340,22 @@ STDOUT->autoflush(1);
 # calculate build number
 $build = $main::version;
 
-if (opendir(DIR, "$main::root/perl")) {
-       my @d = readdir(DIR);
-       closedir(DIR);
-       foreach my $fn (@d) {
-               if ($fn =~ /^cluster\.pl$/ || $fn =~ /\.pm$/) {
-                       my $f = new IO::File "$main::root/perl/$fn" or next;
-                       while (<$f>) {
-                               if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)/ ) {
-                                       $build += $1;
-                                       last;
-                               }
-                       }
-                       $f->close;
+my @fn;
+open(CL, "$main::root/perl/cluster.pl") or die "Cannot open cluster.pl $!";
+while (<CL>) {
+       next unless /^use\s+([\w:_]+)/;
+       push @fn, $1;
+}
+close CL;
+foreach my $fn (@fn) {
+       open(CL, "$main::root/perl/${fn}.pm") or next;
+       while (<CL>) {
+               if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)/ ) {
+                       $build += $1;
+                       last;
                }
        }
+       close CL;
 }
 
 Log('cluster', "DXSpider V$version, build $build started");
@@ -363,8 +376,6 @@ dbg('err', "loading user file system ...");
 DXUser->init($userfn, 1);
 
 # start listening for incoming messages/connects
-use Listeners;
-
 dbg('err', "starting listeners ...");
 my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
 $conn->conns("Server $clusteraddr/$clusterport");