X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Futils%2Fdbi.c;h=73fc6b77a4e2582b431ac109a1e9147f66535360;hp=1de2f1abe678b74dae092b4b51b40a888b68ceb0;hb=56b97a180a53aecbfe9f7162b8ece3faae973cf9;hpb=43d4ef45a3f0ef8c04f9fb9426be8ee2cf25f68a

diff --git a/src/utils/dbi.c b/src/utils/dbi.c
index 1de2f1a..73fc6b7 100644
--- a/src/utils/dbi.c
+++ b/src/utils/dbi.c
@@ -25,6 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#	include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "utils/dbi.h"
 #include "utils/error.h"
 
@@ -37,6 +41,62 @@
 #include <stdlib.h>
 #include <string.h>
 
+/*
+ * pre 0.9 DBI compat layer
+ */
+
+#if LIBDBI_VERSION < 900
+#include <pthread.h>
+
+typedef void *dbi_inst;
+
+static pthread_mutex_t dbi_lock = PTHREAD_MUTEX_INITIALIZER;
+static int dbi_initialized = 0;
+
+static int
+initialize_r(const char *driverdir, dbi_inst __attribute__((unused)) *pInst)
+{
+	int status = 0;
+	pthread_mutex_lock(&dbi_lock);
+	if (! dbi_initialized)
+		status = dbi_initialize(driverdir);
+	dbi_initialized = 1;
+	pthread_mutex_unlock(&dbi_lock);
+	return status;
+} /* initialize_r */
+
+static dbi_driver
+driver_open_r(const char *name, dbi_inst __attribute__((unused)) Inst)
+{
+	dbi_driver driver;
+	pthread_mutex_lock(&dbi_lock);
+	driver = dbi_driver_open(name);
+	pthread_mutex_unlock(&dbi_lock);
+	return driver;
+} /* driver_open_r */
+
+static dbi_driver
+driver_list_r(dbi_driver Current, dbi_inst __attribute__((unused)) Inst)
+{
+	dbi_driver driver;
+	pthread_mutex_lock(&dbi_lock);
+	driver = dbi_driver_list(Current);
+	pthread_mutex_unlock(&dbi_lock);
+	return driver;
+} /* driver_list_r */
+
+static void
+shutdown_r(dbi_inst __attribute__((unused)) Inst)
+{
+	/* do nothing; we don't know if DBI is still in use */
+} /* shutdown_r */
+
+#define dbi_initialize_r initialize_r
+#define dbi_driver_open_r driver_open_r
+#define dbi_driver_list_r driver_list_r
+#define dbi_shutdown_r shutdown_r
+#endif /* LIBDBI_VERSION < 900 */
+
 /*
  * private data types
  */
@@ -56,6 +116,7 @@ struct sdb_dbi_client {
 	char *database;
 
 	dbi_conn conn;
+	dbi_inst inst;
 
 	sdb_dbi_options_t *options;
 };
@@ -84,7 +145,7 @@ sdb_dbi_get_field(dbi_result res, unsigned int i,
 			data->data.decimal = dbi_result_get_double_idx(res, i);
 			break;
 		case SDB_TYPE_STRING:
-			data->data.string = dbi_result_get_string_idx(res, i);
+			data->data.string = dbi_result_get_string_copy_idx(res, i);
 			break;
 		case SDB_TYPE_DATETIME:
 			{
@@ -96,7 +157,7 @@ sdb_dbi_get_field(dbi_result res, unsigned int i,
 		case SDB_TYPE_BINARY:
 			{
 				size_t length = dbi_result_get_field_length_idx(res, i);
-				const unsigned char *datum = dbi_result_get_binary_idx(res, i);
+				unsigned char *datum = dbi_result_get_binary_copy_idx(res, i);
 				data->data.binary.length = length;
 				data->data.binary.datum = datum;
 			}
@@ -133,7 +194,7 @@ sdb_dbi_get_data(sdb_dbi_client_t *client, dbi_result res,
 					sdb_dbi_strerror(client->conn));
 			return -1;
 		}
-		types[i] = DBI_TYPE_TO_SC(types[i]);
+		types[i] = DBI_TYPE_TO_SDB(types[i]);
 	}
 
 	num_rows = dbi_result_get_numrows(res);
@@ -141,6 +202,8 @@ sdb_dbi_get_data(sdb_dbi_client_t *client, dbi_result res,
 		return -1;
 
 	for (n = 0; n < num_rows; ++n) {
+		int status;
+
 		if (! dbi_result_seek_row(res, n + 1)) {
 			sdb_log(SDB_LOG_ERR, "dbi: Failed to retrieve row %llu: %s",
 					n, sdb_dbi_strerror(client->conn));
@@ -152,7 +215,11 @@ sdb_dbi_get_data(sdb_dbi_client_t *client, dbi_result res,
 						types[i], &data[i]))
 				continue;
 
-		if (callback(client, num_fields, data, user_data))
+		status = callback(client, num_fields, data, user_data);
+		for (i = 0; i < num_fields; ++i)
+			sdb_data_free_datum(&data[i]);
+
+		if (status)
 			continue;
 
 		++success;
@@ -253,6 +320,11 @@ sdb_dbi_client_create(const char *driver, const char *database)
 	client->conn = NULL;
 	client->options = NULL;
 
+	if (dbi_initialize_r(/* driverdir = */ NULL, &client->inst) < 0) {
+		free(client);
+		return NULL;
+	}
+
 	client->driver = strdup(driver);
 	client->database = strdup(database);
 	if ((! client->driver) || (! client->database)) {
@@ -289,15 +361,15 @@ sdb_dbi_client_connect(sdb_dbi_client_t *client)
 		client->conn = NULL;
 	}
 
-	driver = dbi_driver_open(client->driver);
+	driver = dbi_driver_open_r(client->driver, client->inst);
 	if (! driver) {
 		sdb_error_set("dbi: failed to open DBI driver '%s'; "
 				"possibly it's not installed.\n",
 				client->driver);
 
 		sdb_error_append("dbi: known drivers:\n");
-		for (driver = dbi_driver_list(NULL); driver;
-				driver = dbi_driver_list(driver)) {
+		for (driver = dbi_driver_list_r(NULL, client->inst); driver;
+				driver = dbi_driver_list_r(driver, client->inst)) {
 			sdb_error_append("\t- %s\n", dbi_driver_get_name(driver));
 		}
 		sdb_error_chomp();
@@ -425,7 +497,7 @@ sdb_dbi_exec_query(sdb_dbi_client_t *client, const char *query,
 
 			unsigned int type = va_arg(types, unsigned int);
 
-			field_type = DBI_TYPE_TO_SC(field_type);
+			field_type = DBI_TYPE_TO_SDB(field_type);
 
 			/* column count starts at 1 */
 			if ((unsigned int)field_type != type) {
@@ -474,6 +546,8 @@ sdb_dbi_client_destroy(sdb_dbi_client_t *client)
 		dbi_conn_close(client->conn);
 	client->conn = NULL;
 
+	dbi_shutdown_r(client->inst);
+
 	if (client->options)
 		sdb_dbi_options_destroy(client->options);
 	client->options = NULL;