X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/89f701e747fdcb7fbbf09e1ad3c4a904d021db33..a8f2c04936c3cc265b67f8098934e067fa113701:/procmail/deliver

diff --git a/procmail/deliver b/procmail/deliver
index 168ccdf..e299423 100644
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,3 +1,12 @@
+:0
+*$ DEST ?? ^$NULL$
+{
+  LOG="deliver:     sending message $MSGID to $DEST$NL"
+
+  :0
+  $NULL
+}
+
 :0
 * ! DEST ?? .
 { DEST=/ }
@@ -11,16 +20,14 @@
 { DEST="$MATCH" }
 
 :0
-*$ DEST ?? ^\.
-{ }
-
-:0 E
+*$ ! DEST ?? ^\.
 { DEST=".$DEST" }
 
-TRAP="DEST=\"\${LASTFOLDER#$BASE/}\";
-      echo \"delivered:   \$DEST\" >> '$THISLOGFILE';
-      $TRAP"
-
-LOG="deliver:     delivering message $MSGID to $DEST$NL"
 :0
-$BASE/$DEST
+{
+  LOG="deliver:     delivering message $MSGID to $DEST$NL"
+  TRAP="$TRAP; echo \"delivered:   \$DESTFILE\" >> '$THISLOGFILE'"
+
+  :0
+  $BASE/$DEST
+}