X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=7cd7eb9fe6256398a9776cc301ec434e740d57d2;hp=6dc00f177fd7af51a74eaef8918282fcd258c4b9;hb=688d1d1a8bad8af63074a7e277cce6a24bb99f10;hpb=854f7c5d08cd37aeb7414e26ed6666fad26f5f7a

diff --git a/uci.h b/uci.h
index 6dc00f1..7cd7eb9 100644
--- a/uci.h
+++ b/uci.h
@@ -62,6 +62,17 @@ extern void uci_free(struct uci_context *ctx);
 extern void uci_perror(struct uci_context *ctx, const char *str);
 
 /**
+ * uci_import: Import uci config data from a stream
+ * @ctx: uci context
+ * @stream: file stream to import from
+ * @name: (optional) assume the config has the given name
+ * @cfg: (optional) store the last parsed config package in this variable
+ *
+ * the name parameter is for config files that don't explicitly use the 'package <...>' keyword
+ */
+extern int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_config **cfg);
+
+/**
  * uci_load: Parse an uci config file and store it in the uci context
  *
  * @ctx: uci context
@@ -89,7 +100,7 @@ extern int uci_cleanup(struct uci_context *ctx);
  *
  * @ctx: uci context
  */
-extern char **uci_list_configs(struct uci_context *ctx);
+extern char **uci_list_configs();
 
 /* UCI data structures */
 
@@ -107,14 +118,16 @@ struct uci_context
 
 struct uci_parse_context
 {
+	const char *reason;
 	int line;
 	int byte;
 
 	/* private: */
 	struct uci_config *cfg;
+	struct uci_section *section;
 	FILE *file;
+	const char *name;
 	char *buf;
-	char *reason;
 	int bufsz;
 };
 
@@ -124,6 +137,8 @@ struct uci_config
 	struct uci_list sections;
 	struct uci_context *ctx;
 	char *name;
+	/* private: */
+	int n_section;
 };
 
 struct uci_section
@@ -148,7 +163,7 @@ struct uci_option
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
 
-#define uci_list_empty(list) (list->next == ptr)
+#define uci_list_empty(list) ((list)->next == (list))
 #define uci_list_entry(_type, _ptr) \
 	((struct uci_ ## _type *) ((char *)(_ptr) - offsetof(struct uci_ ## _type,list)))