* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*/
#ifndef __LIBUCI_H
#define __LIBUCI_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "uci_config.h"
+
/*
* you can use these defines to enable debugging behavior for
* apps compiled against libuci:
*
*/
-#ifdef DEBUG_ALL
-#define UCI_DEBUG
-#define UCI_DEBUG_TYPECAST
-#endif
-
#include <stdbool.h>
#include <setjmp.h>
#include <stdio.h>
+#include <stdint.h>
#define UCI_CONFDIR "/etc/config"
#define UCI_SAVEDIR "/tmp/.uci"
-#define UCI_FILEMODE 0600
+#define UCI_DIRMODE 0700
+#define UCI_FILEMODE 0600
enum
{
struct uci_list *prev;
};
+struct uci_ptr;
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_option;
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 void uci_perror(struct uci_context *ctx, const char *str);
+/**
+ * uci_geterror: Get an error string for the last uci error
+ * @ctx: uci context
+ * @dest: target pointer for the string
+ * @str: prefix for the error message
+ *
+ * Note: string must be freed by the caller
+ */
+extern void uci_get_errorstr(struct uci_context *ctx, char **dest, const char *str);
+
/**
* uci_import: Import uci config data from a stream
* @ctx: uci context
* @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);
extern int uci_unload(struct uci_context *ctx, struct uci_package *p);
/**
- * uci_cleanup: Clean up after an error
+ * uci_lookup_ptr: Split an uci tuple string and look up an element tree
+ * @ctx: uci context
+ * @ptr: lookup result struct
+ * @str: uci tuple string to look up
+ * @extended: allow extended syntax lookup
+ *
+ * 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_ptr will automatically load a config package if necessary
+ * @str must not be constant, as it will be modified and used for the strings inside @ptr,
+ * thus it must also be available as long as @ptr is in use.
+ *
+ * This function returns UCI_ERR_NOTFOUND if the package specified in the tuple
+ * string cannot be found. Otherwise it will return UCI_OK.
+ *
+ * Note that failures in looking up other parts, if they are also specfied,
+ * including section and option, will also have a return value UCI_OK but with
+ * ptr->flags * UCI_LOOKUP_COMPLETE not set.
+ */
+extern int uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool extended);
+
+/**
+ * uci_add_section: Add an unnamed section
* @ctx: uci context
+ * @p: package to add the section to
+ * @type: section type
+ * @res: pointer to store a reference to the new section in
*/
-extern int uci_cleanup(struct uci_context *ctx);
+extern int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *type, struct uci_section **res);
/**
- * uci_lookup: Look up an uci element
- *
+ * uci_set: Set an element's value; create the element if necessary
* @ctx: uci context
- * @res: where to store the result
- * @package: uci_package struct
- * @section: config section (optional)
- * @option: option to search for (optional)
+ * @ptr: uci pointer
*
- * 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
+ * The updated/created element is stored in ptr->last
*/
-extern int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *package, char *section, char *option);
+extern int uci_set(struct uci_context *ctx, struct uci_ptr *ptr);
/**
- * uci_set_element_value: Replace an element's value with a new one
+ * uci_add_list: Append a string to an element list
* @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
+ * @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_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value);
+extern int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr);
/**
- * uci_set: Set an element's value; create the element if necessary
+ * uci_del_list: Remove a string from an element list
* @ctx: uci context
- * @package: package name
- * @section: section name
- * @option: option name
- * @value: value (option) or type (section)
+ * @ptr: uci pointer (with value)
+ *
*/
-extern int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value);
+extern int uci_del_list(struct uci_context *ctx, struct uci_ptr *ptr);
/**
- * uci_rename: Rename an element
+ * uci_reorder: Reposition a section
* @ctx: uci context
- * @package: package name
- * @section: section name
- * @option: option name
- * @name: new name
+ * @s: uci section to reposition
+ * @pos: new position in the section list
*/
-extern int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *name);
+extern int uci_reorder_section(struct uci_context *ctx, struct uci_section *s, int pos);
/**
- * 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, char *section, char *option);
+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
*/
* 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
/**
* uci_list_configs: List available uci config files
* @ctx: uci context
+ *
+ * caller is responsible for freeing the allocated memory behind list
*/
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
+ *
+ * This will also try adding the specified dir to the end of delta pathes.
*/
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
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.
+ *
+ * Adding a duplicate directory will cause UCI_ERR_DUPLICATE be returned.
+ */
+extern int uci_add_delta_path(struct uci_context *ctx, const char *dir);
+
+/**
+ * uci_revert: revert all changes to a config item
+ * @ctx: uci context
+ * @ptr: uci pointer
+ */
+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
+ * @ctx: uci context
+ * @stream: input stream
+ * @str: pointer to the current line (use NULL for parsing the next line)
+ * @result: pointer for the result
+ */
+extern int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char **result);
+
+/**
+ * uci_set_backend: change the default backend
+ * @ctx: uci context
+ * @name: name of the backend
+ *
+ * The default backend is "file", which uses /etc/config for config storage
+ */
+extern int uci_set_backend(struct uci_context *ctx, const char *name);
+
+/**
+ * uci_validate_text: validate a value string for uci options
+ * @str: value
+ *
+ * this function checks whether a given string is acceptable as value
+ * for uci options
+ */
+extern bool uci_validate_text(const char *str);
+
+/**
+ * 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_parse_section: look up a set of options
+ * @s: uci section
+ * @opts: list of options to look up
+ * @n_opts: number of options to look up
+ * @tb: array of pointers to found options
+ */
+void uci_parse_section(struct uci_section *s, const struct uci_parse_option *opts,
+ int n_opts, struct uci_option **tb);
+
+/**
+ * uci_hash_options: build a hash over a list of options
+ * @tb: list of option pointers
+ * @n_opts: number of options
*/
-extern int uci_add_history_path(struct uci_context *ctx, const char *dir);
+uint32_t uci_hash_options(struct uci_option **tb, int n_opts);
+
/* 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_UNSPEC = 0,
+ UCI_TYPE_DELTA = 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,
+ UCI_TYPE_HOOK = 8,
+};
+
+enum uci_option_type {
+ UCI_TYPE_STRING = 0,
+ UCI_TYPE_LIST = 1,
};
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_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_DELTA = (1 << 3), /* store the saved delta in memory as well */
};
struct uci_element
char *name;
};
+struct uci_backend
+{
+ struct uci_element e;
+ char **(*list_configs)(struct uci_context *ctx);
+ struct uci_package *(*load)(struct uci_context *ctx, const char *name);
+ void (*commit)(struct uci_context *ctx, struct uci_package **p, bool overwrite);
+
+ /* private: */
+ const void *ptr;
+ void *priv;
+};
+
struct uci_context
{
/* list of config packages */
/* parser context, use for error handling only */
struct uci_parse_context *pctx;
+ /* backend for import and export */
+ struct uci_backend *backend;
+ struct uci_list backends;
+
/* uci runtime flags */
enum uci_flags flags;
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 errno;
+ int err;
const char *func;
jmp_buf trap;
- bool internal;
- char *buf;
- int bufsz;
-};
-
-struct uci_parse_context
-{
- /* error context */
- const char *reason;
- int line;
- int byte;
-
- /* private: */
- struct uci_package *package;
- struct uci_section *section;
- bool merge;
- FILE *file;
- const char *name;
+ bool internal, nested;
char *buf;
int bufsz;
};
struct uci_element e;
struct uci_list sections;
struct uci_context *ctx;
- bool confdir;
+ bool has_delta;
char *path;
/* private: */
+ struct uci_backend *backend;
+ void *priv;
int n_section;
- struct uci_list history;
+ struct uci_list delta;
+ struct uci_list saved_delta;
};
struct uci_section
{
struct uci_element e;
struct uci_section *section;
- char *value;
+ enum uci_option_type type;
+ union {
+ struct uci_list list;
+ char *string;
+ } v;
};
+/*
+ * UCI_CMD_ADD is used for anonymous sections or list values
+ */
enum uci_command {
UCI_CMD_ADD,
UCI_CMD_REMOVE,
UCI_CMD_CHANGE,
- UCI_CMD_RENAME
+ UCI_CMD_RENAME,
+ UCI_CMD_REORDER,
+ UCI_CMD_LIST_ADD,
+ UCI_CMD_LIST_DEL,
+ __UCI_CMD_MAX,
+ __UCI_CMD_LAST = __UCI_CMD_MAX - 1
};
+extern char const uci_command_char[];
-struct uci_history
+struct uci_delta
{
struct uci_element e;
enum uci_command cmd;
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;
+};
+
+struct uci_parse_option {
+ const char *name;
+ enum uci_option_type type;
+};
+
+
/* linked list handling */
#ifndef offsetof
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
* @type: the type of the container struct this is embedded in.
* @member: the name of the member within the struct.
*/
+#ifndef container_of
#define container_of(ptr, type, member) \
((type *) ((char *)ptr - offsetof(type,member)))
+#endif
/**
* @_type: config, section or option
* @_ptr: pointer to the uci_list struct
*/
-#define element_to(type, ptr) \
- container_of(ptr, struct uci_ ## type, e)
-
#define list_to_element(ptr) \
container_of(ptr, struct uci_element, list)
#define uci_list_empty(list) ((list)->next == (list))
/* wrappers for dynamic type handling */
-#define uci_type_history UCI_TYPE_HISTORY
+#define uci_type_backend UCI_TYPE_BACKEND
+#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
/* element typecasting */
#ifdef UCI_DEBUG_TYPECAST
static const char *uci_typestr[] = {
- [uci_type_history] = "history",
+ [uci_type_backend] = "backend",
+ [uci_type_delta] = "delta",
[uci_type_package] = "package",
[uci_type_section] = "section",
[uci_type_option] = "option",
return (struct uci_ ## _type *) e; \
}
-BUILD_CAST(history)
+BUILD_CAST(backend)
+BUILD_CAST(delta)
BUILD_CAST(package)
BUILD_CAST(section)
BUILD_CAST(option)
#else
-#define uci_to_history(ptr) container_of(ptr, struct uci_history, e)
+#define uci_to_backend(ptr) container_of(ptr, struct uci_backend, 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)
#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;
+}
+
+#ifndef BITS_PER_LONG
+#define BITS_PER_LONG (8 * sizeof(unsigned long))
+#endif
+
+static inline void uci_bitfield_set(unsigned long *bits, int bit)
+{
+ bits[bit / BITS_PER_LONG] |= (1UL << (bit % BITS_PER_LONG));
+}
+
+#ifdef __cplusplus
+}
+#endif
+
#endif