X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=66ad752c395725ad94d9a859bcb3c654763f3743;hp=d7fd1e2f5fbd543919a6fd949f070cff26894e04;hb=179b6f5fced8a0c1028ee56451efa26e40392961;hpb=cac9b1d765338466c1c77719c4119c565689b4c4

diff --git a/uci.h b/uci.h
index d7fd1e2..66ad752 100644
--- a/uci.h
+++ b/uci.h
@@ -55,6 +55,7 @@ struct uci_list
 	struct uci_list *prev;
 };
 
+struct uci_ptr;
 struct uci_element;
 struct uci_package;
 struct uci_section;
@@ -66,19 +67,6 @@ struct uci_parse_context;
 
 
 /**
- * uci_parse_tuple: Parse an uci tuple
- * @ctx: uci context
- * @str: input string
- * @package: output package pointer
- * @section: output section pointer
- * @option: output option pointer
- * @value: output value pointer
- *
- * format: <package>[.<section>[.<option>]][=<value>]
- */
-extern int uci_parse_tuple(struct uci_context *ctx, char *str, char **package, char **section, char **option, char **value);
-
-/**
  * uci_alloc_context: Allocate a new uci context
  */
 extern struct uci_context *uci_alloc_context(void);
@@ -135,36 +123,21 @@ extern int uci_load(struct uci_context *ctx, const char *name, struct uci_packag
 extern int uci_unload(struct uci_context *ctx, struct uci_package *p);
 
 /**
- * uci_lookup: Look up an uci element
- *
- * @ctx: uci context
- * @res: where to store the result
- * @package: uci_package struct 
- * @section: config section (optional)
- * @option: option to search for (optional)
- *
- * If section is omitted, then a pointer to the config package is returned
- * If option is omitted, then a pointer to the config section is returned
- */
-extern int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *package, const char *section, const char *option);
-
-/**
- * uci_lookup_ext: Extended lookup for an uci element
- *
+ * uci_lookup_ptr: Split an uci tuple string and look up an element tree
  * @ctx: uci context
- * @res: where to store the result
- * @ptr: uci pointer tuple
+ * @ptr: lookup result struct
+ * @str: uci tuple string to look up
+ * @extended: allow extended syntax lookup
  *
- * Looks up an element using the extended syntax, which is a superset of what
- * uci_parse_tuple accepts. It can look up sections by an index with an optional
- * type.
+ * if extended is set to true, uci_lookup_ptr supports the following 
+ * extended syntax:
  *
  * Examples:
  *   network.@interface[0].ifname ('ifname' option of the first interface section)
  *   network.@interface[-1]       (last interface section)
  * Note: uci_lookup_ext will automatically load a config package if necessary
  */
-extern int uci_lookup_ext(struct uci_context *ctx, struct uci_element **res, char *ptr);
+extern int uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool extended);
 
 /**
  * uci_add_section: Add an unnamed section
@@ -176,52 +149,37 @@ extern int uci_lookup_ext(struct uci_context *ctx, struct uci_element **res, cha
 extern int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *type, struct uci_section **res);
 
 /**
- * uci_set_element_value: Replace an element's value with a new one
- * @ctx: uci context
- * @element: pointer to an uci_element struct pointer
- * @value: new value
- * 
- * Only valid for uci_option and uci_section. Will replace the type string
- * when used with an uci_section
- */
-extern int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, const char *value);
-
-/**
  * uci_set: Set an element's value; create the element if necessary
  * @ctx: uci context
- * @package: package name
- * @section: section name
- * @option: option name
- * @value: value (option) or type (section)
- * @result: store the updated element in this variable (optional)
+ * @ptr: uci pointer 
+ *
+ * The updated/created element is stored in ptr->last
  */
-extern int uci_set(struct uci_context *ctx, struct uci_package *p, const char *section, const char *option, const char *value, struct uci_element **result);
+extern int uci_set(struct uci_context *ctx, struct uci_ptr *ptr);
 
 /**
- * uci_rename: Rename an element
+ * uci_add_list: Append a string to an element list
  * @ctx: uci context
- * @package: package name
- * @section: section name
- * @option: option name
- * @name: new name
+ * @ptr: uci pointer (with value)
+ *
+ * Note: if the given option already contains a string value,
+ * it will be converted to an 1-element-list before appending the next element
  */
-extern int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *name);
+extern int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr);
 
 /**
- * uci_delete_element: Delete a section or option
+ * uci_rename: Rename an element
  * @ctx: uci context
- * @e: element (section or option)
+ * @ptr: uci pointer (with value)
  */
-extern int uci_delete_element(struct uci_context *ctx, struct uci_element *e);
+extern int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr);
 
 /**
  * uci_delete: Delete a section or option
  * @ctx: uci context
- * @p: uci package
- * @section: section name
- * @option: option name (optional)
+ * @ptr: uci pointer 
  */
-extern int uci_delete(struct uci_context *ctx, struct uci_package *p, const char *section, const char *option);
+extern int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr);
 
 /**
  * uci_save: save change history for a package
@@ -276,11 +234,9 @@ extern int uci_add_history_path(struct uci_context *ctx, const char *dir);
 /**
  * uci_revert: revert all changes to a config item
  * @ctx: uci context
- * @p: pointer to a uci_package struct ptr (will be replaced by the revert)
- * @section: section name (optional)
- * @option option name (optional)
+ * @ptr: uci pointer
  */
-extern int uci_revert(struct uci_context *ctx, struct uci_package **p, const char *section, const char *option);
+extern int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr);
 
 /**
  * uci_parse_argument: parse a shell-style argument, with an arbitrary quoting style
@@ -311,16 +267,19 @@ extern bool uci_validate_text(const char *str);
 
 /* UCI data structures */
 enum uci_type {
-	UCI_TYPE_HISTORY = 0,
-	UCI_TYPE_PACKAGE = 1,
-	UCI_TYPE_SECTION = 2,
-	UCI_TYPE_OPTION = 3,
-	UCI_TYPE_PATH = 4,
-	UCI_TYPE_BACKEND = 5,
+	UCI_TYPE_UNSPEC = 0,
+	UCI_TYPE_HISTORY = 1,
+	UCI_TYPE_PACKAGE = 2,
+	UCI_TYPE_SECTION = 3,
+	UCI_TYPE_OPTION = 4,
+	UCI_TYPE_PATH = 5,
+	UCI_TYPE_BACKEND = 6,
+	UCI_TYPE_ITEM = 7,
 };
 
 enum uci_option_type {
 	UCI_TYPE_STRING = 0,
+	UCI_TYPE_LIST = 1,
 };
 
 enum uci_flags {
@@ -374,7 +333,7 @@ struct uci_context
 	int err;
 	const char *func;
 	jmp_buf trap;
-	bool internal;
+	bool internal, nested;
 	char *buf;
 	int bufsz;
 };
@@ -410,7 +369,7 @@ struct uci_option
 	struct uci_section *section;
 	enum uci_option_type type;
 	union {
-		struct uci_element *list;
+		struct uci_list list;
 		char *string;
 	} v;
 };
@@ -419,7 +378,8 @@ enum uci_command {
 	UCI_CMD_ADD,
 	UCI_CMD_REMOVE,
 	UCI_CMD_CHANGE,
-	UCI_CMD_RENAME
+	UCI_CMD_RENAME,
+	UCI_CMD_LIST_ADD,
 };
 
 struct uci_history
@@ -430,6 +390,26 @@ struct uci_history
 	char *value;
 };
 
+struct uci_ptr
+{
+	enum uci_type target;
+	enum {
+		UCI_LOOKUP_DONE =     (1 << 0),
+		UCI_LOOKUP_COMPLETE = (1 << 1),
+		UCI_LOOKUP_EXTENDED = (1 << 2),
+	} flags;
+
+	struct uci_package *p;
+	struct uci_section *s;
+	struct uci_option *o;
+	struct uci_element *last;
+
+	const char *package;
+	const char *section;
+	const char *option;
+	const char *value;
+};
+
 
 /* linked list handling */
 #ifndef offsetof