X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=perlmail-accept;h=ae9da06e2c76550b621adc8dbb3036dc46946f63;hp=30e7833254fcf66aef09b191937c0445db69a28a;hb=cf13558ac1b01fd521a7bb727cd8ab3acecb1211;hpb=9d03569bd26dfb0f54f21063445fc9d28ed1c4d3

diff --git a/perlmail-accept b/perlmail-accept
index 30e7833..ae9da06 100755
--- a/perlmail-accept
+++ b/perlmail-accept
@@ -31,6 +31,7 @@ use File::Basename;
 BEGIN {
 	use lib $ENV{"PERLMAIL_BASEDIR"} || File::Basename::dirname($0);
 	use PerlMail::Config;
+	use PerlMail::Lib;
 	}
 
 use Mail::Audit qw(MAPS);
@@ -535,75 +536,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=();
@@ -618,20 +550,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