X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=a34a36bb4b3095451dfd55a2bcb2d09a25bb26bf;hp=5e6baf648f47e1dd04189864e924ad80ca8e1b39;hb=9487b850844e4fb873b90cf357c2d0367ebc065c;hpb=fe3c9bb5107ddf3fb4d9add373ccfa0075153b30;ds=sidebyside

diff --git a/uci.h b/uci.h
index 5e6baf6..a34a36b 100644
--- a/uci.h
+++ b/uci.h
@@ -62,6 +62,25 @@ 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_export: Export one or all uci config packages
+ * @ctx: uci context
+ * @stream: output stream
+ * @cfg: (optional) uci config package to export
+ */
+extern int uci_export(struct uci_context *ctx, FILE *stream, struct uci_config *cfg);
+
+/**
  * uci_load: Parse an uci config file and store it in the uci context
  *
  * @ctx: uci context
@@ -89,24 +108,29 @@ 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 */
 
 struct uci_context
 {
+	/* list of config packages */
 	struct uci_list root;
 
-	/* for error handling only */
+	/* parser context, use for error handling only */
 	struct uci_parse_context *pctx;
 
 	/* private: */
 	int errno;
 	jmp_buf trap;
+	char *buf;
+	int bufsz;
 };
 
 struct uci_parse_context
 {
+	/* error context */
+	const char *reason;
 	int line;
 	int byte;
 
@@ -114,8 +138,8 @@ struct uci_parse_context
 	struct uci_config *cfg;
 	struct uci_section *section;
 	FILE *file;
+	const char *name;
 	char *buf;
-	char *reason;
 	int bufsz;
 };
 
@@ -125,6 +149,8 @@ struct uci_config
 	struct uci_list sections;
 	struct uci_context *ctx;
 	char *name;
+	/* private: */
+	int n_section;
 };
 
 struct uci_section
@@ -149,10 +175,28 @@ struct uci_option
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
 
+/* returns true if a list is empty */
 #define uci_list_empty(list) ((list)->next == (list))
+
+/**
+ * uci_list_entry: casts an uci_list pointer to the containing struct.
+ * @_type: config, section or option
+ * @_ptr: pointer to the uci_list struct
+ */
 #define uci_list_entry(_type, _ptr) \
 	((struct uci_ ## _type *) ((char *)(_ptr) - offsetof(struct uci_ ## _type,list)))
 
+/**
+ * uci_foreach_entry: loop through a list of configs, sections or options
+ * @_type: see uci_list_entry
+ * @_list: pointer to the uci_list struct
+ * @_ptr: iteration variable
+ *
+ * use like a for loop, e.g:
+ *   uci_foreach(section, &list, p) {
+ *   	...
+ *   }
+ */
 #define uci_foreach_entry(_type, _list, _ptr)		\
 	for(_ptr = uci_list_entry(_type, (_list)->next);	\
 		&_ptr->list != (_list);			\