From a8ae03f889b5a514a9ed51240d854148e82baa43 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Tue, 15 Jun 2021 09:34:17 +0100
Subject: [PATCH] auc: update to version 0.1.7
No longer fail in case a package is part of multiple lists (which may
happen temporarily in case it becomes 'nonshared').
Bump version to prepare for sync accross branches.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 9150e82768c14785c17b77d406a5f9217edd5b5f)
---
utils/auc/Makefile | 2 +-
utils/auc/src/auc.c | 19 ++++++++++++++++---
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/utils/auc/Makefile b/utils/auc/Makefile
index 4faf38bf9c..58e026a8d8 100644
--- a/utils/auc/Makefile
+++ b/utils/auc/Makefile
@@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=auc
-PKG_VERSION:=0.1.6
+PKG_VERSION:=0.1.7
PKG_RELEASE:=$(AUTORELEASE)
PKG_LICENSE:=GPL-3.0
diff --git a/utils/auc/src/auc.c b/utils/auc/src/auc.c
index cf49948b8f..f01efefaae 100644
--- a/utils/auc/src/auc.c
+++ b/utils/auc/src/auc.c
@@ -1198,11 +1198,25 @@ static int add_upg_packages(struct blob_attr *reply, char *arch)
blobmsg_for_each_attr(cur, packages, rem) {
avpk = malloc(sizeof(struct avl_pkg));
+ if (!avpk)
+ return -ENOMEM;
+
avpk->name = strdup(blobmsg_name(cur));
+ if (!avpk->name)
+ return -ENOMEM;
+
avpk->version = strdup(blobmsg_get_string(cur));
+ if (!avpk->version)
+ return -ENOMEM;
+
avpk->avl.key = avpk->name;
- if (!avpk->name || !avpk->version || avl_insert(&pkg_tree, &avpk->avl)) {
- fprintf(stderr, "failed to insert package %s (%s)!\n", blobmsg_name(cur), blobmsg_get_string(cur));
+ if (avl_insert(&pkg_tree, &avpk->avl)) {
+
+#ifdef AUC_DEBUG
+ if (debug)
+ fprintf(stderr, "failed to insert package %s (%s)!\n", blobmsg_name(cur), blobmsg_get_string(cur));
+#endif
+
if (avpk->name)
free(avpk->name);
@@ -1210,7 +1224,6 @@ static int add_upg_packages(struct blob_attr *reply, char *arch)
free(avpk->version);
free(avpk);
- return -ENOMEM;
}
}
--
GitLab