X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/c3d55a5719b81c63c76cd118f47cd56b68a2be9d..55201707fd710acd7a8623d6e7cd3aeb82391c2f:/procmail/defines

diff --git a/procmail/defines b/procmail/defines
index 32a6e8f..569a7df 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -72,6 +72,7 @@ RE_SPACE_NEWLINE="(^|$RE_SPACE)"
 RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+f(\.?|elix))?"
 RE_LASTNAME="kraff?t"
 RE_EXTRACT_HEADER_VALUE="$RE_SPACE*\/$RE_NOT_SPACE.*"
+RE_EMAILADDRESS="${RE_NOT_SPACE}+@${RE_NOT_SPACE}+\.[^ 	>]+"
 
 DEJAVU_HEADER=X-Deja-Vu
 
@@ -121,6 +122,23 @@ INCLUDERC=$PMDIR/get-msgid
 *$ ^From:$RE_EXTRACT_HEADER_VALUE
 { FROM="$MATCH" }
 
+:0
+* FROM ?? ^.+ <\/.+@[^>]+
+{ FROMEMAIL="$MATCH" }
+
+:0 E
+* FROM ?? ^.+ \(\/.+@[^\)]+
+{ FROMEMAIL="$MATCH" }
+
+:0 E
+*$ FROM ?? ^\/$RE_EMAILADDRESS
+{ FROMEMAIL="$MATCH" }
+
+:0
+* FROMEMAIL ?? ^".+"$
+* FROMEMAIL ?? ^"\/[^"]+
+{ FROMEMAIL="$MATCH" }
+
 # if $SENDER is undefined or not an email address, get it from the message
 :0
 * !SENDER ?? @
@@ -130,16 +148,7 @@ INCLUDERC=$PMDIR/get-msgid
   { SENDER="$MATCH" }
 
   :0 E
-  *$ FROM ?? ^\/${RE_NOT_SPACE}+@${RE_NOT_SPACE}+
-  { SENDER="$MATCH" }
-
-  :0 E
-  * FROM ?? ^.+ <\/[^>]+
-  { SENDER="$MATCH" }
-
-  :0 E
-  * FROM ?? ^.+ \(\/[^\)]+
-  { SENDER="$MATCH" }
+  { SENDER="$FROMEMAIL" }
 }
 
 :0