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

diff --git a/uci.h b/uci.h
index d18095d..7cd7eb9 100644
--- a/uci.h
+++ b/uci.h
@@ -50,6 +50,11 @@ struct uci_parse_context;
 extern struct uci_context *uci_alloc(void);
 
 /**
+ * uci_free: Free the uci context including all of its data
+ */
+extern void uci_free(struct uci_context *ctx);
+
+/**
  * uci_perror: Print the last uci error that occured
  * @ctx: uci context
  * @str: string to print before the error message
@@ -57,20 +62,45 @@ extern struct uci_context *uci_alloc(void);
 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
  * @name: name of the config file (relative to the config directory)
  */
-int uci_load(struct uci_context *ctx, const char *name);
+extern int uci_load(struct uci_context *ctx, const char *name, struct uci_config **cfg);
+
+/**
+ * uci_unload: Unload a config file from the uci context
+ *
+ * @ctx: uci context
+ * @name: name of the config file
+ */
+extern int uci_unload(struct uci_context *ctx, const char *name);
 
 /**
  * uci_cleanup: Clean up after an error
  *
  * @ctx: uci context
  */
-int uci_cleanup(struct uci_context *ctx);
+extern int uci_cleanup(struct uci_context *ctx);
 
+/**
+ * uci_list_configs: List available uci config files
+ *
+ * @ctx: uci context
+ */
+extern char **uci_list_configs();
 
 /* UCI data structures */
 
@@ -88,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;
 };
 
@@ -105,6 +137,8 @@ struct uci_config
 	struct uci_list sections;
 	struct uci_context *ctx;
 	char *name;
+	/* private: */
+	int n_section;
 };
 
 struct uci_section
@@ -129,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)))