X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/55201707fd710acd7a8623d6e7cd3aeb82391c2f..010aa57a0b1d27dd0a4453a797c428fc3fe29621:/procmail/logging

diff --git a/procmail/logging b/procmail/logging
index 9f1efd0..ac4b8dc 100644
--- a/procmail/logging
+++ b/procmail/logging
@@ -5,11 +5,24 @@ MSGIDDIR=$PMVAR/msgid
 :0
 * MSGID ?? ^<\/[^>]+
 {
-  MSGID_NAME=`echo $MATCH | sha224sum | cut -d' ' -f1`
+  MSGID_NAME=`echo -n $MATCH | sha224sum | cut -d' ' -f1`
 
-  THISLOGFILE_REL=${MSGID_NAME}_${OURDATE_SHORT}
-  THISLOGFILE="${MSGIDDIR}/${THISLOGFILE_REL}"
+  :0
+  * MSGID_NAME ?? ^\/.
+  { HASH1="$MATCH" }
+
+  :0
+  * MSGID_NAME ?? ^.\/.
+  { HASH2="$MATCH" }
 
+  THISLOGFILE_REL="${HASH1}/${HASH2}/${MSGID_NAME}_${OURDATE_SHORT}"
+  LOGDIR="${MSGIDDIR}/${HASH1}/${HASH2}"
+  MKDIR=`test -d $LOGDIR || mkdir -p $LOGDIR`
+  MKDIR
+  LOGDIR
+  THISLOGFILE="${MSGIDDIR}/${THISLOGFILE_REL}"
+  HASH2
+  HASH1
   MSGID_NAME
 }
 
@@ -30,6 +43,10 @@ from:        $FROMEMAIL ($FROM)
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
+:0
+* SUBJECT_ENCODED ?? .
+{ LOG="subject-enc: $SUBJECT_ENCODED$NL" }
+
 TRAP="DESTFILE=\"\${LASTFOLDER#$BASE/}\";
       /usr/bin/lockfile -4 -r50 -l180 $PMVAR/lock;
       trap \"echo >> '$THISLOGFILE';