X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=474998505a3fa89ca259281a1708dc2b8b537027;hp=96bebf5ebce0e62599503cff3c14f66a3316eb76;hb=4c95913eae05b8a0b1c8e8e6ff219b9d710d564a;hpb=8f5a6c07caaaf5bd692623d1ed8ffbfa20f564d8 diff --git a/uci.h b/uci.h index 96bebf5..4749985 100644 --- a/uci.h +++ b/uci.h @@ -24,7 +24,12 @@ * */ +#ifdef DEBUG_ALL +#define UCI_DEBUG +#define UCI_DEBUG_TYPECAST +#endif +#include #include #include @@ -42,12 +47,14 @@ enum UCI_ERR_LAST }; +struct uci_list; struct uci_list { - void *next; - void *prev; + struct uci_list *next; + struct uci_list *prev; }; +struct uci_element; struct uci_package; struct uci_section; struct uci_option; @@ -56,14 +63,14 @@ struct uci_parse_context; /** - * uci_alloc: Allocate a new uci context + * uci_alloc_context: Allocate a new uci context */ -extern struct uci_context *uci_alloc(void); +extern struct uci_context *uci_alloc_context(void); /** - * uci_free: Free the uci context including all of its data + * uci_free_context: Free the uci context including all of its data */ -extern void uci_free(struct uci_context *ctx); +extern void uci_free_context(struct uci_context *ctx); /** * uci_perror: Print the last uci error that occured @@ -88,8 +95,9 @@ extern int uci_import(struct uci_context *ctx, FILE *stream, const char *name, s * @ctx: uci context * @stream: output stream * @package: (optional) uci config package to export + * @header: include the package header */ -extern int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package); +extern int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package, bool header); /** * uci_load: Parse an uci config file and store it in the uci context @@ -104,9 +112,9 @@ extern int uci_load(struct uci_context *ctx, const char *name, struct uci_packag * uci_unload: Unload a config file from the uci context * * @ctx: uci context - * @name: name of the config file + * @package: pointer to the uci_package struct */ -extern int uci_unload(struct uci_context *ctx, const char *name); +extern int uci_unload(struct uci_context *ctx, struct uci_package *p); /** * uci_cleanup: Clean up after an error @@ -116,6 +124,48 @@ extern int uci_unload(struct uci_context *ctx, const char *name); extern int uci_cleanup(struct uci_context *ctx); /** + * uci_lookup: Look up an uci element + * + * @ctx: uci context + * @res: where to store the result + * @package: uci_package struct + * @section: config section (optional) + * @option: option to search for (optional) + * + * 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); + +/** + * uci_set_element_value: Replace an element's value with a new one + * @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 + */ +extern int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value); + +/** + * uci_set: Set an element's value; create the element if necessary + * @ctx: uci context + * @package: package name + * @section: section name + * @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); + +/** + * uci_commit: commit changes to a package + * @ctx: uci context + * @p: uci_package struct + */ +extern int uci_commit(struct uci_context *ctx, struct uci_package *p); + +/** * uci_list_configs: List available uci config files * * @ctx: uci context @@ -124,9 +174,9 @@ extern char **uci_list_configs(struct uci_context *ctx); /* UCI data structures */ enum uci_type { - UCI_TYPE_PACKAGE, - UCI_TYPE_SECTION, - UCI_TYPE_OPTION + UCI_TYPE_PACKAGE = 0, + UCI_TYPE_SECTION = 1, + UCI_TYPE_OPTION = 2 }; struct uci_element @@ -146,6 +196,7 @@ struct uci_context /* private: */ int errno; + const char *func; jmp_buf trap; char *buf; int bufsz; @@ -172,8 +223,12 @@ struct uci_package struct uci_element e; struct uci_list sections; struct uci_context *ctx; + bool confdir; + char *path; + /* private: */ int n_section; + struct uci_list history; }; struct uci_section @@ -201,12 +256,9 @@ struct uci_history { struct uci_list list; enum uci_command cmd; - union { - struct uci_element element; - struct uci_package package; - struct uci_section section; - struct uci_option option; - } data; + char *section; + char *option; + char *value; }; /* linked list handling */ @@ -267,34 +319,42 @@ struct uci_history &_ptr->list != (_list); \ _ptr = _tmp, _tmp = list_to_element(_ptr->list.next)) -/* returns true if a list is empty */ +/** + * uci_list_empty: returns true if a list is empty + * @list: list head + */ #define uci_list_empty(list) ((list)->next == (list)) +/* wrappers for dynamic type handling */ +#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_PACKAGE] = "package", - [UCI_TYPE_SECTION] = "section", - [UCI_TYPE_OPTION] = "option" -} + [uci_type_package] = "package", + [uci_type_section] = "section", + [uci_type_option] = "option" +}; static void uci_typecast_error(int from, int to) { fprintf(stderr, "Invalid typecast from '%s' to '%s'\n", uci_typestr[from], uci_typestr[to]); } -#define BUILD_CAST(type, val) \ - static inline struct uci_ ## type *uci_to_ ## type (struct uci_element *e) \ +#define BUILD_CAST(_type) \ + static inline struct uci_ ## _type *uci_to_ ## _type (struct uci_element *e) \ { \ - if (e->type != val) { \ - uci_typecast_error(e->type, val); \ + if (e->type != uci_type_ ## _type) { \ + uci_typecast_error(e->type, uci_type_ ## _type); \ } \ - return (struct uci_ ## type *) e; \ + return (struct uci_ ## _type *) e; \ } -BUILD_CAST(package, UCI_TYPE_PACKAGE) -BUILD_CAST(section, UCI_TYPE_SECTION) -BUILD_CAST(option, UCI_TYPE_OPTION) +BUILD_CAST(package) +BUILD_CAST(section) +BUILD_CAST(option) #else #define uci_to_package(ptr) container_of(ptr, struct uci_package, e) @@ -310,7 +370,7 @@ BUILD_CAST(option, UCI_TYPE_OPTION) * @datasize: additional buffer size to reserve at the end of the struct */ #define uci_alloc_element(ctx, type, name, datasize) \ - uci_to_ ## type (uci_alloc_generic(ctx, name, sizeof(struct uci_ ## type) + datasize)) + uci_to_ ## type (uci_alloc_generic(ctx, uci_type_ ## type, name, sizeof(struct uci_ ## type) + datasize)) #define uci_dataptr(ptr) \ (((char *) ptr) + sizeof(*ptr))