X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=perlmail-accept;h=08f6a2bc3ccb236ee02a24700e91fe5fcb907603;hp=192ffce52589d340bf285a20a0c036fbd877b8f6;hb=6b0b3e175ec251e22d66460bd9f004f8cf6e5564;hpb=dbd2c430a60390525dc17a0083867a006763c50f

diff --git a/perlmail-accept b/perlmail-accept
index 192ffce..08f6a2b 100755
--- a/perlmail-accept
+++ b/perlmail-accept
@@ -10,7 +10,7 @@ use warnings;
 
 INIT {
 	require Sys::Syslog;
-	Sys::Syslog::openlog("lacemail","pid","mail");
+	Sys::Syslog::openlog("perlmail","pid","mail");
 	my @syslogging_stack;
 	sub syslogging_on_save
 	{
@@ -100,7 +100,7 @@ sub stdin
 	exit 0;
 }
 
-# FIXME: separate 'lacemail'-transfer together with lacemail-submit away
+# FIXME: separate 'perlmail'-transfer together with perlmail-submit away
 sub inetd
 {
 	die "Excessive arguments" if @ARGV;
@@ -407,7 +407,7 @@ my($folder,$profile,%args)=@_;
 	push @AuditStored,$folder if $do{"did"};
 	return if $store_ignore || $opt_dry;
 	$DoBell++ if $do{"bell"};
-	write_message($folder);
+	write_message($folder) or die;
 	smssend_tryall $store_ignorenewmail,$do{"sms"},%args if $do{"sms"};
 }
 
@@ -458,12 +458,12 @@ my($message)=@_;
 	local $Audit=Mail::Audit->new(
 			"emergency"=>"$Mail/emergency",
 			"data"=>[map("$_\n",split("\n",$message))],
-			"log"=>"$HOME/.lacemail.log",
+			"log"=>"$HOME/.perlmail.log",
 			"loglevel"=>99,
 			);
 	local @AuditStored=();
 	do { smssend 0,$opt_smstest; return; } if $opt_smstest;
-	write_message("$Mail/input");
+	write_message("$Mail/input") or die;
 	audit();
 	warn 'Corrupted $_, repaired' if defined($save_)!=defined($_) || (defined($_) && $save_ ne $_);
 }
@@ -481,7 +481,7 @@ sub razor2
 	open CHILD,'|'
 					.'('.'(razor-check 2>&1;echo >&3 $?)'
 							.'|sed "s/^/razor-check: /"'
-							.'|logger -t "lacemail['.$$.']" -p mail.crit'
+							.'|logger -t "perlmail['.$$.']" -p mail.crit'
 							.') 3>&1'
 					.'|exit `cat`'
 			or return 0;
@@ -624,7 +624,7 @@ sub muttrc_aliases
 }
 
 # FIXME: Unify
-# BEGIN lacemail-sendmail
+# BEGIN perlmail-sendmail
 # return: Mail::Address instance or undef()
 sub parseone
 {
@@ -635,7 +635,7 @@ my($line)=@_;
 	warn "Got ".scalar(@r)." addresses while wanting just one; when parsing: $line" if 1!=@r;
 	return $r[0];
 }
-# END lacemail-sendmail
+# END perlmail-sendmail
 
 # FIXME: host may get multiple recipients and thus not showing "for <...>"
 # FIXME: muttrc_get("from") is too strict
@@ -729,7 +729,7 @@ my($header,$map)=@_;
 		$text=~s/\b\Q$from\E\b/$to/gsi;
 		}
 	return if $text eq $orig;
-	$Audit->put_header("X-LaceMail-header_remap-$header",$orig);
+	$Audit->put_header("X-PerlMail-header_remap-$header",$orig);
 	$Audit->replace_header($header,$text);
 }