cleanup and put has dirs into relative logfile name

[etc/mailfilter.git] / procmail / get-msgid

diff --git a/procmail/get-msgid b/procmail/get-msgid
index 61eca10419a0afa18aa5283daf8e4917fa354e37..02b10b150d0fc46fadda71228f0aed2c3b1d668a 100644 (file)
--- a/procmail/get-msgid
+++ b/procmail/get-msgid
@@ -1,12 +1,12 @@
 :0
 :0

-* ^Message-Id:[        ]*\/[^  ]+
+*$ ^Message-Id:$RE_SPACE*\/$RE_NOT_SPACE+

 { MSGID="$MATCH" }
 
 :0
 { MSGID="$MATCH" }
 
 :0

-* MSGID ?? ^[  ]*$|^<>$
+*$ MSGID ?? ^$RE_SPACE*$|^<>$

 {
   :0
 {
   :0

-  * ^Resent-Message-Id:[       ]*\/[^  ]+
+  *$ ^Resent-Message-Id:$RE_SPACE*\/$RE_NOT_SPACE+

   {
     LOGLATER="get-msgid:   lacking message-id, using resent-message-id...$NL"
     :0 fw
   {
     LOGLATER="get-msgid:   lacking message-id, using resent-message-id...$NL"
     :0 fw


@@ -21,7 +21,7 @@
   }
 
   :0
   }
 
   :0

-  * ^Message-Id:[      ]*\/[^  ]+
+  *$ ^Message-Id:$RE_EXTRACT_HEADER_VALUE

   { MSGID="$MATCH" }
 }
 
   { MSGID="$MATCH" }
 }