fix regexp to avoid extracting sfid with msgid

[etc/mailfilter.git] / procmail / deliver

diff --git a/procmail/deliver b/procmail/deliver
index 7a7b9a9a5e29736cd63f7c97aec0e68fa34973c3..ca6bef4477ee9da82034e8cc113e8ddbbb7c7e9e 100644 (file)
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,14 +1,27 @@
 :0
 :0

-*$ $DEST
-{
-  LOG="deliver:     delivering message $MSGID to $DEST$NL"
-  :0
-  $DEST
-}
+* ! DEST ?? .
+{ DEST=/ }
+
+:0
+* DEST ?? .+[^/]$
+{ DEST="$DEST/" }
+
+:0
+*$ DEST ?? ^$BASE/\/.+
+{ DEST="$MATCH" }
+
+:0
+*$ DEST ?? ^\.
+{ }

 
 :0 E
 
 :0 E

+{ DEST=".$DEST" }
+
+:0

 {
 {

-  LOG="deliver:     delivering message $MSGID to default destination$NL"
+  LOG="deliver:     delivering message $MSGID to $DEST$NL"
+  TRAP="$TRAP; echo \"delivered:   \$DESTFILE\" >> '$THISLOGFILE'"
+

   :0
   :0

-  $DEFAULT
+  $BASE/$DEST

 }
 }