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:

improve sender parsing
authormartin f. krafft <madduck@madduck.net>
Mon, 31 Aug 2009 08:42:43 +0000 (10:42 +0200)
committermartin f. krafft <madduck@madduck.net>
Mon, 31 Aug 2009 08:42:43 +0000 (10:42 +0200)
procmail/defines
procmail/logging

index e10d302713d12c8a82eee2dab603ad7bc40aff75..32a6e8f56b7286103009a8ea971dc3ac66ef6500 100644 (file)
@@ -117,20 +117,35 @@ ID="$LOGNAME@$HOSTNAME"
 # message-id
 INCLUDERC=$PMDIR/get-msgid
 
+:0
+*$ ^From:$RE_EXTRACT_HEADER_VALUE
+{ FROM="$MATCH" }
+
 # if $SENDER is undefined or not an email address, get it from the message
 :0
 * !SENDER ?? @
-*$ ^Sender:$RE_EXTRACT_HEADER_VALUE
-{ SENDER="$MATCH" }
+{
+  :0
+  *$ ^Sender:$RE_EXTRACT_HEADER_VALUE
+  { SENDER="$MATCH" }
+
+  :0 E
+  *$ FROM ?? ^\/${RE_NOT_SPACE}+@${RE_NOT_SPACE}+
+  { SENDER="$MATCH" }
+
+  :0 E
+  * FROM ?? ^.+ <\/[^>]+
+  { SENDER="$MATCH" }
+
+  :0 E
+  * FROM ?? ^.+ \(\/[^\)]+
+  { SENDER="$MATCH" }
+}
 
 :0
 *$ ^Date:$RE_EXTRACT_HEADER_VALUE
 { DATE="$MATCH" }
 
-:0
-*$ ^From:$RE_EXTRACT_HEADER_VALUE
-{ FROM="$MATCH" }
-
 :0
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
 {
index 7068e4d3996bbf883ff55f5b905f489e55aac24f..67d77124efb9ec4aad089dfc6709f743c00fcab4 100644 (file)
@@ -37,6 +37,7 @@ LOG="msgid:       $MSGID
 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)
 from:        $FROM
+sender:      $SENDER
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"