X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/da55607c50fd58a4652415ae460216bc0e5c3b8e..9ad2d49ba3ef23f08fa59de55fb2dd4a869567c2:/procmail/logging

diff --git a/procmail/logging b/procmail/logging
index b5de200..19cbc4d 100644
--- a/procmail/logging
+++ b/procmail/logging
@@ -5,7 +5,7 @@ MSGIDDIR=$PMVAR/msgid
 :0
 * MSGID ?? ^<\/[^>]+
 {
-  MSGID_NAME=`echo $MATCH | sha224sum | cut -d' ' -f1`
+  MSGID_NAME=`echo -n $MATCH | sha224sum | cut -d' ' -f1`
 
   :0
   * MSGID_NAME ?? ^\/.
@@ -15,19 +15,12 @@ MSGIDDIR=$PMVAR/msgid
   * MSGID_NAME ?? ^.\/.
   { HASH2="$MATCH" }
 
-  THISLOGFILE_REL=${MSGID_NAME}_${OURDATE_SHORT}
+  THISLOGFILE_REL="${HASH1}/${HASH2}/${MSGID_NAME}_${OURDATE_SHORT}"
   LOGDIR="${MSGIDDIR}/${HASH1}/${HASH2}"
-
-  VERBOSE=yes
-
   MKDIR=`test -d $LOGDIR || mkdir -p $LOGDIR`
   MKDIR
-
-  THISLOGFILE="${LOGDIR}/${THISLOGFILE_REL}"
-
-  VERBOSE=no
-
   LOGDIR
+  THISLOGFILE="${MSGIDDIR}/${THISLOGFILE_REL}"
   HASH2
   HASH1
   MSGID_NAME