X-Git-Url: https://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=perlmail-sendmail;h=2177e2ce62738bd3eea7bf2ab6ac811be8750d72;hp=366f830db8c788be3d7e9d4f90cf33500e125e57;hb=0c848de6fd9c35f1ec9640b3adbab036ce0a5a91;hpb=c23c7da69d6fabcd20481ca42cfe551626bfbcc5

diff --git a/perlmail-sendmail b/perlmail-sendmail
index 366f830..2177e2c 100755
--- a/perlmail-sendmail
+++ b/perlmail-sendmail
@@ -1,93 +1,40 @@
 #! /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; };
 use strict;
 use warnings;
 
+use File::Basename;
+use File::Spec::Link;
+BEGIN {
+	eval 'use lib $ENV{"PERLMAIL_BASEDIR"} || File::Basename::dirname(File::Spec::Link->resolve($0));';
+	}
 use PerlMail::Config;
+use PerlMail::Lib;
 
 require Getopt::Long;
 use POSIX qw(WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG WIFSTOPPED WSTOPSIG);
 require MIME::Head;	# inherits Mail::Header
 require Mail::Address;
-require File::Basename;
-require Mail::Alias;
-
-
-# FIXME: modularized unification with 'perlmail-accept'
-# BEGIN perlmail-accept
-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]};
-}
-# END perlmail-accept
 
 
 sub sendmail_show { return "\"$sendmail_orig\" ".join(",",map("\"$_\"",@ARGV)); }
@@ -113,8 +60,7 @@ my $opt_b;
 my $opt_Q;
 my $opt_q;
 my $opt_t;
-our $opt_f;
-our $opt_F;	# from PerlMail::Config;
+our $opt_f;	# not exported, just for local()
 my $opt_perlmail_dry_run;
 my @ARGV_save=@ARGV;	# for non-bm mode
 die if !Getopt::Long::GetOptions(
@@ -159,17 +105,6 @@ if ($opt_t) {
 		}
 	}
 
-# 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];
-}
-
 sub matches
 {
 	return 
@@ -191,7 +126,6 @@ my $from_headername;
 	}
 
 # to be utilized later by &FromAddress
-our $is_pgp;	# from PerlMail::Config;
 $is_pgp=(1
 		&& do { local $_=$head->mime_attr("Content-Type");          $_ && ~m#^multipart/(?:signed|encrypted)$#; }
 		&& do { local $_=$head->mime_attr("Content-Type.protocol"); $_ && ~m#^application/pgp\b#; }
@@ -220,7 +154,11 @@ for my $rcpt (@rcpts) {
 	if (defined $rcpt) {	# !defined($rcpt) if we have no recipients
 		local $_;
 		$opt_f=FromAddress($rcpt,1)->address() if !defined $opt_f;
-		$head->replace($from_headername,FromAddress($rcpt,0)->format()) if $from_headername;
+		if ($from_headername) {
+			if (my $fromaddr=FromAddress($rcpt,0)->format()) {
+				$head->replace($from_headername,$fromaddr);
+				}
+			}
 		}
 
 	1;	# drop '-bm' if present as it is default anyway