X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=eb7470c459c771e731cc6897f840d0c6ffc2b7a0;hp=97bff7d337d620ddd130d307370764b8b69d57cc;hb=32815cf4959c3219b8b6051efcf045c0d829dc10;hpb=9080634cc6339051c5a9943be181888b0e994cd2 diff --git a/uci.h b/uci.h index 97bff7d..eb7470c 100644 --- a/uci.h +++ b/uci.h @@ -9,7 +9,7 @@ * 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 @@ -33,6 +33,7 @@ extern "C" { #include #include #include +#include #define UCI_CONFDIR "/etc/config" #define UCI_SAVEDIR "/tmp/.uci" @@ -60,8 +61,6 @@ struct uci_list }; struct uci_ptr; -struct uci_plugin; -struct uci_hook_ops; struct uci_element; struct uci_package; struct uci_section; @@ -69,6 +68,7 @@ struct uci_option; struct uci_delta; struct uci_context; struct uci_backend; +struct uci_parse_option; struct uci_parse_context; @@ -186,6 +186,14 @@ extern int uci_set(struct uci_context *ctx, struct uci_ptr *ptr); extern int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr); /** + * uci_del_list: Remove a string from an element list + * @ctx: uci context + * @ptr: uci pointer (with value) + * + */ +extern int uci_del_list(struct uci_context *ctx, struct uci_ptr *ptr); + +/** * uci_reorder: Reposition a section * @ctx: uci context * @s: uci section to reposition @@ -254,6 +262,8 @@ extern int uci_set_confdir(struct uci_context *ctx, const char *dir); * * This function allows you to add directories, which contain 'overlays' * for the active config, that will never be committed. + * Caller of this API should ensure that no duplicate entries (including the + * default search path, e.g. `UCI_SAVEDIR') should be added. */ extern int uci_add_delta_path(struct uci_context *ctx, const char *dir); @@ -291,42 +301,6 @@ extern int uci_set_backend(struct uci_context *ctx, const char *name); */ extern bool uci_validate_text(const char *str); - -/** - * uci_add_hook: add a uci hook - * @ctx: uci context - * @ops: uci hook ops - * - * NB: allocated and freed by the caller - */ -extern int uci_add_hook(struct uci_context *ctx, const struct uci_hook_ops *ops); - -/** - * uci_remove_hook: remove a uci hook - * @ctx: uci context - * @ops: uci hook ops - */ -extern int uci_remove_hook(struct uci_context *ctx, const struct uci_hook_ops *ops); - -/** - * uci_load_plugin: load an uci plugin - * @ctx: uci context - * @filename: path to the uci plugin - * - * NB: plugin will be unloaded automatically when the context is freed - */ -int uci_load_plugin(struct uci_context *ctx, const char *filename); - -/** - * uci_load_plugins: load all uci plugins from a directory - * @ctx: uci context - * @pattern: pattern of uci plugin files (optional) - * - * if pattern is NULL, then uci_load_plugins will call uci_load_plugin - * for uci_*.so in /lib/ - */ -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 @@ -348,6 +322,23 @@ int uci_parse_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str); */ 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 + */ +uint32_t uci_hash_options(struct uci_option **tb, int n_opts); + /* UCI data structures */ enum uci_type { @@ -360,7 +351,6 @@ enum uci_type { UCI_TYPE_BACKEND = 6, UCI_TYPE_ITEM = 7, UCI_TYPE_HOOK = 8, - UCI_TYPE_PLUGIN = 9, }; enum uci_option_type { @@ -422,9 +412,6 @@ struct uci_context bool internal, nested; char *buf; int bufsz; - - struct uci_list hooks; - struct uci_list plugins; }; struct uci_package @@ -470,6 +457,7 @@ enum uci_command { UCI_CMD_RENAME, UCI_CMD_REORDER, UCI_CMD_LIST_ADD, + UCI_CMD_LIST_DEL, }; struct uci_delta @@ -500,29 +488,9 @@ struct uci_ptr const char *value; }; -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_delta *e); -}; - -struct uci_hook -{ - struct uci_element e; - const struct uci_hook_ops *ops; -}; - -struct uci_plugin_ops -{ - int (*attach)(struct uci_context *ctx); - void (*detach)(struct uci_context *ctx); -}; - -struct uci_plugin -{ - struct uci_element e; - const struct uci_plugin_ops *ops; - void *dlh; +struct uci_parse_option { + const char *name; + enum uci_option_type type; }; @@ -595,8 +563,6 @@ struct uci_plugin #define uci_type_package UCI_TYPE_PACKAGE #define uci_type_section UCI_TYPE_SECTION #define uci_type_option UCI_TYPE_OPTION -#define uci_type_hook UCI_TYPE_HOOK -#define uci_type_plugin UCI_TYPE_PLUGIN /* element typecasting */ #ifdef UCI_DEBUG_TYPECAST @@ -606,8 +572,6 @@ static const char *uci_typestr[] = { [uci_type_package] = "package", [uci_type_section] = "section", [uci_type_option] = "option", - [uci_type_hook] = "hook", - [uci_type_plugin] = "plugin", }; static void uci_typecast_error(int from, int to) @@ -629,8 +593,6 @@ BUILD_CAST(delta) BUILD_CAST(package) BUILD_CAST(section) BUILD_CAST(option) -BUILD_CAST(hook) -BUILD_CAST(plugin) #else #define uci_to_backend(ptr) container_of(ptr, struct uci_backend, e) @@ -638,8 +600,6 @@ BUILD_CAST(plugin) #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_to_hook(ptr) container_of(ptr, struct uci_hook, e) -#define uci_to_plugin(ptr) container_of(ptr, struct uci_plugin, e) #endif /**