]> git.madduck.net Git - etc/mailfilter.git/commitdiff

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:

factor out sql escaping
authormartin f. krafft <madduck@madduck.net>
Sun, 23 Sep 2007 18:15:04 +0000 (20:15 +0200)
committermartin f. krafft <madduck@madduck.net>
Sun, 23 Sep 2007 18:15:04 +0000 (20:15 +0200)
procmail/msgid-index
procmail/sql-escape [new file with mode: 0644]

index 908fc3d814dfe390dc76009b34562416854715c0..c85b61ae3160cfe1ca9903a1f4c42b6a7e40773b 100644 (file)
@@ -10,17 +10,14 @@ MSGID_INDEX_DB=$PMVAR/msgid-index.sqlite
 
 DO_QUERY="$SQLITE $MSGID_INDEX_DB"
 
 
 DO_QUERY="$SQLITE $MSGID_INDEX_DB"
 
-SQ="'\\''"
-SQE="'\\\''"
-FIELDS="$FROM$NL$ORIGINAL_TO$NL$SUBJECT$NL$MSGID"
+DATA="$FROM,$NL$ORIGINAL_TO,$NL$SUBJECT,$NL$MSGID"
+INCLUDERC=$PMDIR/sql-escape
+
 QUERY="insert into logfiles (sender, recipient, subject, msgid, filename, dest) values (
 QUERY="insert into logfiles (sender, recipient, subject, msgid, filename, dest) values (
-  `echo \"$FIELDS\" | sed -e 's,'\'','$SQE$SQE',g; s/^.*$/'\$SQE'&'\$SQE',/'`
-  $SQ$THISLOGFILE_REL$SQ, '\\'\$DEST\\'')"
+  $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
diff --git a/procmail/sql-escape b/procmail/sql-escape
new file mode 100644 (file)
index 0000000..08d0903
--- /dev/null
@@ -0,0 +1,17 @@
+SQ="'\\''"
+SQE="'\\\''"
+
+:0
+* DATA ?? .
+{ 
+  DATA="`echo \"$DATA\" \
+    | sed -re 's,'\'','$SQE$SQE',g;' \
+          -e  's/^.*$/'\$SQE'&'\$SQE'/' \
+          -e  's/,'$SQE'$/'\$SQE',/'`"
+}
+
+:0 E
+{ LOG="sql-escape:  WARNING: no \$DATA provided!$NL" }
+
+SQE
+SQ