X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=uci.h;h=035c0513d53c21fb9e376444b9f1d6452010b8c6;hb=HEAD;hp=95d9c0a1ff464a94a4f696130390efe86fc616b8;hpb=2b0ba180280ab7e7cf79a66a6a583064911bfa05;p=uci.git

diff --git a/uci.h b/uci.h
index 95d9c0a..035c051 100644
--- a/uci.h
+++ b/uci.h
@@ -62,7 +62,7 @@ struct uci_element;
 struct uci_package;
 struct uci_section;
 struct uci_option;
-struct uci_history;
+struct uci_delta;
 struct uci_context;
 struct uci_backend;
 struct uci_parse_context;
@@ -73,6 +73,8 @@ struct uci_parse_context;
  */
 extern struct uci_context *uci_alloc_context(void);
 
+extern struct uci_option *uci_alloc_option(struct uci_section *s, const char *name, const char *value);
+
 /**
  * uci_free_context: Free the uci context including all of its data
  */
@@ -104,7 +106,7 @@ extern void uci_get_errorstr(struct uci_context *ctx, char **dest, const char *s
  * @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 
+ * if 'package' points to a non-null struct pointer, enable delta tracking and merge
  */
 extern int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single);
 
@@ -141,7 +143,7 @@ extern int uci_unload(struct uci_context *ctx, struct uci_package *p);
  * @str: uci tuple string to look up
  * @extended: allow extended syntax lookup
  *
- * if extended is set to true, uci_lookup_ptr supports the following 
+ * if extended is set to true, uci_lookup_ptr supports the following
  * extended syntax:
  *
  * Examples:
@@ -162,10 +164,12 @@ extern int uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *st
  */
 extern int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *type, struct uci_section **res);
 
+extern int uci_add_named_section(struct uci_context *ctx, struct uci_package *p, const char *type, const char *name, struct uci_section **res);
+
 /**
  * uci_set: Set an element's value; create the element if necessary
  * @ctx: uci context
- * @ptr: uci pointer 
+ * @ptr: uci pointer
  *
  * The updated/created element is stored in ptr->last
  */
@@ -199,12 +203,12 @@ extern int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr);
 /**
  * uci_delete: Delete a section or option
  * @ctx: uci context
- * @ptr: uci pointer 
+ * @ptr: uci pointer
  */
 extern int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr);
 
 /**
- * uci_save: save change history for a package
+ * uci_save: save change delta for a package
  * @ctx: uci context
  * @p: uci_package struct
  */
@@ -214,7 +218,7 @@ 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 pointer
- * @overwrite: overwrite existing config data and flush history
+ * @overwrite: overwrite existing config data and flush delta
  *
  * committing may reload the whole uci_package data,
  * the supplied pointer is updated accordingly
@@ -229,14 +233,14 @@ extern int uci_commit(struct uci_context *ctx, struct uci_package **p, bool over
  */
 extern int uci_list_configs(struct uci_context *ctx, char ***list);
 
-/** 
- * uci_set_savedir: override the default history save directory
+/**
+ * uci_set_savedir: override the default delta save directory
  * @ctx: uci context
  * @dir: directory name
  */
 extern int uci_set_savedir(struct uci_context *ctx, const char *dir);
 
-/** 
+/**
  * uci_set_savedir: override the default config storage directory
  * @ctx: uci context
  * @dir: directory name
@@ -244,14 +248,14 @@ extern int uci_set_savedir(struct uci_context *ctx, const char *dir);
 extern int uci_set_confdir(struct uci_context *ctx, const char *dir);
 
 /**
- * uci_add_history_path: add a directory to the search path for change history files
+ * uci_add_delta_path: add a directory to the search path for change delta files
  * @ctx: uci context
  * @dir: directory name
  *
  * This function allows you to add directories, which contain 'overlays'
  * for the active config, that will never be committed.
  */
-extern int uci_add_history_path(struct uci_context *ctx, const char *dir);
+extern int uci_add_delta_path(struct uci_context *ctx, const char *dir);
 
 /**
  * uci_revert: revert all changes to a config item
@@ -323,11 +327,32 @@ int uci_load_plugin(struct uci_context *ctx, const char *filename);
  */
 int uci_load_plugins(struct uci_context *ctx, const char *pattern);
 
+/**
+ * uci_parse_ptr: parse a uci string into a uci_ptr
+ * @ctx: uci context
+ * @ptr: target data structure
+ * @str: string to parse
+ *
+ * str is modified by this function
+ */
+int uci_parse_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str);
+
+/**
+ * uci_lookup_next: lookup a child element
+ * @ctx: uci context
+ * @e: target element pointer
+ * @list: list of elements
+ * @name: name of the child element
+ *
+ * if parent is NULL, the function looks up the package with the given name
+ */
+int uci_lookup_next(struct uci_context *ctx, struct uci_element **e, struct uci_list *list, const char *name);
+
 
 /* UCI data structures */
 enum uci_type {
 	UCI_TYPE_UNSPEC = 0,
-	UCI_TYPE_HISTORY = 1,
+	UCI_TYPE_DELTA = 1,
 	UCI_TYPE_PACKAGE = 2,
 	UCI_TYPE_SECTION = 3,
 	UCI_TYPE_OPTION = 4,
@@ -347,7 +372,7 @@ enum uci_flags {
 	UCI_FLAG_STRICT =        (1 << 0), /* strict mode for the parser */
 	UCI_FLAG_PERROR =        (1 << 1), /* print parser error messages */
 	UCI_FLAG_EXPORT_NAME =   (1 << 2), /* when exporting, name unnamed sections */
-	UCI_FLAG_SAVED_HISTORY = (1 << 3), /* store the saved history in memory as well */
+	UCI_FLAG_SAVED_DELTA = (1 << 3), /* store the saved delta in memory as well */
 };
 
 struct uci_element
@@ -387,8 +412,8 @@ struct uci_context
 	char *confdir;
 	char *savedir;
 
-	/* search path for history files */
-	struct uci_list history_path;
+	/* search path for delta files */
+	struct uci_list delta_path;
 
 	/* private: */
 	int err;
@@ -407,15 +432,15 @@ struct uci_package
 	struct uci_element e;
 	struct uci_list sections;
 	struct uci_context *ctx;
-	bool has_history;
+	bool has_delta;
 	char *path;
 
 	/* private: */
 	struct uci_backend *backend;
 	void *priv;
 	int n_section;
-	struct uci_list history;
-	struct uci_list saved_history;
+	struct uci_list delta;
+	struct uci_list saved_delta;
 };
 
 struct uci_section
@@ -447,7 +472,7 @@ enum uci_command {
 	UCI_CMD_LIST_ADD,
 };
 
-struct uci_history
+struct uci_delta
 {
 	struct uci_element e;
 	enum uci_command cmd;
@@ -478,7 +503,7 @@ struct uci_ptr
 struct uci_hook_ops
 {
 	void (*load)(const struct uci_hook_ops *ops, struct uci_package *p);
-	void (*set)(const struct uci_hook_ops *ops, struct uci_package *p, struct uci_history *e);
+	void (*set)(const struct uci_hook_ops *ops, struct uci_package *p, struct uci_delta *e);
 };
 
 struct uci_hook
@@ -566,7 +591,7 @@ struct uci_plugin
 
 /* wrappers for dynamic type handling */
 #define uci_type_backend UCI_TYPE_BACKEND
-#define uci_type_history UCI_TYPE_HISTORY
+#define uci_type_delta UCI_TYPE_DELTA
 #define uci_type_package UCI_TYPE_PACKAGE
 #define uci_type_section UCI_TYPE_SECTION
 #define uci_type_option UCI_TYPE_OPTION
@@ -577,7 +602,7 @@ struct uci_plugin
 #ifdef UCI_DEBUG_TYPECAST
 static const char *uci_typestr[] = {
 	[uci_type_backend] = "backend",
-	[uci_type_history] = "history",
+	[uci_type_delta] = "delta",
 	[uci_type_package] = "package",
 	[uci_type_section] = "section",
 	[uci_type_option] = "option",
@@ -600,7 +625,7 @@ static void uci_typecast_error(int from, int to)
 	}
 
 BUILD_CAST(backend)
-BUILD_CAST(history)
+BUILD_CAST(delta)
 BUILD_CAST(package)
 BUILD_CAST(section)
 BUILD_CAST(option)
@@ -609,7 +634,7 @@ BUILD_CAST(plugin)
 
 #else
 #define uci_to_backend(ptr) container_of(ptr, struct uci_backend, e)
-#define uci_to_history(ptr) container_of(ptr, struct uci_history, e)
+#define uci_to_delta(ptr) container_of(ptr, struct uci_delta, e)
 #define uci_to_package(ptr) container_of(ptr, struct uci_package, e)
 #define uci_to_section(ptr) container_of(ptr, struct uci_section, e)
 #define uci_to_option(ptr)  container_of(ptr, struct uci_option, e)
@@ -630,4 +655,63 @@ BUILD_CAST(plugin)
 #define uci_dataptr(ptr) \
 	(((char *) ptr) + sizeof(*ptr))
 
+/**
+ * uci_lookup_package: look up a package
+ * @ctx: uci context
+ * @name: name of the package
+ */
+static inline struct uci_package *
+uci_lookup_package(struct uci_context *ctx, const char *name)
+{
+	struct uci_element *e = NULL;
+	if (uci_lookup_next(ctx, &e, &ctx->root, name) == 0)
+		return uci_to_package(e);
+	else
+		return NULL;
+}
+
+/**
+ * uci_lookup_section: look up a section
+ * @ctx: uci context
+ * @p: package that the section belongs to
+ * @name: name of the section
+ */
+static inline struct uci_section *
+uci_lookup_section(struct uci_context *ctx, struct uci_package *p, const char *name)
+{
+	struct uci_element *e = NULL;
+	if (uci_lookup_next(ctx, &e, &p->sections, name) == 0)
+		return uci_to_section(e);
+	else
+		return NULL;
+}
+
+/**
+ * uci_lookup_option: look up an option
+ * @ctx: uci context
+ * @section: section that the option belongs to
+ * @name: name of the option
+ */
+static inline struct uci_option *
+uci_lookup_option(struct uci_context *ctx, struct uci_section *s, const char *name)
+{
+	struct uci_element *e = NULL;
+	if (uci_lookup_next(ctx, &e, &s->options, name) == 0)
+		return uci_to_option(e);
+	else
+		return NULL;
+}
+
+static inline const char *
+uci_lookup_option_string(struct uci_context *ctx, struct uci_section *s, const char *name)
+{
+	struct uci_option *o;
+
+	o = uci_lookup_option(ctx, s, name);
+	if (!o || o->type != UCI_TYPE_STRING)
+		return NULL;
+
+	return o->v.string;
+}
+
 #endif