X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=6b5de9a598f3bd19237912fcd46d85f61d7e927f;hp=891fb3b8270f6478221889401e78e3dfa5454622;hb=bdb2bbfbe937312463763bd5ce35a7f857238081;hpb=4aa3fd762e2190a4e418581cf24446484d0b7df5

diff --git a/uci.h b/uci.h
index 891fb3b..6b5de9a 100644
--- a/uci.h
+++ b/uci.h
@@ -35,6 +35,7 @@
 
 #define UCI_CONFDIR "/etc/config"
 #define UCI_SAVEDIR "/tmp/.uci"
+#define UCI_FILEMODE	0600
 
 enum
 {
@@ -104,6 +105,7 @@ extern void uci_perror(struct uci_context *ctx, const char *str);
  * @single: ignore the 'package' keyword and parse everything into a single package
  *
  * the name parameter is for config files that don't explicitly use the 'package <...>' keyword
+ * if 'package' points to a non-null struct pointer, enable history tracking and merge 
  */
 extern int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single);
 
@@ -173,7 +175,33 @@ extern int uci_set_element_value(struct uci_context *ctx, struct uci_element **e
  * @option: option name
  * @value: value (option) or type (section)
  */
-extern int uci_set(struct uci_context *ctx, char *package, char *section, char *option, char *value);
+extern int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value);
+
+/**
+ * uci_rename: Rename an element
+ * @ctx: uci context
+ * @package: package name
+ * @section: section name
+ * @option: option name
+ * @name: new name
+ */
+extern int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *name);
+
+/**
+ * uci_delete_element: Delete a section or option
+ * @ctx: uci context
+ * @e: element (section or option)
+ */
+extern int uci_delete_element(struct uci_context *ctx, struct uci_element *e);
+
+/**
+ * uci_delete: Delete a section or option
+ * @ctx: uci context
+ * @p: uci package
+ * @section: section name
+ * @option: option name (optional)
+ */
+extern int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, char *option);
 
 /**
  * uci_save: save change history for a package
@@ -185,16 +213,19 @@ extern int uci_save(struct uci_context *ctx, struct uci_package *p);
 /**
  * uci_commit: commit changes to a package
  * @ctx: uci context
- * @p: uci_package struct
+ * @p: uci_package struct pointer
+ *
+ * committing may reload the whole uci_package data,
+ * the supplied pointer is updated accordingly
  */
-extern int uci_commit(struct uci_context *ctx, struct uci_package *p);
+extern int uci_commit(struct uci_context *ctx, struct uci_package **p);
 
 /**
  * uci_list_configs: List available uci config files
  *
  * @ctx: uci context
  */
-extern char **uci_list_configs(struct uci_context *ctx);
+extern int uci_list_configs(struct uci_context *ctx, char ***list);
 
 /* UCI data structures */
 enum uci_type {
@@ -204,6 +235,11 @@ enum uci_type {
 	UCI_TYPE_OPTION = 3
 };
 
+enum uci_flags {
+	UCI_FLAG_STRICT = (1 << 0), /* strict mode for the parser */
+	UCI_FLAG_PERROR = (1 << 1), /* print error messages to stderr */
+};
+
 struct uci_element
 {
 	struct uci_list list;
@@ -219,6 +255,9 @@ struct uci_context
 	/* parser context, use for error handling only */
 	struct uci_parse_context *pctx;
 
+	/* uci runtime flags */
+	enum uci_flags flags;
+
 	/* private: */
 	int errno;
 	const char *func;
@@ -238,6 +277,7 @@ struct uci_parse_context
 	/* private: */
 	struct uci_package *package;
 	struct uci_section *section;
+	bool merge;
 	FILE *file;
 	const char *name;
 	char *buf;
@@ -262,6 +302,7 @@ struct uci_section
 	struct uci_element e;
 	struct uci_list options;
 	struct uci_package *package;
+	bool anonymous;
 	char *type;
 };
 
@@ -275,7 +316,8 @@ struct uci_option
 enum uci_command {
 	UCI_CMD_ADD,
 	UCI_CMD_REMOVE,
-	UCI_CMD_CHANGE
+	UCI_CMD_CHANGE,
+	UCI_CMD_RENAME
 };
 
 struct uci_history