]> git.madduck.net Git - etc/mailfilter.git/blobdiff - procmail/deliver

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

remove fuzzyocr
[etc/mailfilter.git] / procmail / deliver
index 928d52ce52e851d69081547dd4051d7a2b4b6d09..af2f70c4dd5c5985f13dd3ae284f29fc8a2a97d7 100644 (file)
@@ -1,23 +1,43 @@
-VERBOSE=yes
 :0
 :0
-*$ $DEST
+*$ DEST ?? ^$NULL$
 {
 {
+  LOG="deliver:     sending message $MSGID to $DEST$NL"
+
   :0
   :0
-  * DEST ?? .+[^/]$
-  { DEST="$DEST/" }
+  $NULL
+}
 
 
-  :0 E
-  *$ DEST ?? ^\.
-  { DEST="$BASE/$DEST" }
+:0
+* ! DEST ?? .
+{ DEST=/ }
 
 
-  LOG="deliver:     delivering message $MSGID to $DEST$NL"
-  :0
-  $DEST
+:0
+* DEST ?? .+[^/]$
+{ DEST="$DEST/" }
+
+:0
+*$ DEST ?? ^$BASE/\/.+
+{ DEST="$MATCH" }
+
+:0
+*$ ! DEST ?? ^\.
+{ DEST=".$DEST" }
+
+: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\""
 }
 
 }
 
-: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
   :0
-  $DEFAULT
+  $BASE/$DEST
 }
 }