improve fromemail parsing

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index 218ba89d7830c87688c5624503c99ecbed15b3b2..569a7df7d3523c73eabf4db3cfa5be887929af4c 100644 (file)
--- 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
 
@@ -122,15 +123,20 @@ INCLUDERC=$PMDIR/get-msgid
 { FROM="$MATCH" }
 
 :0
-*$ FROM ?? ^\/${RE_NOT_SPACE}+@${RE_NOT_SPACE}+
+* FROM ?? ^.+ <\/.+@[^>]+
 { FROMEMAIL="$MATCH" }
 
 :0 E
-* FROM ?? ^.+ <\/[^>]+
+* FROM ?? ^.+ \(\/.+@[^\)]+
 { FROMEMAIL="$MATCH" }
 
 :0 E
-* FROM ?? ^.+ \(\/[^\)]+
+*$ FROM ?? ^\/$RE_EMAILADDRESS
+{ FROMEMAIL="$MATCH" }
+
+:0
+* FROMEMAIL ?? ^".+"$
+* FROMEMAIL ?? ^"\/[^"]+
 { FROMEMAIL="$MATCH" }
 
 # if $SENDER is undefined or not an email address, get it from the message