From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 2 Sep 2009 00:43:03 +0000 (+0200)
Subject: only call section ->add callbacks after all fixups have been processed, also call... 
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=commitdiff_plain;h=7c45dfd1c68304b1eed8eda3612619737e34cbc1;hp=96aa070d01e676a6c7f48ff533e219f63da4fd65

only call section ->add callbacks after all fixups have been processed, also call ->add for sections manually parsed later
---

diff --git a/ucimap-example.c b/ucimap-example.c
index 9906592..bf70eb1 100644
--- a/ucimap-example.c
+++ b/ucimap-example.c
@@ -96,7 +96,7 @@ network_add_interface(struct uci_map *map, void *section)
 {
 	struct uci_network *net = section;
 
-	list_add(&net->list, &ifs);
+	list_add_tail(&net->list, &ifs);
 
 	return 0;
 }
@@ -107,7 +107,7 @@ network_add_alias(struct uci_map *map, void *section)
 	struct uci_alias *a = section;
 
 	if (a->interface)
-		list_add(&a->list, &a->interface->alias);
+		list_add_tail(&a->list, &a->interface->alias);
 
 	return 0;
 }
diff --git a/ucimap.c b/ucimap.c
index da73ba9..2bff545 100644
--- a/ucimap.c
+++ b/ucimap.c
@@ -109,6 +109,7 @@ ucimap_get_data(struct ucimap_section_data *sd, struct uci_optmap *om)
 int
 ucimap_init(struct uci_map *map)
 {
+	INIT_LIST_HEAD(&map->pending);
 	INIT_LIST_HEAD(&map->sdata);
 	INIT_LIST_HEAD(&map->fixup);
 	return 0;
@@ -179,6 +180,14 @@ ucimap_find_section(struct uci_map *map, struct uci_fixup *f)
 			continue;
 		return ucimap_section_ptr(sd);
 	}
+	list_for_each(p, &map->pending) {
+		sd = list_entry(p, struct ucimap_section_data, list);
+		if (sd->sm != f->sm)
+			continue;
+		if (strcmp(f->name, sd->section_name) != 0)
+			continue;
+		return ucimap_section_ptr(sd);
+	}
 	return NULL;
 }
 
@@ -357,6 +366,17 @@ ucimap_parse_options(struct uci_map *map, struct uci_sectionmap *sm, struct ucim
 	return 0;
 }
 
+static void
+ucimap_add_section(struct ucimap_section_data *sd)
+{
+	struct uci_map *map = sd->map;
+
+	if (sd->sm->add(map, ucimap_section_ptr(sd)) < 0)
+		ucimap_free_section(map, sd);
+	else
+		list_add_tail(&sd->list, &map->sdata);
+}
+
 
 int
 ucimap_parse_section(struct uci_map *map, struct uci_sectionmap *sm, struct ucimap_section_data *sd, struct uci_section *s)
@@ -452,7 +472,12 @@ ucimap_parse_section(struct uci_map *map, struct uci_sectionmap *sm, struct ucim
 	if (err)
 		goto error;
 
-	list_add_tail(&sd->list, &map->sdata);
+	if (map->parsed) {
+		ucimap_add_section(sd);
+	} else {
+		list_add_tail(&sd->list, &map->pending);
+	}
+
 	err = ucimap_parse_options(map, sm, sd, s);
 	if (err)
 		goto error;
@@ -613,21 +638,20 @@ ucimap_parse(struct uci_map *map, struct uci_package *pkg)
 			ucimap_parse_section(map, sm, sd, s);
 		}
 	}
+	map->parsed = true;
+
 	list_for_each_safe(p, tmp, &map->fixup) {
 		struct uci_fixup *f = list_entry(p, struct uci_fixup, list);
 		ucimap_handle_fixup(map, f);
 		list_del(&f->list);
 		free(f);
 	}
-	list_for_each_safe(p, tmp, &map->sdata) {
-		struct ucimap_section_data *sd = list_entry(p, struct ucimap_section_data, list);
-		void *section;
 
-		if (sd->done)
-			continue;
+	list_for_each_safe(p, tmp, &map->pending) {
+		struct ucimap_section_data *sd;
+		sd = list_entry(p, struct ucimap_section_data, list);
 
-		section = ucimap_section_ptr(sd);
-		if (sd->sm->add(map, section) != 0)
-			ucimap_free_section(map, sd);
+		list_del_init(&sd->list);
+		ucimap_add_section(sd);
 	}
 }
diff --git a/ucimap.h b/ucimap.h
index d56d8ef..d384ef6 100644
--- a/ucimap.h
+++ b/ucimap.h
@@ -54,6 +54,8 @@ struct uci_map {
 	unsigned int n_sections;
 	struct list_head sdata;
 	struct list_head fixup;
+	struct list_head pending;
+	bool parsed;
 
 	void *priv; /* user data */
 };