X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/55201707fd710acd7a8623d6e7cd3aeb82391c2f..e3adb4786be577e6de20f62205bf1dbab8004f3a:/procmail/logging diff --git a/procmail/logging b/procmail/logging index 9f1efd0..19cbc4d 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 }