X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/097c75254f91531513cd2c9a43749e46b8d27e11..8d85c8e0dac8fc73e7e15d811fa6b1db8eed79b0:/procmail/deliver

diff --git a/procmail/deliver b/procmail/deliver
index c3188ff..e299423 100644
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,30 +1,33 @@
 :0
-* DEST ?? .
+*$ DEST ?? ^$NULL$
 {
-  :0
-  * DEST ?? .+[^/]$
-  { DEST="$DEST/" }
+  LOG="deliver:     sending message $MSGID to $DEST$NL"
 
   :0
-  *$ DEST ?? ^$BASE/\/.+
-  { DEST="$MATCH" }
+  $NULL
+}
 
-  :0
-  *$ DEST ?? ^\.
-  { }
+:0
+* ! DEST ?? .
+{ DEST=/ }
 
-  :0 E
-  { DEST=".$DEST" }
+:0
+* DEST ?? .+[^/]$
+{ DEST="$DEST/" }
 
-  LOG="deliver:     delivering message $MSGID to $DEST$NL"
-  DEST="$BASE/$DEST"
-  :0
-  $DEST
-}
+:0
+*$ DEST ?? ^$BASE/\/.+
+{ DEST="$MATCH" }
+
+:0
+*$ ! DEST ?? ^\.
+{ DEST=".$DEST" }
 
-:0 E
+: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
-  $DEFAULT
+  $BASE/$DEST
 }