Hook new optdepend structures up

No new behaviour introduced, everything should work exactly as before.

Dan: refactored to use the single alpm_depend_t structure.

Signed-off-by: Benedikt Morbach <benedikt.morbach@googlemail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 83 insertions, 14 deletions

diff --git a/src/pacman/package.c b/src/pacman/package.c
index bef91e27..54c035c3 100644
--- a/src/pacman/package.c
+++ b/src/pacman/package.c
@@ -38,7 +38,6 @@
 
 /** Turn a depends list into a text list.
  * @param deps a list with items of type alpm_depend_t
- * @return a string list, must be freed
  */
 static void deplist_display(const char *title,
 		alpm_list_t *deps)
@@ -52,6 +51,21 @@ static void deplist_display(const char *title,
 	FREELIST(text);
 }
 
+/** Turn a optdepends list into a text list.
+ * @param optdeps a list with items of type alpm_optdepend_t
+ */
+static void optdeplist_display(const char *title,
+		alpm_list_t *optdeps)
+{
+	alpm_list_t *i, *text = NULL;
+	for(i = optdeps; i; i = alpm_list_next(i)) {
+		alpm_depend_t *optdep = i->data;
+		text = alpm_list_add(text, alpm_dep_compute_string(optdep));
+	}
+	list_display_linebreak(title, text);
+	FREELIST(text);
+}
+
 /**
  * Display the details of a package.
  * Extra information entails 'required by' info for sync packages and backup
@@ -111,7 +125,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra)
 	list_display(_("Groups         :"), alpm_pkg_get_groups(pkg));
 	deplist_display(_("Provides       :"), alpm_pkg_get_provides(pkg));
 	deplist_display(_("Depends On     :"), alpm_pkg_get_depends(pkg));
-	list_display_linebreak(_("Optional Deps  :"), alpm_pkg_get_optdepends(pkg));
+	optdeplist_display(_("Optional Deps  :"), alpm_pkg_get_optdepends(pkg));
 	if(extra || from == PKG_FROM_LOCALDB) {
 		list_display(_("Required By    :"), requiredby);
 	}
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 1d9049ee..7be3dc5c 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -1151,32 +1151,87 @@ void print_packages(const alpm_list_t *packages)
 	}
 }
 
-/* Helper function for comparing strings using the
- * alpm "compare func" signature */
-int str_cmp(const void *s1, const void *s2)
+/**
+ * Helper function for comparing depends using the alpm "compare func"
+ * signature. The function descends through the structure in the following
+ * comparison order: name, modifier (e.g., '>', '='), version, description.
+ * @param d1 the first depend structure
+ * @param d2 the second depend structure
+ * @return -1, 0, or 1 if first is <, ==, or > second
+ */
+static int depend_cmp(const void *d1, const void *d2)
 {
-	return strcmp(s1, s2);
+	const alpm_depend_t *dep1 = d1;
+	const alpm_depend_t *dep2 = d2;
+	int ret;
+
+	ret = strcmp(dep1->name, dep2->name);
+	if(ret == 0) {
+		ret = dep1->mod - dep2->mod;
+	}
+	if(ret == 0) {
+		if(dep1->version && dep2->version) {
+			ret = strcmp(dep1->version, dep2->version);
+		} else if(!dep1->version && dep2->version) {
+			ret = -1;
+		} else if(dep1->version && !dep2->version) {
+			ret = 1;
+		}
+	}
+	if(ret == 0) {
+		if(dep1->desc && dep2->desc) {
+			ret = strcmp(dep1->desc, dep2->desc);
+		} else if(!dep1->desc && dep2->desc) {
+			ret = -1;
+		} else if(dep1->desc && !dep2->desc) {
+			ret = 1;
+		}
+	}
+
+	return ret;
 }
 
 void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg)
 {
-	alpm_list_t *old = alpm_pkg_get_optdepends(oldpkg);
-	alpm_list_t *new = alpm_pkg_get_optdepends(newpkg);
-	alpm_list_t *optdeps = alpm_list_diff(new,old,str_cmp);
-	if(optdeps) {
+	alpm_list_t *i, *old, *new, *optdeps, *optstrings = NULL;
+
+	old = alpm_pkg_get_optdepends(oldpkg);
+	new = alpm_pkg_get_optdepends(newpkg);
+	optdeps = alpm_list_diff(new, old, depend_cmp);
+
+	/* turn optdepends list into a text list */
+	for(i = optdeps; i; i = alpm_list_next(i)) {
+		alpm_depend_t *optdep = i->data;
+		optstrings = alpm_list_add(optstrings, alpm_dep_compute_string(optdep));
+	}
+
+	if(optstrings) {
 		printf(_("New optional dependencies for %s\n"), alpm_pkg_get_name(newpkg));
-		list_display_linebreak("   ", optdeps);
+		list_display_linebreak("   ", optstrings);
 	}
+
 	alpm_list_free(optdeps);
+	FREELIST(optstrings);
 }
 
 void display_optdepends(alpm_pkg_t *pkg)
 {
-	alpm_list_t *optdeps = alpm_pkg_get_optdepends(pkg);
-	if(optdeps) {
+	alpm_list_t *i, *optdeps, *optstrings = NULL;
+
+	optdeps = alpm_pkg_get_optdepends(pkg);
+
+	/* turn optdepends list into a text list */
+	for(i = optdeps; i; i = alpm_list_next(i)) {
+		alpm_depend_t *optdep = i->data;
+		optstrings = alpm_list_add(optstrings, alpm_dep_compute_string(optdep));
+	}
+
+	if(optstrings) {
 		printf(_("Optional dependencies for %s\n"), alpm_pkg_get_name(pkg));
-		list_display_linebreak("   ", optdeps);
+		list_display_linebreak("   ", optstrings);
 	}
+
+	FREELIST(optstrings);
 }
 
 static void display_repo_list(const char *dbname, alpm_list_t *list)