gracefully handle local message without orig-to

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index a0da9d6201484c7c697675615aada98b2265f54e..754ba493adb5817be95a5e595f5f0e7ebba26031 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -133,28 +133,22 @@ INCLUDERC=$PMDIR/get-msgid
 {
   SUBJECT=$MATCH
 
 {
   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
 }
 
 :0
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
 { ORIGINAL_TO="$MATCH" }
 :0 E

+* ^Received:

 { LOG="NO ORIGINAL_TO: $MSGID" }
 
 :0
 { LOG="NO ORIGINAL_TO: $MSGID" }
 
 :0