do not insist on spaces in from emails

[etc/mailfilter.git] / procmail / logging

diff --git a/procmail/logging b/procmail/logging
index 9f1efd0ee530fafbf6d19d6fe0322c10b8d105c9..19cbc4da0a190752fef39ffbe8a9c6b908173702 100644 (file)
--- a/procmail/logging
+++ b/procmail/logging
@@ -5,11 +5,24 @@ MSGIDDIR=$PMVAR/msgid
 :0
 * 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
 }
 
   MSGID_NAME
 }