use RE variables consistently

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

diff --git a/procmail/get-msgid b/procmail/get-msgid
index 3c3bfe3b761d43334728ab297c26c1d093103c03..4a0d251f463e239da42dd4df88f6becac42252e6 100644 (file)
--- a/procmail/get-msgid
+++ b/procmail/get-msgid
@@ -1,34 +1,34 @@
 :0
 :0

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

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

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

 {
   :0
 {
   :0

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

   {
   {

-    LOG="get-msgid:   lacking message-id, using resent-message-id...$NL"
+    LOGLATER="get-msgid:   lacking message-id, using resent-message-id...$NL"

     :0 fw
     :0 fw

-    |$FORMAIL -R Resent-Message-Id Message-Id
+    |$FORMAIL -R Resent-Message-ID Message-ID

   }
 
   :0 E
   {
   }
 
   :0 E
   {

-    LOG="get-msgid:   lacking message-id, generating one...$NL"
+    LOGLATER="get-msgid:   lacking message-id, generating one...$NL"

     :0 fw
     |$FORMAIL -a Message-ID:
   }
 
   :0
     :0 fw
     |$FORMAIL -a Message-ID:
   }
 
   :0

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

   { MSGID="$MATCH" }
 }
 
 :0
 * ! MSGID ?? ^<[^>]+>$
 {
   { MSGID="$MATCH" }
 }
 
 :0
 * ! MSGID ?? ^<[^>]+>$
 {

-  LOG="get-msgid:   message-id '$MSGID' not enclosed in <>, fixing it...$NL"
+  LOGLATER="get-msgid:   message-id '$MSGID' not enclosed in <>, fixing it...$NL"

   MSGID="<$MSGID>"
 }
 
   MSGID="<$MSGID>"
 }
 


@@ -36,7 +36,8 @@
 *$ MSGID ?? .+@$RE_MAILRELAYS>
 *$ !^Return-Path: .+@$RE_MAILRELAYS\>
 *$ !^Received: by $RE_MAILRELAYS \(postfix, from userid
 *$ MSGID ?? .+@$RE_MAILRELAYS>
 *$ !^Return-Path: .+@$RE_MAILRELAYS\>
 *$ !^Received: by $RE_MAILRELAYS \(postfix, from userid

+* MSGID ?? ^<\/[^>]+

 {
 {

-  LOG="get-msgid:   missing message ID added by one of our mail relays$NL"
-  MSGID="${MSGID}.MSGID-ADDED"
+  LOGLATER="get-msgid:   missing message ID added by one of our mail relays$NL"
+  MSGID="<${MATCH}.MSGID-ADDED>"

 }
 }