X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/0fdd7e71c2d05b84db19a30df8cf5d5ca1412ca4..33cfd5887ea8d05241b5b4749abbf7fdfadb51fe:/keydb_pg.c?ds=sidebyside

diff --git a/keydb_pg.c b/keydb_pg.c
index 85ea500..8e0543b 100644
--- a/keydb_pg.c
+++ b/keydb_pg.c
@@ -1,9 +1,20 @@
 /*
  * keydb_pg.c - Routines to store and fetch keys in a PostGres database.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002-2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <postgresql/libpq-fe.h>
@@ -36,7 +47,7 @@ static PGconn *dbconn = NULL;
 /**
  *	keydb_fetchchar - Fetches a char from a file.
  */
-static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
+static int keydb_fetchchar(void *fd, size_t count, void *c)
 {
 	return (!lo_read(dbconn, *(int *) fd, (char *) c, count));
 }
@@ -44,7 +55,7 @@ static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
 /**
  *	keydb_putchar - Puts a char to a file.
  */
-static int keydb_putchar(void *fd, size_t count, unsigned char *c)
+static int keydb_putchar(void *fd, size_t count, void *c)
 {
 	return !(lo_write(dbconn, *(int *) fd, (char *) c, count));
 }
@@ -150,12 +161,13 @@ static int pg_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 	
 	if (keyid > 0xFFFFFFFF) {
 		snprintf(statement, 1023,
-			"SELECT keydata FROM onak_keys WHERE keyid = '%llX'",
+			"SELECT keydata FROM onak_keys WHERE keyid = '%"
+			PRIX64 "'",
 			keyid);
 	} else {
 		snprintf(statement, 1023,
 			"SELECT keydata FROM onak_keys WHERE keyid "
-			"LIKE '%%%llX'",
+			"LIKE '%%%" PRIX64 "'",
 			keyid);
 	}
 	result = PQexec(dbconn, statement);
@@ -282,7 +294,8 @@ static int pg_delete_key(uint64_t keyid, bool intrans)
 	}
 	
 	snprintf(statement, 1023,
-			"SELECT keydata FROM onak_keys WHERE keyid = '%llX'",
+			"SELECT keydata FROM onak_keys WHERE keyid = '%"
+			PRIX64 "'",
 			keyid);
 	result = PQexec(dbconn, statement);
 
@@ -298,24 +311,25 @@ static int pg_delete_key(uint64_t keyid, bool intrans)
 		PQclear(result);
 
 		snprintf(statement, 1023,
-			"DELETE FROM onak_keys WHERE keyid = '%llX'",
+			"DELETE FROM onak_keys WHERE keyid = '%" PRIX64 "'",
 			keyid);
 		result = PQexec(dbconn, statement);
 		PQclear(result);
 
 		snprintf(statement, 1023,
-			"DELETE FROM onak_sigs WHERE signee = '%llX'",
+			"DELETE FROM onak_sigs WHERE signee = '%" PRIX64 "'",
 			keyid);
 		result = PQexec(dbconn, statement);
 		PQclear(result);
 
 		snprintf(statement, 1023,
-			"DELETE FROM onak_uids WHERE keyid = '%llX'",
+			"DELETE FROM onak_uids WHERE keyid = '%" PRIX64 "'",
 			keyid);
 		result = PQexec(dbconn, statement);
 	} else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
 		logthing(LOGTHING_ERROR,
-				"Problem retrieving key (%llX) from DB.",
+				"Problem retrieving key (%" PRIX64
+				") from DB.",
 				keyid);
 	}
 
@@ -391,7 +405,7 @@ static int pg_store_key(struct openpgp_publickey *publickey, bool intrans,
 
 	snprintf(statement, 1023, 
 			"INSERT INTO onak_keys (keyid, keydata) VALUES "
-			"('%llX', '%d')", 
+			"('%" PRIX64 "', '%d')", 
 			get_keyid(publickey),
 			key_oid);
 	result = PQexec(dbconn, statement);
@@ -414,7 +428,7 @@ static int pg_store_key(struct openpgp_publickey *publickey, bool intrans,
 				snprintf(statement, 1023,
 					"INSERT INTO onak_uids "
 					"(keyid, uid, pri) "
-					"VALUES	('%llX', '%s', '%c')",
+					"VALUES	('%" PRIX64 "', '%s', '%c')",
 					get_keyid(publickey),
 					safeuid,
 					(uids[i] == primary) ? 't' : 'f');
@@ -448,7 +462,7 @@ static int pg_store_key(struct openpgp_publickey *publickey, bool intrans,
 				packets = packets->next) {
 			snprintf(statement, 1023,
 				"INSERT INTO onak_sigs (signer, signee) "
-				"VALUES	('%llX', '%llX')",
+				"VALUES ('%" PRIX64 "', '%" PRIX64 "')",
 				sig_keyid(packets->packet),
 				get_keyid(publickey));
 			result = PQexec(dbconn, statement);
@@ -475,7 +489,8 @@ static char *pg_keyid2uid(uint64_t keyid)
 	char *uid = NULL;
 
 	snprintf(statement, 1023,
-		"SELECT uid FROM onak_uids WHERE keyid = '%llX' AND pri = 't'",
+		"SELECT uid FROM onak_uids WHERE keyid = '%" PRIX64
+		"' AND pri = 't'",
 		keyid);
 	result = PQexec(dbconn, statement);
 
@@ -491,7 +506,8 @@ static char *pg_keyid2uid(uint64_t keyid)
 		uid = strdup(PQgetvalue(result, 0, 0));
 	} else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
 		logthing(LOGTHING_ERROR,
-				"Problem retrieving key (%llX) from DB.",
+				"Problem retrieving key (%" PRIX64
+				") from DB.",
 				keyid);
 	}
 
@@ -525,7 +541,8 @@ static struct ll *pg_getkeysigs(uint64_t keyid, bool *revoked)
 	}
 
 	snprintf(statement, 1023,
-		"SELECT DISTINCT signer FROM onak_sigs WHERE signee = '%llX'",
+		"SELECT DISTINCT signer FROM onak_sigs WHERE signee = '%"
+		PRIX64 "'",
 		keyid);
 	result = PQexec(dbconn, statement);
 
@@ -587,7 +604,6 @@ static int pg_iterate_keys(void (*iterfunc)(void *ctx,
 	struct openpgp_publickey *key = NULL;
 	PGresult *result = NULL;
 	char *oids = NULL;
-	char statement[1024];
 	int fd = -1;
 	int i = 0;
 	int numkeys = 0;