1 files changed, 58 insertions, 36 deletions

diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index a60a4bb6..9b9719d1 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -23,20 +23,17 @@
 
 #include "config.h"
 
-/* connection caching setup */
-#ifdef HAVE_LIBFETCH
-#include <fetch.h>
+#ifdef HAVE_LIBCURL
+#include <curl/curl.h>
 #endif
 
 /* libalpm */
 #include "alpm.h"
 #include "alpm_list.h"
 #include "handle.h"
+#include "log.h"
 #include "util.h"
 
-/* Globals */
-enum _pmerrno_t pm_errno SYMEXPORT;
-
 /** \addtogroup alpm_interface Interface Functions
  * @brief Functions to initialize and release libalpm
  * @{
@@ -44,64 +41,89 @@ enum _pmerrno_t pm_errno SYMEXPORT;
 
 /** Initializes the library.  This must be called before any other
  * functions are called.
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ * @param root the root path for all filesystem operations
+ * @param dbpath the absolute path to the libalpm database
+ * @param err an optional variable to hold any error return codes
+ * @return a context handle on success, NULL on error, err will be set if provided
  */
-int SYMEXPORT alpm_initialize(void)
+pmhandle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath,
+		enum _pmerrno_t *err)
 {
-	ASSERT(handle == NULL, RET_ERR(PM_ERR_HANDLE_NOT_NULL, -1));
-
-	handle = _alpm_handle_new();
-	if(handle == NULL) {
-		RET_ERR(PM_ERR_MEMORY, -1);
+	enum _pmerrno_t myerr;
+	const char *lf = "db.lck";
+	size_t lockfilelen;
+	pmhandle_t *myhandle = _alpm_handle_new();
+
+	if(myhandle == NULL) {
+		myerr = PM_ERR_MEMORY;
+		goto cleanup;
+	}
+	if((myerr = _alpm_set_directory_option(root, &(myhandle->root), 1))) {
+		goto cleanup;
 	}
-	if(_alpm_db_register_local() == NULL) {
-		/* error code should be set */
-		_alpm_handle_free(handle);
-		handle = NULL;
-		return(-1);
+	if((myerr = _alpm_set_directory_option(dbpath, &(myhandle->dbpath), 1))) {
+		goto cleanup;
+	}
+
+	lockfilelen = strlen(myhandle->dbpath) + strlen(lf) + 1;
+	myhandle->lockfile = calloc(lockfilelen, sizeof(char));
+	snprintf(myhandle->lockfile, lockfilelen, "%s%s", myhandle->dbpath, lf);
+
+	if(_alpm_db_register_local(myhandle) == NULL) {
+		myerr = PM_ERR_DB_CREATE;
+		goto cleanup;
 	}
 
 #ifdef ENABLE_NLS
 	bindtextdomain("libalpm", LOCALEDIR);
 #endif
 
-#ifdef HAVE_LIBFETCH
-	fetchConnectionCacheInit(5, 1);
+#ifdef HAVE_LIBCURL
+	curl_global_init(CURL_GLOBAL_SSL);
+	myhandle->curl = curl_easy_init();
 #endif
 
-	return(0);
+	return myhandle;
+
+cleanup:
+	_alpm_handle_free(myhandle);
+	if(err && myerr) {
+		*err = myerr;
+	}
+	return NULL;
 }
 
 /** Release the library.  This should be the last alpm call you make.
- * @return 0 on success, -1 on error (pm_errno is set accordingly)
+ * After this returns, handle should be considered invalid and cannot be reused
+ * in any way.
+ * @param handle the context handle
+ * @return 0 on success, -1 on error
  */
-int SYMEXPORT alpm_release(void)
+int SYMEXPORT alpm_release(pmhandle_t *myhandle)
 {
+	int ret = 0;
 	pmdb_t *db;
 
-	ALPM_LOG_FUNC;
-
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	CHECK_HANDLE(myhandle, return -1);
 
 	/* close local database */
-	db = handle->db_local;
+	db = myhandle->db_local;
 	if(db) {
 		db->ops->unregister(db);
-		handle->db_local = NULL;
+		myhandle->db_local = NULL;
 	}
 
-	if(alpm_db_unregister_all() == -1) {
-		return(-1);
+	if(alpm_db_unregister_all(myhandle) == -1) {
+		ret = -1;
 	}
 
-	_alpm_handle_free(handle);
-	handle = NULL;
+	_alpm_handle_free(myhandle);
 
-#ifdef HAVE_LIBFETCH
-	fetchConnectionCacheClose();
+#ifdef HAVE_LIBCURL
+	curl_global_cleanup();
 #endif
 
-	return(0);
+	return ret;
 }
 
 /** @} */
@@ -112,7 +134,7 @@ int SYMEXPORT alpm_release(void)
 
 /* Get the version of library */
 const char SYMEXPORT *alpm_version(void) {
-	return(LIB_VERSION);
+	return LIB_VERSION;
 }
 
 /* vim: set ts=2 sw=2 noet: */