X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=perlmail-sendmail;h=2177e2ce62738bd3eea7bf2ab6ac811be8750d72;hp=5ea95ab3b8de6d78e2bbb58bdf7db3c54f34bda8;hb=3a6777a05ce93e572245ca0753e288c680d1f2a3;hpb=b6cafe7d7201a41899b65acbf286dbb1fce72501

diff --git a/perlmail-sendmail b/perlmail-sendmail
index 5ea95ab..2177e2c 100755
--- a/perlmail-sendmail
+++ b/perlmail-sendmail
@@ -24,11 +24,12 @@ use strict;
 use warnings;
 
 use File::Basename;
+use File::Spec::Link;
 BEGIN {
-	use lib $ENV{"PERLMAIL_BASEDIR"} || File::Basename::dirname($0);
-	use PerlMail::Config;
-	use PerlMail::Lib;
+	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);
@@ -153,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