X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/721bb27ffd590921fc1d111756481161a11fb521..6b23ffe717416a4cf7ae4a11d7ae0a7cd66ef770:/procmail/defines

diff --git a/procmail/defines b/procmail/defines
index ce23e44..754ba49 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -133,28 +133,22 @@ INCLUDERC=$PMDIR/get-msgid
 {
   SUBJECT=$MATCH
 
-#TODO
-#  :0
-#  * SUBJECT ?? ()\?=\?(iso-8859-1|utf-8)\?\/..[^\?]*
-#  {
-#    :0
-#    * MATCH ?? B\?\/[^\?]*
-#    { BBB=`echo $SUBJECT | mimencode -u | cat -v` }
-#
-#    :0
-#    * MATCH ?? Q\?\/[^\?]*
-#    { QQQ=`echo $SUBJECT | mimencode -u -q | cat -v` }
-#
-#    SUBJECT="$QQQ$BBB"
-#  }
-
-SUBJECT="$MATCH"
+  # mimedecode.c: * Disclaimer: We only handle charset of iso-8859-1
+  :0
+  * SUBJECT ?? ^=\?iso-8859-1\?[QB]\?.+\?=$
+  {
+    DECODED="`echo Subject: $SUBJECT | mimedecode | iconv -f latin1 -t utf-8`"
+    :0
+    *$ DECODED ?? ^Subject:$RE_EXTRACT_HEADER_VALUE
+    { SUBJECT=$MATCH }
+  }
 }
 
 :0
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
 { ORIGINAL_TO="$MATCH" }
 :0 E
+* ^Received:
 { LOG="NO ORIGINAL_TO: $MSGID" }
 
 :0
@@ -232,4 +226,4 @@ JUSTME
 
 # DISABLE_DELAYS
 # if set, disables delaying messages
-DISABLE_DELAYS=true
+DISABLE_DELAYS