X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Futils%2Fdbi.c;h=de2348e713d34e82924bbf4870d252d186626803;hp=db93857fad42d9103d40c24d243fb48511af807e;hb=1a9933488f9e7babf6c538393cc69c636efca2ed;hpb=8d86f8d17b71234e55633fbbdbcaee6f3d365d36

diff --git a/src/utils/dbi.c b/src/utils/dbi.c
index db93857..de2348e 100644
--- a/src/utils/dbi.c
+++ b/src/utils/dbi.c
@@ -25,8 +25,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "core/error.h"
+#if HAVE_CONFIG_H
+#	include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "utils/dbi.h"
+#include "utils/error.h"
 
 #include <assert.h>
 
@@ -56,6 +60,7 @@ struct sdb_dbi_client {
 	char *database;
 
 	dbi_conn conn;
+	dbi_inst inst;
 
 	sdb_dbi_options_t *options;
 };
@@ -84,7 +89,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 +101,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;
 			}
@@ -141,6 +146,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 +159,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;
@@ -172,7 +183,7 @@ sdb_dbi_options_create(void)
 {
 	sdb_dbi_options_t *options;
 
-	options = malloc(sizeof(options));
+	options = malloc(sizeof(*options));
 	if (! options)
 		return NULL;
 
@@ -253,6 +264,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)) {
@@ -284,18 +300,20 @@ sdb_dbi_client_connect(sdb_dbi_client_t *client)
 	if ((! client) || (! client->driver) || (! client->database))
 		return -1;
 
-	if (client->conn)
+	if (client->conn) {
 		dbi_conn_close(client->conn);
+		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();
@@ -332,6 +350,7 @@ sdb_dbi_client_connect(sdb_dbi_client_t *client)
 			sdb_error_log(SDB_LOG_ERR);
 
 			dbi_conn_close(client->conn);
+			client->conn = NULL;
 			return -1;
 		}
 	}
@@ -340,6 +359,7 @@ sdb_dbi_client_connect(sdb_dbi_client_t *client)
 		sdb_log(SDB_LOG_ERR, "dbi: failed to set option 'dbname': %s",
 				sdb_dbi_strerror(client->conn));
 		dbi_conn_close(client->conn);
+		client->conn = NULL;
 		return -1;
 	}
 
@@ -347,6 +367,7 @@ sdb_dbi_client_connect(sdb_dbi_client_t *client)
 		sdb_log(SDB_LOG_ERR, "dbi: failed to connect to database '%s': %s",
 				client->database, sdb_dbi_strerror(client->conn));
 		dbi_conn_close(client->conn);
+		client->conn = NULL;
 		return -1;
 	}
 	return 0;
@@ -467,6 +488,9 @@ sdb_dbi_client_destroy(sdb_dbi_client_t *client)
 
 	if (client->conn)
 		dbi_conn_close(client->conn);
+	client->conn = NULL;
+
+	dbi_shutdown_r(client->inst);
 
 	if (client->options)
 		sdb_dbi_options_destroy(client->options);