fix sql escaping and sqlite error reporting

[etc/mailfilter.git] / procmail / record-delayed-mail

diff --git a/procmail/record-delayed-mail b/procmail/record-delayed-mail
index 72ff6b88d3faa064e4f394b9682fddab0e7c9439..c8256e1ed0d6ce82d33e4137e77e0caf4c02af99 100644 (file)
--- a/procmail/record-delayed-mail
+++ b/procmail/record-delayed-mail
@@ -8,10 +8,9 @@ DO_QUERY="$SQLITE $DELAYED_QUEUE_DB"
 DATA="$MSGID"
 INCLUDERC=$PMDIR/sql-escape
 
 DATA="$MSGID"
 INCLUDERC=$PMDIR/sql-escape
 

-QUERY="insert into messages values ($DATA, '\\'\$DESTFILE\\'', $RELEASE_TS);
-       select * from messages where msgid = $DATA"
-TRAP="$TRAP; case \"$($DO_QUERY '$QUERY')\" in '') 
-      echo 'delay:       failed to insert reference into database';; esac"
+QUERY="insert into messages values ($DATA, '\$DESTFILE', $RELEASE_TS);"
+TRAP="$TRAP; OUT=\"$(echo \"$QUERY\" | $DO_QUERY 2>&1)\";
+      [ -n \"\$OUT\" ] && echo \"delay:       failed register delayed mail in database: \$OUT\""

 
 QUERY
 DATA
 
 QUERY
 DATA