X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=da2d15e708d7a171f0a39a3d363f169da064abb6;hp=cb0bc360ab442ee1b0cc4617c6b3674d945df212;hb=c90d9cb8ba073d1c98e61591303aa96300750940;hpb=a1ce94eed364952e8998def4e964ecb6b33b977d diff --git a/libuci.c b/libuci.c index cb0bc36..da2d15e 100644 --- a/libuci.c +++ b/libuci.c @@ -16,92 +16,122 @@ * This file contains some common code for the uci library */ +#define _GNU_SOURCE #include #include #include #include #include #include "uci.h" - -#define DEBUG #include "err.h" +static const char *uci_confdir = UCI_CONFDIR; +static const char *uci_savedir = UCI_SAVEDIR; + static const char *uci_errstr[] = { - [UCI_OK] = "Success", - [UCI_ERR_MEM] = "Out of memory", - [UCI_ERR_INVAL] = "Invalid argument", - [UCI_ERR_NOTFOUND] = "Entry not found", - [UCI_ERR_IO] = "I/O error", - [UCI_ERR_PARSE] = "Parse error", - [UCI_ERR_UNKNOWN] = "Unknown error", + [UCI_OK] = "Success", + [UCI_ERR_MEM] = "Out of memory", + [UCI_ERR_INVAL] = "Invalid argument", + [UCI_ERR_NOTFOUND] = "Entry not found", + [UCI_ERR_IO] = "I/O error", + [UCI_ERR_PARSE] = "Parse error", + [UCI_ERR_DUPLICATE] = "Duplicate entry", + [UCI_ERR_UNKNOWN] = "Unknown error", }; +static void uci_cleanup(struct uci_context *ctx); -/* - * UCI wrapper for malloc, which uses exception handling - */ -static void *uci_malloc(struct uci_context *ctx, size_t size) +#include "uci_internal.h" +#include "util.c" +#include "list.c" +#include "history.c" +#include "file.c" + +/* exported functions */ +struct uci_context *uci_alloc_context(void) { - void *ptr; + struct uci_context *ctx; - ptr = malloc(size); - if (!ptr) - UCI_THROW(ctx, UCI_ERR_MEM); - memset(ptr, 0, size); + ctx = (struct uci_context *) malloc(sizeof(struct uci_context)); + memset(ctx, 0, sizeof(struct uci_context)); + uci_list_init(&ctx->root); + uci_list_init(&ctx->history_path); + uci_list_init(&ctx->backends); + ctx->flags = UCI_FLAG_STRICT; - return ptr; + ctx->confdir = (char *) uci_confdir; + ctx->savedir = (char *) uci_savedir; + + uci_list_add(&ctx->backends, &uci_file_backend.e.list); + ctx->backend = &uci_file_backend; + + return ctx; } -/* - * UCI wrapper for realloc, which uses exception handling - */ -static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size) +void uci_free_context(struct uci_context *ctx) { - ptr = realloc(ptr, size); - if (!ptr) - UCI_THROW(ctx, UCI_ERR_MEM); + struct uci_element *e, *tmp; + + if (ctx->confdir != uci_confdir) + free(ctx->confdir); + if (ctx->savedir != uci_savedir) + free(ctx->savedir); + + uci_cleanup(ctx); + UCI_TRAP_SAVE(ctx, ignore); + uci_foreach_element_safe(&ctx->root, tmp, e) { + struct uci_package *p = uci_to_package(e); + uci_free_package(&p); + } + uci_foreach_element_safe(&ctx->history_path, tmp, e) { + uci_free_element(e); + } + free(ctx); + UCI_TRAP_RESTORE(ctx); - return ptr; +ignore: + return; } -/* - * UCI wrapper for strdup, which uses exception handling - */ -static char *uci_strdup(struct uci_context *ctx, const char *str) +int uci_set_confdir(struct uci_context *ctx, const char *dir) { - char *ptr; + char *cdir; - ptr = strdup(str); - if (!ptr) - UCI_THROW(ctx, UCI_ERR_MEM); + UCI_HANDLE_ERR(ctx); + UCI_ASSERT(ctx, dir != NULL); - return ptr; + cdir = uci_strdup(ctx, dir); + if (ctx->confdir != uci_confdir) + free(ctx->confdir); + ctx->confdir = cdir; + return 0; } -#include "list.c" -#include "parse.c" +static void uci_cleanup(struct uci_context *ctx) +{ + struct uci_parse_context *pctx; -/* externally visible functions */ + if (ctx->buf) { + free(ctx->buf); + ctx->buf = NULL; + ctx->bufsz = 0; + } -struct uci_context *uci_alloc(void) -{ - struct uci_context *ctx; + pctx = ctx->pctx; + if (!pctx) + return; - ctx = (struct uci_context *) malloc(sizeof(struct uci_context)); - memset(ctx, 0, sizeof(struct uci_context)); - uci_list_init(&ctx->root); + ctx->pctx = NULL; + if (pctx->package) + uci_free_package(&pctx->package); - return ctx; -} + if (pctx->buf) + free(pctx->buf); -int uci_cleanup(struct uci_context *ctx) -{ - UCI_HANDLE_ERR(ctx); - uci_parse_cleanup(ctx); - return 0; + free(pctx); } -void uci_perror(struct uci_context *ctx, const char *str) +void uci_perror(struct uci_context *ctx, const char *prefix) { int err; @@ -113,17 +143,53 @@ void uci_perror(struct uci_context *ctx, const char *str) if ((err < 0) || (err >= UCI_ERR_LAST)) err = UCI_ERR_UNKNOWN; + if (prefix) + fprintf(stderr, "%s: ", prefix); + if (ctx->func) + fprintf(stderr, "%s: ", ctx->func); + switch (err) { case UCI_ERR_PARSE: if (ctx->pctx) { - fprintf(stderr, "%s: %s (%s) at line %d, byte %d\n", str, uci_errstr[err], (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), ctx->pctx->line, ctx->pctx->byte); + fprintf(stderr, "%s (%s) at line %d, byte %d\n", uci_errstr[err], (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), ctx->pctx->line, ctx->pctx->byte); break; } /* fall through */ default: - fprintf(stderr, "%s: %s\n", str, uci_errstr[err]); + fprintf(stderr, "%s\n", uci_errstr[err]); break; } } +int uci_list_configs(struct uci_context *ctx, char ***list) +{ + UCI_HANDLE_ERR(ctx); + UCI_ASSERT(ctx, list != NULL); + UCI_ASSERT(ctx, ctx->backend && ctx->backend->list_configs); + *list = ctx->backend->list_configs(ctx); + return 0; +} + +int uci_commit(struct uci_context *ctx, struct uci_package **package, bool overwrite) +{ + UCI_HANDLE_ERR(ctx); + UCI_ASSERT(ctx, package != NULL); + UCI_ASSERT(ctx, *package != NULL); + UCI_ASSERT(ctx, ctx->backend && ctx->backend->commit); + ctx->backend->commit(ctx, package, overwrite); + return 0; +} + +int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package) +{ + struct uci_package *p; + UCI_HANDLE_ERR(ctx); + UCI_ASSERT(ctx, ctx->backend && ctx->backend->load); + p = ctx->backend->load(ctx, name); + if (package) + *package = p; + + return 0; +} +