X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fcore.pl;h=eb0b7dec929e77ae5d071fbd8ee00d7d6322aed1;hb=7c5aad98f2d24e8053b55dfbb2c97a16f7efb1df;hp=9cf0c802375862491cd26d90e5b75a52852ce6a3;hpb=a7384ea463f0bc1c37a2dfd5b547b0bc66c633b7;p=infobot.git

diff --git a/src/core.pl b/src/core.pl
index 9cf0c80..eb0b7de 100644
--- a/src/core.pl
+++ b/src/core.pl
@@ -27,15 +27,15 @@ use vars qw(
 );
 
 # array.
-use vars qw(@joinchan @ircServers @wingateBad @wingateNow @wingateCache
+use vars qw(@ircServers @wingateBad @wingateNow @wingateCache
 );
 
 ### hash. MUST BE REDUCED IN SIZE!!!
-# 
+#
 use vars qw(%count %netsplit %netsplitservers %flood %dcc %orig
 	    %nuh %talkWho %seen %floodwarn %param %dbh %ircPort
 	    %topic %moduleAge %last %time %mask %file
-	    %forked %chanconf %channels
+	    %forked %chanconf %channels %cache
 );
 
 # Signals.
@@ -60,6 +60,14 @@ $wtime_chanfile	= 0;
 $ucount_chanfile = 0;
 $running	= 0;
 ### more variables...
+# static scalar variables.
+$mask{ip}	= '(\d+)\.(\d+)\.(\d+)\.(\d+)';
+$mask{host}	= '[\d\w\_\-\/]+\.[\.\d\w\_\-\/]+';
+$mask{chan}	= '[\#\&]\S*|_default';
+my $isnick1	= 'a-zA-Z\[\]\{\}\_\`\^\|\\\\';
+my $isnick2	= '0-9\-';
+$mask{nick}	= "[$isnick1]{1}[$isnick1$isnick2]*";
+$mask{nuh}	= '\S*!\S*\@\S*';
 $msgtime	= time();
 $msgsize	= 0;
 $msgcount	= 0;
@@ -70,11 +78,10 @@ $nottime	= 0;
 $notsize	= 0;
 $notcount	= 0;
 ###
+$bot_release	= "1.3.2";
 if ( -d "CVS" ) {
     use POSIX qw(strftime);
-    $bot_release	= strftime("cvs (%Y%m%d)", localtime( (stat("CVS"))[9] ) );
-} else {
-    $bot_release	= "1.0.10 (2001xxxx)";
+    $bot_release	.= strftime(" cvs (%Y%m%d)", gmtime( (stat("CVS"))[9] ) );
 }
 $bot_version	= "blootbot $bot_release -- $^O";
 $noreply	= "NOREPLY";
@@ -83,6 +90,14 @@ $noreply	= "NOREPLY";
 ### misc commands.
 ###
 
+sub whatInterface {
+    if (!&IsParam("Interface") or $param{'Interface'} =~ /IRC/) {
+	return "IRC";
+    } else {
+	return "CLI";
+    }
+}
+
 sub doExit {
     my ($sig)	= @_;
 
@@ -100,7 +115,7 @@ sub doExit {
 	&status("--- Start of quit.");
 	$ident ||= "blootbot";	# lame hack.
 
-	&status("Memory Usage: $memusage kB");
+	&status("Memory Usage: $memusage KiB");
 
 	&closePID();
 	&closeStats();
@@ -112,11 +127,14 @@ sub doExit {
 	}
 	&writeUserFile();
 	&writeChanFile();
-	&uptimeWriteFile()	if (&IsChanConf("uptime"));
-	&News::writeNews()	if (&ChanConfList("news"));
-	&closeDB();
+	&uptimeWriteFile()	if (&IsChanConf('Uptime'));
+	&sqlCloseDB();
 	&closeSHM($shm);
-	&dumpallvars()		if (&IsParam("dumpvarsAtExit"));
+
+	if (&IsParam("dumpvarsAtExit")) {
+	    &loadMyModule('DumpVars');
+	    &dumpallvars();
+	}
 	&symdumpAll()		if (&IsParam("symdumpAtExit"));
 	&closeLog();
 	&closeSQLDebug()	if (&IsParam("SQLDebug"));
@@ -211,7 +229,7 @@ sub IsChanConf {
 	return 0;
     }
 
-    # should we use IsParam() externally where needed or hack it in 
+    # should we use IsParam() externally where needed or hack it in
     # here just in case? fix it later.
     if (&IsParam($param)) {
 	&DEBUG("ICC: found '$param' option in main config file.");
@@ -294,15 +312,15 @@ sub getChanConf {
 	return 0;
     }
 
-    # this looks evil... 
+    # this looks evil...
     if (0 and !defined $chan) {
 	&DEBUG("gCC: ok !chan... doing _default instead.");
     }
 
     $c		||= $chan;
     $c		||= "_default";
-    $c		= "_default" if ($c eq "*");	# fix!
-    my @c	= grep /^$c$/i, keys %chanconf;
+    $c		= "_default" if ($c eq "*");	# FIXME
+    my @c	= grep /^\Q$c\E$/i, keys %chanconf;
 
     if (@c) {
 	if (0 and $c[0] ne $c) {
@@ -322,7 +340,7 @@ sub getChanConfDefault {
 
     if (exists $param{$what}) {
 	if (!exists $cache{config}{$what}) {
-	    &status("conf: backward-compat: found param{$what} ($param{$what}) for $chan instead.");
+	    &status("config ($chan): backward-compatible option: found param{$what} ($param{$what}) instead of chan option");
 	    $cache{config}{$what} = 1;
 	}
 
@@ -332,7 +350,7 @@ sub getChanConfDefault {
     return $val if (defined $val);
 
     $param{$what}	= $default;
-    &status("conf: $chan auto-setting param{$what} = $default");
+    &status("config ($chan): auto-setting param{$what} = $default");
     $cache{config}{$what} = 1;
     return $default;
 }
@@ -395,13 +413,13 @@ sub showProc {
 	if ($delta == 0) {
 	    return;
 	} elsif ($delta > 500) {
-	    $str = "MEM:$prefix increased by $delta kB. (total: $memusage kB)";
+	    $str = "MEM:$prefix increased by $delta KiB. (total: $memusage KiB)";
 	} elsif ($delta > 0) {
-	    $str = "MEM:$prefix increased by $delta kB";
+	    $str = "MEM:$prefix increased by $delta KiB";
 	} else {	# delta < 0.
 	    $delta = -$delta;
 	    # never knew RSS could decrease, probably Size can't?
-	    $str = "MEM:$prefix decreased by $delta kB.";
+	    $str = "MEM:$prefix decreased by $delta KiB.";
 	}
 
 	&status($str);
@@ -427,12 +445,11 @@ sub setup {
 
     $shm = &openSHM();
     &openSQLDebug()	if (&IsParam("SQLDebug"));
-    &openDB($param{'DBName'}, $param{'DBType'}, $param{'SQLUser'},
+    &sqlOpenDB($param{'DBName'}, $param{'DBType'}, $param{'SQLUser'},
 	$param{'SQLPass'});
     &checkTables();
 
     &status("Setup: ". &countKeys("factoids") ." factoids.");
-    &News::readNews() if (&ChanConfList("news"));
     &getChanConfDefault("sendPrivateLimitLines", 3);
     &getChanConfDefault("sendPrivateLimitBytes", 1000);
     &getChanConfDefault("sendPublicLimitLines", 3);
@@ -442,7 +459,7 @@ sub setup {
 
     $param{tempDir} =~ s#\~/#$ENV{HOME}/#;
 
-    &status("Initial memory usage: $memusage kB");
+    &status("Initial memory usage: $memusage KiB");
     &status("-------------------------------------------------------");
 }
 
@@ -478,7 +495,7 @@ sub setupConfig {
 sub startup {
     if (&IsParam("DEBUG")) {
 	&status("enabling debug diagnostics.");
-	### I thought disabling this reduced memory usage by 1000 kB.
+	# I thought disabling this reduced memory usage by 1000 KiB.
 	use diagnostics;
     }
 
@@ -489,19 +506,24 @@ sub startup {
 }
 
 sub shutdown {
+    my ($sig) = @_;
     # reverse order of &setup().
     &status("--- shutdown called.");
 
-    $ident ||=	"blootbot";	# hack.
+    # hack.
+    $ident ||=	"blootbot";
+
+    if (!&isFileUpdated("$bot_state_dir/blootbot.users", $wtime_userfile)) {
+	&writeUserFile()
+    }
 
-    # opened files must be written to on shutdown/hup/whatever
-    # unless they're write-only, like uptime.
-    &writeUserFile();
-    &writeChanFile();
-    &News::writeNews()	if (&ChanConfList("news"));
+    if (!&isFileUpdated("$bot_state_dir/blootbot.chan", $wtime_chanfile)) {
+	&writeChanFile();
+    }
 
-    &closeDB();
-    &closeSHM($shm);	# aswell. TODO: use this in &doExit?
+    &sqlCloseDB();
+    # aswell. TODO: use this in &doExit?
+    &closeSHM($shm);
     &closeLog();
 }
 
@@ -515,7 +537,7 @@ sub restart {
 	my $delta = time() - $msgtime;
 	&DEBUG("restart: dtime = $delta");
 	if (!$conn->connected or time() - $msgtime > 900) {
-	    &status("reconnecting because of uncaught disconnect \@ ".scalar(localtime) );
+	    &status("reconnecting because of uncaught disconnect \@ ".scalar(gmtime) );
 ###	    $irc->start;
 	    &clearIRCVars();
 	    $conn->connect();
@@ -525,7 +547,7 @@ sub restart {
 	&ircCheck();	# heh, evil!
 
 	&DCCBroadcast("-HUP called.","m");
-	&shutdown();
+	&shutdown($sig);
 	&loadConfig($bot_config_dir."/blootbot.config");
 	&reloadAllModules() if (&IsParam("DEBUG"));
 	&setup();