factor out sql escaping

[etc/mailfilter.git] / procmail / msgid-index

diff --git a/procmail/msgid-index b/procmail/msgid-index
index cef647672f13fc8b720a69d10fffda1d86af0770..c85b61ae3160cfe1ca9903a1f4c42b6a7e40773b 100644 (file)
--- a/procmail/msgid-index
+++ b/procmail/msgid-index
@@ -1,27 +1,23 @@
 # create table logfiles (sender text not null, recipient text not null,
 # subject text not null, msgid text unique not null, filename text primary key
 # create table logfiles (sender text not null, recipient text not null,
 # subject text not null, msgid text unique not null, filename text primary key

-# not null unique, timestamp timestamp with time zone);
+# not null unique, timestamp timestamp with time zone, dest text not null);

 #
 # create trigger insert_logfiles_timestamp after insert on logfiles begin
 # update logfiles set timestamp = datetime('now') where filename
 # = new.filename; end;
 
 #
 # create trigger insert_logfiles_timestamp after insert on logfiles begin
 # update logfiles set timestamp = datetime('now') where filename
 # = new.filename; end;
 

-SQLITE=/usr/bin/sqlite3

 MSGID_INDEX_DB=$PMVAR/msgid-index.sqlite
 
 DO_QUERY="$SQLITE $MSGID_INDEX_DB"
 
 MSGID_INDEX_DB=$PMVAR/msgid-index.sqlite
 
 DO_QUERY="$SQLITE $MSGID_INDEX_DB"
 

-SQ="'\\''"
-SQE="'\\\''"
-FIELDS="$FROM$NL$ORIGINAL_TO$NL$SUBJECT$NL$MSGID"
-QUERY="insert into logfiles (sender, recipient, subject, msgid, filename) values (
-  `echo \"$FIELDS\" | sed -e 's,\\\",\\\\\",g; s,'\'','$SQE$SQE',g; s/^.*$/'\$SQE'&'\$SQE',/'`
-  $SQ$THISLOGFILE_REL$SQ)"
+DATA="$FROM,$NL$ORIGINAL_TO,$NL$SUBJECT,$NL$MSGID"
+INCLUDERC=$PMDIR/sql-escape
+
+QUERY="insert into logfiles (sender, recipient, subject, msgid, filename, dest) values (
+  $DATA, '\\'$THISLOGFILE_REL\\'', '\\'\$DEST\\'')"

 TRAP="$TRAP; $DO_QUERY '$QUERY'"
 
 QUERY
 TRAP="$TRAP; $DO_QUERY '$QUERY'"
 
 QUERY

-FIELDS
-SQE
-SQ
+DATA

 DO_QUERY
 MSGID_INDEX_DB
 DO_QUERY
 MSGID_INDEX_DB