subjects are now decoded

[etc/mailfilter.git] / procmail / deliver

diff --git a/procmail/deliver b/procmail/deliver
index 5a4f355d3a82b8397b851ec5f7c97cbf8fcc60fc..e29942364cfd96404b74c47ebfce0d63b5aeb6be 100644 (file)
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,6 +1,15 @@
+:0
+*$ DEST ?? ^$NULL$
+{
+  LOG="deliver:     sending message $MSGID to $DEST$NL"
+
+  :0
+  $NULL
+}
+

 :0
 * ! DEST ?? .
 :0
 * ! DEST ?? .

-{ DEST="$DEFAULT" }
+{ DEST=/ }

 
 :0
 * DEST ?? .+[^/]$
 
 :0
 * DEST ?? .+[^/]$


@@ -11,16 +20,14 @@
 { DEST="$MATCH" }
 
 :0
 { DEST="$MATCH" }
 
 :0

-*$ DEST ?? ^\.
-{ }
-
-:0 E
+*$ ! DEST ?? ^\.

 { DEST=".$DEST" }
 
 { DEST=".$DEST" }
 

-TRAP="DEST=\"\${LASTFOLDER#$BASE/}\";
-      echo \"delivered:   \$DEST\" >> '$THISLOGFILE';
-      $TRAP"
-
-LOG="deliver:     delivering message $MSGID to $DEST$NL"

 :0
 :0

-$BASE/$DEST
+{
+  LOG="deliver:     delivering message $MSGID to $DEST$NL"
+  TRAP="$TRAP; echo \"delivered:   \$DESTFILE\" >> '$THISLOGFILE'"
+
+  :0
+  $BASE/$DEST
+}