From ca51ec323839598928fca85cec3bd3109fd32658 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 17 Feb 2009 12:23:01 +0000
Subject: db: allow more than one --repository arg

---
 src/apk.c        | 19 +++++++++++++++++--
 src/apk_applet.h |  9 ++++++++-
 src/database.c   |  7 ++++---
 3 files changed, 29 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/apk.c b/src/apk.c
index 6aaed87..b4b9e9b 100644
--- a/src/apk.c
+++ b/src/apk.c
@@ -22,7 +22,7 @@
 #include "apk_applet.h"
 
 const char *apk_root;
-const char *apk_repository = NULL;
+struct apk_repository_url apk_repository_list;
 int apk_verbosity = 1, apk_progress = 0, apk_upgrade = 0;
 int apk_cwd_fd;
 
@@ -99,6 +99,17 @@ static struct apk_applet *deduce_applet(int argc, char **argv)
 	return NULL;
 }
 
+static struct apk_repository_url *apk_repository_new(const char *url)
+{
+	struct apk_repository_url *r = calloc(1, 
+			sizeof(struct apk_repository_url));
+	if (r) {
+		r->url = url;
+		list_init(&r->list);
+	}
+	return r;
+}
+
 #define NUM_GENERIC_OPTS 6
 static struct option generic_options[32] = {
 	{ "root",	required_argument, 	NULL, 'p' },
@@ -116,10 +127,12 @@ int main(int argc, char **argv)
 	struct option *opt;
 	int r, optindex;
 	void *ctx = NULL;
+	struct apk_repository_url *repo = NULL;
 
 	umask(0);
 	apk_cwd_fd = open(".", O_RDONLY);
 	apk_root = getenv("ROOT");
+	list_init(&apk_repository_list.list);
 
 	applet = deduce_applet(argc, argv);
 	if (applet != NULL) {
@@ -151,7 +164,9 @@ int main(int argc, char **argv)
 			apk_root = optarg;
 			break;
 		case 'X':
-			apk_repository = optarg;
+			repo = apk_repository_new(optarg);
+			if (repo)
+				list_add(&repo->list, &apk_repository_list.list);
 			break;
 		case 'q':
 			apk_verbosity--;
diff --git a/src/apk_applet.h b/src/apk_applet.h
index 4fdce0d..dba5589 100644
--- a/src/apk_applet.h
+++ b/src/apk_applet.h
@@ -13,9 +13,16 @@
 #define APK_APPLET_H
 
 #include <getopt.h>
+#include "apk_defines.h"
 
 extern const char *apk_root;
-extern const char *apk_repository;
+
+struct apk_repository_url {
+	struct list_head list;
+	const char *url;
+};
+
+extern struct apk_repository_url apk_repository_list;
 
 struct apk_applet {
 	const char *name;
diff --git a/src/database.c b/src/database.c
index 621c03c..743fd83 100644
--- a/src/database.c
+++ b/src/database.c
@@ -621,6 +621,7 @@ int apk_db_open(struct apk_database *db, const char *root, unsigned int flags)
 	apk_blob_t blob;
 	const char *apk_repos = getenv("APK_REPOS"), *msg;
 	int r;
+	struct apk_repository_url *repo = NULL;
 
 	memset(db, 0, sizeof(*db));
 	apk_hash_init(&db->available.names, &pkg_name_hash_ops, 1000);
@@ -696,10 +697,10 @@ int apk_db_open(struct apk_database *db, const char *root, unsigned int flags)
 		}
 	}
 
-	if (apk_repository != NULL) {
-		r = apk_db_add_repository(db, APK_BLOB_STR(apk_repository));
+	list_for_each_entry(repo, &apk_repository_list.list, list) {
+		r = apk_db_add_repository(db, APK_BLOB_STR(repo->url));
 		if (r != 0) {
-			msg = "Unable to load repositories";
+			msg = repo->url;
 			goto ret_r;
 		}
 	}
-- 
cgit v1.2.3-60-g2f50