X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/4f7fed650f35de2eada637d565f5e7d1c611d8c5..122f13badd406cf378fb4f57197d27ddebb4d15b:/procmail/logging

diff --git a/procmail/logging b/procmail/logging
index 1fc2c7d..d6fc083 100644
--- a/procmail/logging
+++ b/procmail/logging
@@ -5,15 +5,20 @@ MSGIDDIR=$PMVAR/msgid
 :0
 * MSGID ?? ^<\/[^>]+
 {
-  THISLOGFILE_REL=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*' '__+'`%$OURDATE_SHORT
+  THISLOGFILE_REL=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*$' '__+S'`%$OURDATE_SHORT
   THISLOGFILE="$MSGIDDIR/$THISLOGFILE_REL"
 }
 
 MASTERLOGFILE="$LOGFILE"
 LOGFILE="$THISLOGFILE"
 
-LOG="==============================================================================
-msgid:       $MSGID
+LOG="==============================================================================$NL"
+
+:0
+* LOGLATER ?? .
+{ LOG="$LOGLATER" }
+
+LOG="msgid:       $MSGID
 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)
 from:        $FROM
@@ -21,7 +26,7 @@ original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
 TRAP="DESTFILE=\"\${LASTFOLDER#$BASE/}\";
-      /usr/bin/lockfile -4 -r5 -l180 $PMVAR/lock;
+      /usr/bin/lockfile -4 -r50 -l180 $PMVAR/lock;
       trap \"echo >> '$THISLOGFILE';
              /bin/cat '$THISLOGFILE' >> $MASTERLOGFILE;
              /bin/rm -f $PMVAR/lock\" 0"