]> git.madduck.net Git - etc/mailfilter.git/blobdiff - procmail/get-msgid

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

fix cron regexp
[etc/mailfilter.git] / procmail / get-msgid
index e61817c4fc2d6731f3f04a9fc7ba4f63e9c3d021..eb5964eac7036b38d7d44180dc131731ba3b47bb 100644 (file)
@@ -1,34 +1,34 @@
 :0
-* ^Message-Id:[        ]*\/[^  ]+
+*$ ^Message-Id:$RE_SPACE*\/$RE_NOT_SPACE+
 { MSGID="$MATCH" }
 
 :0
-* MSGID ?? ^[  ]*$|^<>$
+* MSGID ?? ^$RE_SPACE*$|^<>$
 {
   :0
-  * ^Resent-Message-Id:[       ]*\/[^  ]+
+  * ^Resent-Message-Id:$RE_SPACE*\/$RE_NOT_SPACE+
   {
-    LOG="get-msgid:   lacking message-id, using resent-message-id...$NL"
+    LOGLATER="get-msgid:   lacking message-id, using resent-message-id...$NL"
     :0 fw
-    |$FORMAIL -R Resent-Message-Id Message-Id
+    |$FORMAIL -R Resent-Message-ID Message-ID
   }
 
   :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
-  * ^Message-Id:[      ]*\/[^  ]+
+  * ^Message-Id:$RE_EXTRACT_HEADER_VALUE
   { 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>"
 }
 
@@ -38,6 +38,6 @@
 *$ !^Received: by $RE_MAILRELAYS \(postfix, from userid
 * MSGID ?? ^<\/[^>]+
 {
-  LOG="get-msgid:   missing message ID added by one of our mail relays$NL"
+  LOGLATER="get-msgid:   missing message ID added by one of our mail relays$NL"
   MSGID="<${MATCH}.MSGID-ADDED>"
 }