improve sender parsing

[etc/mailfilter.git] / procmail / logging

diff --git a/procmail/logging b/procmail/logging
index 38b901a9edf013fd4beb674d82ce92644ce8c2cd..67d77124efb9ec4aad089dfc6709f743c00fcab4 100644 (file)
--- a/procmail/logging
+++ b/procmail/logging
@@ -5,22 +5,46 @@ MSGIDDIR=$PMVAR/msgid
 :0
 * MSGID ?? ^<\/[^>]+
 {
-  THISLOGFILE_REL=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*' '__+'`%$OURDATE_SHORT
+  MSGID_NAME=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*$' '__+S'`
+
+  #VERBOSE=yes
+  # check if filename > 228 characters and if so, then shorten it to prevent
+  # hitting filesystem limit after we append the timestamp
+  :0
+  * MSGID_NAME ?? ^.....................................................................................................................................................................................................................................
+  {
+    HASH=`echo $MSGID_NAME | md5sum | cut -d' ' -f1`
+    MSGID_NAME=`echo $MSGID_NAME | cut -c-196`$HASH
+  }
+
+  THISLOGFILE_REL=$MSGID_NAME%$OURDATE_SHORT
   THISLOGFILE="$MSGIDDIR/$THISLOGFILE_REL"
+
+  MSGID_NAME
+  #VERBOSE=no
 }
 
 MASTERLOGFILE="$LOGFILE"
 LOGFILE="$THISLOGFILE"
 
-LOG="==============================================================================
-msgid:       $MSGID
+LOG="==============================================================================$NL"
+
+:0
+* LOGLATER ?? .
+{ LOG="$LOGLATER" }
+
+LOG="msgid:       $MSGID
 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)
 from:        $FROM
+sender:      $SENDER
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
-TRAP="echo >> '$THISLOGFILE';
-      egrep -v '^XX(procmail:)?[[:space:]\"]' '$THISLOGFILE' >> $MASTERLOGFILE"
+TRAP="DESTFILE=\"\${LASTFOLDER#$BASE/}\";
+      /usr/bin/lockfile -4 -r50 -l180 $PMVAR/lock;
+      trap \"echo >> '$THISLOGFILE';
+             /bin/cat '$THISLOGFILE' >> $MASTERLOGFILE;
+             /bin/rm -f $PMVAR/lock\" 0"
 
-#VERBOSE=yes
+THISLOGFILE_REL