1 files changed, 47 insertions, 15 deletions

diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index c093705a..9f6f93da 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -49,12 +49,30 @@ pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2)
 
 	MALLOC(conflict, sizeof(pmconflict_t), RET_ERR(PM_ERR_MEMORY, NULL));
 
-	strncpy(conflict->package1, package1, PKG_NAME_LEN);
-	strncpy(conflict->package2, package2, PKG_NAME_LEN);
+	STRDUP(conflict->package1, package1, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(conflict->package2, package2, RET_ERR(PM_ERR_MEMORY, NULL));
 
 	return(conflict);
 }
 
+void _alpm_conflict_free(pmconflict_t *conflict)
+{
+	FREE(conflict->package2);
+	FREE(conflict->package1);
+	FREE(conflict);
+}
+
+pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict)
+{
+	pmconflict_t *newconflict;
+	CALLOC(newconflict, 1, sizeof(pmconflict_t), RET_ERR(PM_ERR_MEMORY, NULL));
+
+	STRDUP(newconflict->package1, conflict->package1, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(newconflict->package2, conflict->package2, RET_ERR(PM_ERR_MEMORY, NULL));
+
+	return(newconflict);
+}
+
 int _alpm_conflict_isin(pmconflict_t *needle, alpm_list_t *haystack)
 {
 	alpm_list_t *i;
@@ -86,7 +104,7 @@ static int does_conflict(pmpkg_t *pkg1, const char *conflict, pmpkg_t *pkg2)
 {
 	const char *pkg1name = alpm_pkg_get_name(pkg1);
 	const char *pkg2name = alpm_pkg_get_name(pkg2);
-	pmdepend_t *conf = alpm_splitdep(conflict);
+	pmdepend_t *conf = _alpm_splitdep(conflict);
 	int match = 0;
 
 	match = alpm_depcmp(pkg2, conf);
@@ -94,7 +112,7 @@ static int does_conflict(pmpkg_t *pkg1, const char *conflict, pmpkg_t *pkg2)
 		_alpm_log(PM_LOG_DEBUG, "package %s conflicts with %s (by %s)\n",
 				pkg1name, pkg2name, conflict);
 	}
-	FREE(conf);
+	_alpm_dep_free(conf);
 	return(match);
 }
 
@@ -110,7 +128,7 @@ static void add_conflict(alpm_list_t **baddeps, const char *pkg1,
 	if(conflict && !_alpm_conflict_isin(conflict, *baddeps)) {
 		*baddeps = alpm_list_add(*baddeps, conflict);
 	} else {
-		FREE(conflict);
+		_alpm_conflict_free(conflict);
 	}
 }
 
@@ -200,9 +218,13 @@ alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages)
 	return(baddeps);
 }
 
-/* Check for transaction conflicts */
-alpm_list_t *_alpm_checkconflicts(pmdb_t *db, alpm_list_t *packages) {
-	return(alpm_list_join(_alpm_innerconflicts(packages), _alpm_outerconflicts(db, packages)));
+/** Check the package conflicts in a database
+ *
+ * @param db_local the database to check
+ * @return an alpm_list_t of pmconflict_t
+ */
+alpm_list_t SYMEXPORT *alpm_checkdbconflicts(pmdb_t *db_local) {
+	return(_alpm_innerconflicts(_alpm_db_get_pkgcache(db_local)));
 }
 
 /* Returns a alpm_list_t* of file conflicts.
@@ -293,15 +315,15 @@ static alpm_list_t *add_fileconflict(alpm_list_t *conflicts,
 										const char* name1, const char* name2)
 {
 	pmfileconflict_t *conflict;
-	MALLOC(conflict, sizeof(pmfileconflict_t), return(conflicts));
+	MALLOC(conflict, sizeof(pmfileconflict_t), RET_ERR(PM_ERR_MEMORY, NULL));
 
 	conflict->type = type;
-	strncpy(conflict->target, name1, PKG_NAME_LEN);
-	strncpy(conflict->file, filestr, CONFLICT_FILE_LEN);
+	STRDUP(conflict->target, name1, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(conflict->file, filestr, RET_ERR(PM_ERR_MEMORY, NULL));
 	if(name2) {
-		strncpy(conflict->ctarget, name2, PKG_NAME_LEN);
+		STRDUP(conflict->ctarget, name2, RET_ERR(PM_ERR_MEMORY, NULL));
 	} else {
-		conflict->ctarget[0] = '\0';
+		conflict->ctarget = "";
 	}
 
 	conflicts = alpm_list_add(conflicts, conflict);
@@ -311,6 +333,16 @@ static alpm_list_t *add_fileconflict(alpm_list_t *conflicts,
 	return(conflicts);
 }
 
+void _alpm_fileconflict_free(pmfileconflict_t *conflict)
+{
+	if(strlen(conflict->ctarget) > 0) {
+		FREE(conflict->ctarget);
+	}
+	FREE(conflict->file);;
+	FREE(conflict->target);
+	FREE(conflict);
+}
+
 /* Find file conflicts that may occur during the transaction with two checks:
  * 1: check every target against every target
  * 2: check every target against the filesystem */
@@ -345,13 +377,13 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo
 		PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", (percent * 100),
 		         numtargs, current);
 		/* CHECK 1: check every target against every target */
+		_alpm_log(PM_LOG_DEBUG, "searching for file conflicts: %s\n",
+								alpm_pkg_get_name(p1));
 		for(j = i->next; j; j = j->next) {
 			p2 = j->data;
 			if(!p2) {
 				continue;
 			}
-			_alpm_log(PM_LOG_DEBUG, "searching for file conflicts: %s and %s\n",
-								alpm_pkg_get_name(p1), alpm_pkg_get_name(p2));
 			tmpfiles = chk_fileconflicts(alpm_pkg_get_files(p1), alpm_pkg_get_files(p2));
 
 			if(tmpfiles) {