X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=198ae2a5888a3da88cf69e72b19eb1a54df5cc77;hp=cfcdf3ea8abf6f1bee81584f3088225bd8503117;hb=e1738122f616e3dce498598d55f84fa8a7e2263b;hpb=14654223268133b5e74ee1748cec2374664ac5bf diff --git a/uci.h b/uci.h index cfcdf3e..198ae2a 100644 --- a/uci.h +++ b/uci.h @@ -15,6 +15,8 @@ #ifndef __LIBUCI_H #define __LIBUCI_H +#include "uci_config.h" + /* * you can use these defines to enable debugging behavior for * apps compiled against libuci: @@ -24,18 +26,14 @@ * */ -#ifdef DEBUG_ALL -#define UCI_DEBUG -#define UCI_DEBUG_TYPECAST -#endif - #include #include #include #define UCI_CONFDIR "/etc/config" #define UCI_SAVEDIR "/tmp/.uci" -#define UCI_FILEMODE 0600 +#define UCI_DIRMODE 0700 +#define UCI_FILEMODE 0600 enum { @@ -63,6 +61,7 @@ struct uci_section; struct uci_option; struct uci_history; struct uci_context; +struct uci_backend; struct uci_parse_context; @@ -136,13 +135,6 @@ 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_cleanup: Clean up after an error - * - * @ctx: uci context - */ -extern int uci_cleanup(struct uci_context *ctx); - -/** * uci_lookup: Look up an uci element * * @ctx: uci context @@ -154,7 +146,34 @@ extern int uci_cleanup(struct uci_context *ctx); * 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, char *section, char *option); +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 + * + * @ctx: uci context + * @res: where to store the result + * @ptr: uci pointer tuple + * + * 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. + * + * 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); + +/** + * 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_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 @@ -165,7 +184,15 @@ extern int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct * 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, char *value); +extern int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, const char *value); + +/** + * uci_add_element_list: Append a string to a list option + * @ctx: uci context + * @option: pointer to the uci option element + * @value: string to append + */ +extern int uci_add_element_list(struct uci_context *ctx, struct uci_option *o, const char *value); /** * uci_set: Set an element's value; create the element if necessary @@ -174,8 +201,23 @@ extern int uci_set_element_value(struct uci_context *ctx, struct uci_element **e * @section: section name * @option: option name * @value: value (option) or type (section) + * @result: store the updated element in this variable (optional) + */ +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); + +/** + * uci_add_list: Append a string to an element list + * @ctx: uci context + * @package: package name + * @section: section name + * @option: option name + * @value: string value + * @result: store the updated element in this variable (optional) + * + * Note: if the given option already contains a string, convert it to an 1-element-list + * before appending the next element */ -extern int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value); +extern int uci_add_list(struct uci_context *ctx, struct uci_package *p, const char *section, const char *option, const char *value, struct uci_option **result); /** * uci_rename: Rename an element @@ -201,7 +243,7 @@ extern int uci_delete_element(struct uci_context *ctx, struct uci_element *e); * @section: section name * @option: option name (optional) */ -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_package *p, const char *section, const char *option); /** * uci_save: save change history for a package @@ -224,6 +266,8 @@ extern int uci_commit(struct uci_context *ctx, struct uci_package **p, bool over /** * 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); @@ -258,7 +302,7 @@ extern int uci_add_history_path(struct uci_context *ctx, const char *dir); * @section: section name (optional) * @option option name (optional) */ -extern int uci_revert(struct uci_context *ctx, struct uci_package **p, char *section, char *option); +extern int uci_revert(struct uci_context *ctx, struct uci_package **p, const char *section, const char *option); /** * uci_parse_argument: parse a shell-style argument, with an arbitrary quoting style @@ -269,13 +313,38 @@ extern int uci_revert(struct uci_context *ctx, struct uci_package **p, char *sec */ 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 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_PATH = 4, + UCI_TYPE_BACKEND = 5, + UCI_TYPE_ITEM = 6, +}; + +enum uci_option_type { + UCI_TYPE_STRING = 0, + UCI_TYPE_LIST = 1, }; enum uci_flags { @@ -292,6 +361,18 @@ 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 */ @@ -300,6 +381,10 @@ struct uci_context /* 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; @@ -310,7 +395,7 @@ struct uci_context struct uci_list history_path; /* private: */ - int errno; + int err; const char *func; jmp_buf trap; bool internal; @@ -323,10 +408,12 @@ struct uci_package struct uci_element e; struct uci_list sections; struct uci_context *ctx; - bool confdir; + bool has_history; char *path; /* private: */ + struct uci_backend *backend; + void *priv; int n_section; struct uci_list history; struct uci_list saved_history; @@ -345,14 +432,19 @@ struct uci_option { struct uci_element e; struct uci_section *section; - char *value; + enum uci_option_type type; + union { + struct uci_list list; + char *string; + } v; }; 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 @@ -363,6 +455,7 @@ struct uci_history char *value; }; + /* linked list handling */ #ifndef offsetof #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) @@ -383,9 +476,6 @@ struct uci_history * @_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) @@ -428,6 +518,7 @@ struct uci_history #define uci_list_empty(list) ((list)->next == (list)) /* wrappers for dynamic type handling */ +#define uci_type_backend UCI_TYPE_BACKEND #define uci_type_history UCI_TYPE_HISTORY #define uci_type_package UCI_TYPE_PACKAGE #define uci_type_section UCI_TYPE_SECTION @@ -436,6 +527,7 @@ struct uci_history /* element typecasting */ #ifdef UCI_DEBUG_TYPECAST static const char *uci_typestr[] = { + [uci_type_backend] = "backend", [uci_type_history] = "history", [uci_type_package] = "package", [uci_type_section] = "section", @@ -456,12 +548,14 @@ static void uci_typecast_error(int from, int to) return (struct uci_ ## _type *) e; \ } +BUILD_CAST(backend) BUILD_CAST(history) BUILD_CAST(package) BUILD_CAST(section) BUILD_CAST(option) #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_package(ptr) container_of(ptr, struct uci_package, e) #define uci_to_section(ptr) container_of(ptr, struct uci_section, e)