add mw to undelayed

[etc/mailfilter.git] / procmail / deliver

diff --git a/procmail/deliver b/procmail/deliver
index 4417af67a3ee44a97f39fbce9bd17fc19959cea8..af2f70c4dd5c5985f13dd3ae284f29fc8a2a97d7 100644 (file)
--- 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=/ }
 :0
 * ! DEST ?? .
 { DEST=/ }


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

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

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

-TRAP="$TRAP; echo \"delivered:   \$DESTFILE\" >> '$THISLOGFILE'"
+:0
+* MARK_READ ?? .
+{
+  LOG="deliver:     marking messages $MSGID as read because of $MARK_READ$NL"
+  TRAP="$TRAP; BASENAME=\"\${DESTFILE##*/}:2,S\""
+  TRAP="$TRAP; DIRNAME=\"\${DESTFILE%/new/*}/cur\""
+  TRAP="$TRAP; DESTFILE=\"\$DIRNAME/\$BASENAME\""
+  TRAP="$TRAP; mv \"\$LASTFOLDER\" \"$BASE/\$DESTFILE\""
+}

 
 

-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
+}