1 files changed, 66 insertions, 95 deletions

diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index 4e88668b..a95280c7 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -54,6 +54,8 @@ static int make_lock(pmhandle_t *handle)
 	int fd;
 	char *dir, *ptr;
 
+	ASSERT(handle->lockfile != NULL, return -1);
+
 	/* create the dir of the lockfile first */
 	dir = strdup(handle->lockfile);
 	ptr = strrchr(dir, '/');
@@ -94,7 +96,7 @@ static int remove_lock(pmhandle_t *handle)
 }
 
 /** Initialize the transaction. */
-int SYMEXPORT alpm_trans_init(pmtransflag_t flags,
+int SYMEXPORT alpm_trans_init(pmhandle_t *handle, pmtransflag_t flags,
 		alpm_trans_cb_event event, alpm_trans_cb_conv conv,
 		alpm_trans_cb_progress progress)
 {
@@ -102,51 +104,45 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags,
 	const int required_db_version = 2;
 	int db_version;
 
-	ALPM_LOG_FUNC;
-
 	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
-
-	ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1));
+	ASSERT(handle != NULL, return -1);
+	ASSERT(handle->trans == NULL, RET_ERR(handle, PM_ERR_TRANS_NOT_NULL, -1));
 
 	/* lock db */
 	if(!(flags & PM_TRANS_FLAG_NOLOCK)) {
 		if(make_lock(handle)) {
-			RET_ERR(PM_ERR_HANDLE_LOCK, -1);
+			RET_ERR(handle, PM_ERR_HANDLE_LOCK, -1);
 		}
 	}
 
+	CALLOC(trans, 1, sizeof(pmtrans_t), RET_ERR(handle, PM_ERR_MEMORY, -1));
+	trans->flags = flags;
+	trans->cb_event = event;
+	trans->cb_conv = conv;
+	trans->cb_progress = progress;
+	trans->state = STATE_INITIALIZED;
+
 	/* check database version */
 	db_version = _alpm_db_version(handle->db_local);
 	if(db_version < required_db_version) {
-		_alpm_log(PM_LOG_ERROR,
+		_alpm_log(handle, PM_LOG_ERROR,
 				_("%s database version is too old\n"), handle->db_local->treename);
 		remove_lock(handle);
-		RET_ERR(PM_ERR_DB_VERSION, -1);
-	}
-
-	trans = _alpm_trans_new();
-	if(trans == NULL) {
-		RET_ERR(PM_ERR_MEMORY, -1);
+		_alpm_trans_free(trans);
+		RET_ERR(handle, PM_ERR_DB_VERSION, -1);
 	}
 
-	trans->flags = flags;
-	trans->cb_event = event;
-	trans->cb_conv = conv;
-	trans->cb_progress = progress;
-	trans->state = STATE_INITIALIZED;
-
 	handle->trans = trans;
 
 	return 0;
 }
 
-static alpm_list_t *check_arch(alpm_list_t *pkgs)
+static alpm_list_t *check_arch(pmhandle_t *handle, alpm_list_t *pkgs)
 {
 	alpm_list_t *i;
 	alpm_list_t *invalid = NULL;
 
-	const char *arch = alpm_option_get_arch();
+	const char *arch = alpm_option_get_arch(handle);
 	if(!arch) {
 		return NULL;
 	}
@@ -158,7 +154,7 @@ static alpm_list_t *check_arch(alpm_list_t *pkgs)
 			const char *pkgname = alpm_pkg_get_name(pkg);
 			const char *pkgver = alpm_pkg_get_version(pkg);
 			size_t len = strlen(pkgname) + strlen(pkgver) + strlen(pkgarch) + 3;
-			MALLOC(string, len, RET_ERR(PM_ERR_MEMORY, invalid));
+			MALLOC(string, len, RET_ERR(handle, PM_ERR_MEMORY, invalid));
 			sprintf(string, "%s-%s-%s", pkgname, pkgver, pkgarch);
 			invalid = alpm_list_add(invalid, string);
 		}
@@ -167,41 +163,39 @@ static alpm_list_t *check_arch(alpm_list_t *pkgs)
 }
 
 /** Prepare a transaction. */
-int SYMEXPORT alpm_trans_prepare(alpm_list_t **data)
+int SYMEXPORT alpm_trans_prepare(pmhandle_t *handle, alpm_list_t **data)
 {
 	pmtrans_t *trans;
 
-	ALPM_LOG_FUNC;
-
 	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
-	ASSERT(data != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+	ASSERT(handle != NULL, return -1);
+	ASSERT(data != NULL, RET_ERR(handle, PM_ERR_WRONG_ARGS, -1));
 
 	trans = handle->trans;
 
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
+	ASSERT(trans != NULL, RET_ERR(handle, PM_ERR_TRANS_NULL, -1));
+	ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(handle, PM_ERR_TRANS_NOT_INITIALIZED, -1));
 
 	/* If there's nothing to do, return without complaining */
 	if(trans->add == NULL && trans->remove == NULL) {
 		return 0;
 	}
 
-	alpm_list_t *invalid = check_arch(trans->add);
+	alpm_list_t *invalid = check_arch(handle, trans->add);
 	if(invalid) {
 		if(data) {
 			*data = invalid;
 		}
-		RET_ERR(PM_ERR_PKG_INVALID_ARCH, -1);
+		RET_ERR(handle, PM_ERR_PKG_INVALID_ARCH, -1);
 	}
 
 	if(trans->add == NULL) {
-		if(_alpm_remove_prepare(trans, handle->db_local, data) == -1) {
+		if(_alpm_remove_prepare(handle, data) == -1) {
 			/* pm_errno is set by _alpm_remove_prepare() */
 			return -1;
 		}
 	}	else {
-		if(_alpm_sync_prepare(trans, handle->db_local, handle->dbs_sync, data) == -1) {
+		if(_alpm_sync_prepare(handle, data) == -1) {
 			/* pm_errno is set by _alpm_sync_prepare() */
 			return -1;
 		}
@@ -213,21 +207,19 @@ int SYMEXPORT alpm_trans_prepare(alpm_list_t **data)
 }
 
 /** Commit a transaction. */
-int SYMEXPORT alpm_trans_commit(alpm_list_t **data)
+int SYMEXPORT alpm_trans_commit(pmhandle_t *handle, alpm_list_t **data)
 {
 	pmtrans_t *trans;
 
-	ALPM_LOG_FUNC;
-
 	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	ASSERT(handle != NULL, return -1);
 
 	trans = handle->trans;
 
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(trans->state == STATE_PREPARED, RET_ERR(PM_ERR_TRANS_NOT_PREPARED, -1));
+	ASSERT(trans != NULL, RET_ERR(handle, PM_ERR_TRANS_NULL, -1));
+	ASSERT(trans->state == STATE_PREPARED, RET_ERR(handle, PM_ERR_TRANS_NOT_PREPARED, -1));
 
-	ASSERT(!(trans->flags & PM_TRANS_FLAG_NOLOCK), RET_ERR(PM_ERR_TRANS_NOT_LOCKED, -1));
+	ASSERT(!(trans->flags & PM_TRANS_FLAG_NOLOCK), RET_ERR(handle, PM_ERR_TRANS_NOT_LOCKED, -1));
 
 	/* If there's nothing to do, return without complaining */
 	if(trans->add == NULL && trans->remove == NULL) {
@@ -237,12 +229,12 @@ int SYMEXPORT alpm_trans_commit(alpm_list_t **data)
 	trans->state = STATE_COMMITING;
 
 	if(trans->add == NULL) {
-		if(_alpm_remove_packages(trans, handle->db_local) == -1) {
+		if(_alpm_remove_packages(handle) == -1) {
 			/* pm_errno is set by _alpm_remove_commit() */
 			return -1;
 		}
 	} else {
-		if(_alpm_sync_commit(trans, handle->db_local, data) == -1) {
+		if(_alpm_sync_commit(handle, data) == -1) {
 			/* pm_errno is set by _alpm_sync_commit() */
 			return -1;
 		}
@@ -254,19 +246,17 @@ int SYMEXPORT alpm_trans_commit(alpm_list_t **data)
 }
 
 /** Interrupt a transaction. */
-int SYMEXPORT alpm_trans_interrupt(void)
+int SYMEXPORT alpm_trans_interrupt(pmhandle_t *handle)
 {
 	pmtrans_t *trans;
 
-	ALPM_LOG_FUNC;
-
 	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	ASSERT(handle != NULL, return -1);
 
 	trans = handle->trans;
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
+	ASSERT(trans != NULL, RET_ERR(handle, PM_ERR_TRANS_NULL, -1));
 	ASSERT(trans->state == STATE_COMMITING || trans->state == STATE_INTERRUPTED,
-			RET_ERR(PM_ERR_TRANS_TYPE, -1));
+			RET_ERR(handle, PM_ERR_TRANS_TYPE, -1));
 
 	trans->state = STATE_INTERRUPTED;
 
@@ -274,18 +264,16 @@ int SYMEXPORT alpm_trans_interrupt(void)
 }
 
 /** Release a transaction. */
-int SYMEXPORT alpm_trans_release(void)
+int SYMEXPORT alpm_trans_release(pmhandle_t *handle)
 {
 	pmtrans_t *trans;
 
-	ALPM_LOG_FUNC;
-
 	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	ASSERT(handle != NULL, return -1);
 
 	trans = handle->trans;
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(trans->state != STATE_IDLE, RET_ERR(PM_ERR_TRANS_NULL, -1));
+	ASSERT(trans != NULL, RET_ERR(handle, PM_ERR_TRANS_NULL, -1));
+	ASSERT(trans->state != STATE_IDLE, RET_ERR(handle, PM_ERR_TRANS_NULL, -1));
 
 	int nolock_flag = trans->flags & PM_TRANS_FLAG_NOLOCK;
 
@@ -295,10 +283,10 @@ int SYMEXPORT alpm_trans_release(void)
 	/* unlock db */
 	if(!nolock_flag) {
 		if(remove_lock(handle)) {
-			_alpm_log(PM_LOG_WARNING, _("could not remove lock file %s\n"),
-					alpm_option_get_lockfile());
-			alpm_logaction("warning: could not remove lock file %s\n",
-					alpm_option_get_lockfile());
+			_alpm_log(handle, PM_LOG_WARNING, _("could not remove lock file %s\n"),
+					alpm_option_get_lockfile(handle));
+			alpm_logaction(handle, "warning: could not remove lock file %s\n",
+					alpm_option_get_lockfile(handle));
 		}
 	}
 
@@ -307,22 +295,8 @@ int SYMEXPORT alpm_trans_release(void)
 
 /** @} */
 
-pmtrans_t *_alpm_trans_new(void)
-{
-	pmtrans_t *trans;
-
-	ALPM_LOG_FUNC;
-
-	CALLOC(trans, 1, sizeof(pmtrans_t), RET_ERR(PM_ERR_MEMORY, NULL));
-	trans->state = STATE_IDLE;
-
-	return trans;
-}
-
 void _alpm_trans_free(pmtrans_t *trans)
 {
-	ALPM_LOG_FUNC;
-
 	if(trans == NULL) {
 		return;
 	}
@@ -363,9 +337,8 @@ static int grep(const char *fn, const char *needle)
 	return 0;
 }
 
-int _alpm_runscriptlet(const char *root, const char *installfn,
-		const char *script, const char *ver,
-		const char *oldver, pmtrans_t UNUSED *trans)
+int _alpm_runscriptlet(pmhandle_t *handle, const char *installfn,
+		const char *script, const char *ver, const char *oldver)
 {
 	char scriptfn[PATH_MAX];
 	char cmdline[PATH_MAX];
@@ -375,22 +348,20 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
 	int clean_tmpdir = 0;
 	int retval = 0;
 
-	ALPM_LOG_FUNC;
-
 	if(access(installfn, R_OK)) {
 		/* not found */
-		_alpm_log(PM_LOG_DEBUG, "scriptlet '%s' not found\n", installfn);
+		_alpm_log(handle, PM_LOG_DEBUG, "scriptlet '%s' not found\n", installfn);
 		return 0;
 	}
 
 	/* creates a directory in $root/tmp/ for copying/extracting the scriptlet */
-	snprintf(tmpdir, PATH_MAX, "%stmp/", root);
+	snprintf(tmpdir, PATH_MAX, "%stmp/", handle->root);
 	if(access(tmpdir, F_OK) != 0) {
 		_alpm_makepath_mode(tmpdir, 01777);
 	}
-	snprintf(tmpdir, PATH_MAX, "%stmp/alpm_XXXXXX", root);
+	snprintf(tmpdir, PATH_MAX, "%stmp/alpm_XXXXXX", handle->root);
 	if(mkdtemp(tmpdir) == NULL) {
-		_alpm_log(PM_LOG_ERROR, _("could not create temp directory\n"));
+		_alpm_log(handle, PM_LOG_ERROR, _("could not create temp directory\n"));
 		return 1;
 	} else {
 		clean_tmpdir = 1;
@@ -399,12 +370,12 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
 	/* either extract or copy the scriptlet */
 	snprintf(scriptfn, PATH_MAX, "%s/.INSTALL", tmpdir);
 	if(strcmp(script, "pre_upgrade") == 0 || strcmp(script, "pre_install") == 0) {
-		if(_alpm_unpack_single(installfn, tmpdir, ".INSTALL")) {
+		if(_alpm_unpack_single(handle, installfn, tmpdir, ".INSTALL")) {
 			retval = 1;
 		}
 	} else {
 		if(_alpm_copyfile(installfn, scriptfn)) {
-			_alpm_log(PM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), scriptfn, strerror(errno));
+			_alpm_log(handle, PM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), scriptfn, strerror(errno));
 			retval = 1;
 		}
 	}
@@ -413,7 +384,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
 	}
 
 	/* chop off the root so we can find the tmpdir in the chroot */
-	scriptpath = scriptfn + strlen(root) - 1;
+	scriptpath = scriptfn + strlen(handle->root) - 1;
 
 	if(!grep(scriptfn, script)) {
 		/* script not found in scriptlet file */
@@ -428,41 +399,41 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
 				scriptpath, script, ver);
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "executing \"%s\"\n", cmdline);
+	_alpm_log(handle, PM_LOG_DEBUG, "executing \"%s\"\n", cmdline);
 
-	retval = _alpm_run_chroot(root, "/bin/sh", argv);
+	retval = _alpm_run_chroot(handle, "/bin/sh", argv);
 
 cleanup:
 	if(clean_tmpdir && _alpm_rmrf(tmpdir)) {
-		_alpm_log(PM_LOG_WARNING, _("could not remove tmpdir %s\n"), tmpdir);
+		_alpm_log(handle, PM_LOG_WARNING, _("could not remove tmpdir %s\n"), tmpdir);
 	}
 
 	return retval;
 }
 
-int SYMEXPORT alpm_trans_get_flags()
+pmtransflag_t SYMEXPORT alpm_trans_get_flags(pmhandle_t *handle)
 {
 	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
-	ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
+	ASSERT(handle != NULL, return -1);
+	ASSERT(handle->trans != NULL, RET_ERR(handle, PM_ERR_TRANS_NULL, -1));
 
 	return handle->trans->flags;
 }
 
-alpm_list_t SYMEXPORT * alpm_trans_get_add()
+alpm_list_t SYMEXPORT *alpm_trans_get_add(pmhandle_t *handle)
 {
 	/* Sanity checks */
 	ASSERT(handle != NULL, return NULL);
-	ASSERT(handle->trans != NULL, return NULL);
+	ASSERT(handle->trans != NULL, RET_ERR(handle, PM_ERR_TRANS_NULL, NULL));
 
 	return handle->trans->add;
 }
 
-alpm_list_t SYMEXPORT * alpm_trans_get_remove()
+alpm_list_t SYMEXPORT *alpm_trans_get_remove(pmhandle_t *handle)
 {
 	/* Sanity checks */
 	ASSERT(handle != NULL, return NULL);
-	ASSERT(handle->trans != NULL, return NULL);
+	ASSERT(handle->trans != NULL, RET_ERR(handle, PM_ERR_TRANS_NULL, NULL));
 
 	return handle->trans->remove;
 }