--- a/exigrey.pl	Tue Jan 02 16:59:20 2007 +0000
+++ b/exigrey.pl	Tue Jan 02 19:50:02 2007 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! @PERL@
 # © 2006,2007 Heiko Schlittermann <hs@schlittermann.de>
 # Quick and dirty. Absolutly no warranty. Not even for spelling ;-)
 # $Id$
@@ -25,7 +25,9 @@
 use FindBin qw/$Bin/;
 use POSIX qw/strftime mktime/;
 
-do "@LIBDIR@/exigrey.pl" or die;
+do "@LIBDIR@/exigrey.pl" 
+    or do "./exim-exigrey.pl" or die $!;
+
 my %DEFAULT = getDefault();
    $DEFAULT{days} = 7;
 
@@ -35,7 +37,6 @@
 my $opt_clean;
 
 sub iterate(\%$);
-sub connectDB(\%$);
 
 MAIN: {
 
@@ -54,7 +55,7 @@
 
     if ($opt_list) {
 	my %h;
-	connectDB(%h, shift || $DEFAULT{db});
+	connectDB(\%h, shift || $DEFAULT{db});
 	iterate(%h, sub {
 	    my ($item, $v0, $v1, $dv) = @_;
 	    printf "%-16s:\t$v0 $v1 (%3ds %s %s)\n", 
@@ -67,7 +68,7 @@
 
     if ($opt_stats) {
 	my %h;
-	my $db = connectDB(%h, shift || $DEFAULT{db});
+	my $db = connectDB(\%h, shift || $DEFAULT{db});
 
 	my ($seen, $returned, $oldest);
 	$oldest = time();
@@ -102,7 +103,7 @@
 	my $cut = time() - ($days * 86400);
 	my $tmp = tmpfile();
 
-	$db = connectDB(%h, $db);
+	$db = connectDB(\%h, $db);
 	iterate(%h, sub {
 	    my ($item, $v0, $v1, $dv) = @_;
 	    print $tmp $item if $v1 <= $cut;
@@ -130,11 +131,5 @@
     }
 }
 
-sub connectDB(\%$) {
-    my ($h, $db) = @_;
-    $db = getDBDir() ."/$db" unless $db =~ /^\//;
-    tie %$h, "BerkeleyDB::Hash", -Filename => $db or die;
-    return $db;
-}
 
 # vim:ft=perl aw sts=4 sw=4: