X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=perlmail-accept;h=0213a486beab89b2d27d953840baae1b0ec3e8e1;hp=d0909da2f1a5764cd9565fb9a3061fe45d7717fb;hb=0ed964cc851735c16ddf50743087e3f401afb07d;hpb=c23c7da69d6fabcd20481ca42cfe551626bfbcc5

diff --git a/perlmail-accept b/perlmail-accept
index d0909da..0213a48 100755
--- a/perlmail-accept
+++ b/perlmail-accept
@@ -1,6 +1,22 @@
 #! /usr/bin/perl
-#
-# $Id$
+# 
+#	$Id$
+# Copyright (C) 2002-2003 Jan Kratochvil <project-PerlMail@jankratochvil.net>
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 
 use vars qw($VERSION);
 $VERSION=do { my @r=(q$Revision$=~/\d+/g); sprintf "%d.".("%03d"x$#r),@r; };
@@ -27,7 +43,12 @@ INIT {
 	}
 
 
-use PerlMail::Config;
+use File::Basename;
+BEGIN {
+	use lib $ENV{"PERLMAIL_BASEDIR"} || File::Basename::dirname($0);
+	use PerlMail::Config;
+	use PerlMail::Lib;
+	}
 
 use Mail::Audit qw(MAPS);
 require IO::Handle;
@@ -35,7 +56,6 @@ use Carp qw(cluck confess);
 use POSIX qw(WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG WIFSTOPPED WSTOPSIG);
 require POSIX;	# for ceil
 use User::Utmp;
-require File::Basename;
 use Getopt::Long;
 require Mail::Address;
 require MIME::Words;
@@ -532,75 +552,6 @@ my($domain,$full,$timeout)=@_;
 	return Mail::Audit::rblcheck($self_faked,$timeout);
 }
 
-our %muttrc_pending=();
-sub muttrc
-{
-my($muttrc)=@_;
-
-	$muttrc||="$HOME/.muttrc";
-	$muttrc=~s/^\~/$HOME/;
-	do { warn "Looping muttrc, ignoring: $muttrc"; return (); } if $muttrc_pending{$muttrc};
-	local $muttrc_pending{$muttrc}=1;
-	local *MUTTRC;
-	open MUTTRC,$muttrc or do { warn "open \"$muttrc\": $!"; return (); };
-	local $/="\n";
-	local $_;
-	my @r=();
-	# far emulation mutt/init.c/mutt_parse_rc_line()
-	while (<MUTTRC>) {
-		s/^[\s;]*//s;
-		s/[#;].*$//s;
-		s/\s*$//s;
-		next if !/^(\S+)\s*/s;
-		if ($1 eq "source") {
-			$_=$';
-			do { warn "Wrong 'source' parameters at $muttrc:$.: $_"; next; } if !/^\S+$/;
-			push @r,muttrc($_);
-			next;
-			}
-		push @r,$_;
-		}
-	close MUTTRC or warn "close \"$muttrc\": $!";
-	return wantarray() ? @r : join("",map("$_\n",@r));
-}
-
-my %mutteval_charmap=(		# WARNING: Don't use "" or "0" here, see below for "|| warn"!
-		'\\'=>"\\",
-		'r'=>"\r",
-		'n'=>"\n",
-		't'=>"\t",
-		'f'=>"\f",
-		'e'=>"\e",
-		);
-# mutt/init.c/mutt_extract_token()
-sub mutteval
-{
-	local $_=$_[0];
-	return $_ if !s/^"//;
-	do { warn "Missing trailing quote in: $_"; return $_; } if !s/"$//;
-	s/\\(.)/$mutteval_charmap{$1} || warn "Undefined '\\$1' sequence in: $_";/ges;
-	return $_;
-}
-
-sub muttrc_get
-{
-my(@headers)=@_;
-
-	my @r=map({ (ref $_ ? $_ : qr/^\s*set\s+\Q$_\E\s*=\s*(.*?)\s*$/si); } @headers);
-	my %r=map(($_=>undef()),@r);
-	for (muttrc()) {
-		for my $ritem (@r) {
-			/$ritem/si or next;
-			$r{$ritem}=mutteval $1;
-			}
-		}
-	for my $var (grep { !defined($r{$_}) } @r) {
-		warn "Variable '$var' not found in muttrc";
-		return undef();
-		}
-	return wantarray() ? %r : $r{$r[0]};
-}
-
 sub muttrc_aliases
 {
 	my %r=();
@@ -615,20 +566,6 @@ sub muttrc_aliases
 	return %r;
 }
 
-# FIXME: Unify
-# BEGIN perlmail-sendmail
-# return: Mail::Address instance or undef()
-sub parseone
-{
-my($line)=@_;
-
-	return undef() if !defined $line;
-	my @r=Mail::Address->parse($line);
-	warn "Got ".scalar(@r)." addresses while wanting just one; when parsing: $line" if 1!=@r;
-	return $r[0];
-}
-# END perlmail-sendmail
-
 # FIXME: host may get multiple recipients and thus not showing "for <...>"
 # FIXME: muttrc_get("from") is too strict
 sub store_muttrc_alternates
@@ -728,7 +665,6 @@ my($header,$map)=@_;
 
 # MAIN
 
-my $basedir=File::Basename::dirname($0);
 $Getopt::Long::ignorecase=0;
 die "GetOptions error" if !Getopt::Long::GetOptions(
 		  "inetd"    ,sub { $opt_mode=\&inetd; },
@@ -738,21 +674,12 @@ die "GetOptions error" if !Getopt::Long::GetOptions(
 		  "idle!"    ,\$opt_idle,
 		  "idletest" ,sub { syslogging_restore(); print((defined($_=useridle()) ? $_ : "<undef>")."\n"); exit 0; },
 		  "muttrc"   ,sub { syslogging_restore(); print scalar muttrc(); exit 0; },
-		"d|basedir=s",\&basedir,
 		);
 # "Excessive arguments" checked in &inetd
 die "Missing mode" if !$opt_mode;
 
-my $filenameMyAudit="$basedir/My-Audit.pm";
-open AUDIT,$filenameMyAudit or die "open \"$filenameMyAudit\": $!";
-{
-	local $/=undef();
-	eval <AUDIT> or die "eval \"$filenameMyAudit\": $@";
-	audit_init();
-	%alternates_host=map((lc($_)=>1),@alternates_host);
-	%dnsbl_whitelist=map((   $_ =>1),@dnsbl_whitelist);
-	}
-close AUDIT or warn "close \"$filenameMyAudit\": $!";
+%alternates_host=map((lc($_)=>1),@alternates_host);
+%dnsbl_whitelist=map((   $_ =>1),@dnsbl_whitelist);
 
 &$opt_mode();
 die "NOTREACHED";