diff --git a/src/utils/dbi.c b/src/utils/dbi.c
index c8eb81616454a3078eb768f16b1affd32b81f1d9..b1fdaf127896aaf35863ec1a8cfd208c62982d6d 100644 (file)
--- a/src/utils/dbi.c
+++ b/src/utils/dbi.c
* 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"
#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
*/
char *database;
dbi_conn conn;
+ dbi_inst inst;
sdb_dbi_options_t *options;
};
continue;
status = callback(client, num_fields, data, user_data);
- for (i = 0; i < num_fields; ++i) {
- if ((data[i].type == SDB_TYPE_STRING) && (data[i].data.string))
- free(data[i].data.string);
- else if ((data[i].type == SDB_TYPE_BINARY)
- && (data[i].data.binary.datum))
- free(data[i].data.binary.datum);
- }
+ for (i = 0; i < num_fields; ++i)
+ sdb_data_free_datum(&data[i]);
if (status)
continue;
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)) {
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();
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;