* 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.
*/
/*
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include <dlfcn.h>
+#include <glob.h>
#include "uci.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_UNKNOWN] = "Unknown error",
};
-static void uci_cleanup(struct uci_context *ctx);
-
#include "uci_internal.h"
-#include "util.c"
#include "list.c"
-#include "history.c"
-#include "file.c"
+
+__private const char *uci_confdir = UCI_CONFDIR;
+__private const char *uci_savedir = UCI_SAVEDIR;
/* exported functions */
struct uci_context *uci_alloc_context(void)
{
struct uci_context *ctx;
- ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
- memset(ctx, 0, sizeof(struct uci_context));
+ ctx = (struct uci_context *) calloc(1, sizeof(struct uci_context));
+ if (!ctx)
+ return NULL;
+
uci_list_init(&ctx->root);
- uci_list_init(&ctx->history_path);
+ uci_list_init(&ctx->delta_path);
uci_list_init(&ctx->backends);
- ctx->flags = UCI_FLAG_STRICT | UCI_FLAG_SAVED_HISTORY;
+ ctx->flags = UCI_FLAG_STRICT | UCI_FLAG_SAVED_DELTA;
ctx->confdir = (char *) uci_confdir;
ctx->savedir = (char *) uci_savedir;
+ uci_add_delta_path(ctx, uci_savedir);
uci_list_add(&ctx->backends, &uci_file_backend.e.list);
ctx->backend = &uci_file_backend;
struct uci_package *p = uci_to_package(e);
uci_free_package(&p);
}
- uci_foreach_element_safe(&ctx->history_path, tmp, e) {
+ uci_foreach_element_safe(&ctx->delta_path, tmp, e) {
uci_free_element(e);
}
- free(ctx);
UCI_TRAP_RESTORE(ctx);
+ free(ctx);
ignore:
return;
return 0;
}
-static void uci_cleanup(struct uci_context *ctx)
+__private void uci_cleanup(struct uci_context *ctx)
{
struct uci_parse_context *pctx;
free(pctx);
}
-void uci_perror(struct uci_context *ctx, const char *prefix)
+void
+uci_perror(struct uci_context *ctx, const char *str)
{
- int err;
+ uci_get_errorstr(ctx, NULL, str);
+}
- if (!ctx)
- err = UCI_ERR_INVAL;
- else
- err = ctx->err;
+void
+uci_get_errorstr(struct uci_context *ctx, char **dest, const char *prefix)
+{
+ static char error_info[128] = { 0 };
+ int err;
+ err = ctx ? ctx->err : UCI_ERR_INVAL;
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) 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\n", uci_errstr[err]);
- break;
+ if (ctx && ctx->pctx && (err == UCI_ERR_PARSE)) {
+ snprintf(error_info, sizeof(error_info) - 1, " (%s) at line %d, byte %zu",
+ (ctx->pctx->reason ? ctx->pctx->reason : "unknown"),
+ ctx->pctx->line, ctx->pctx->byte);
}
+
+ if (!dest) {
+ strcat(error_info, "\n");
+ fprintf(stderr, "%s%s%s%s%s%s",
+ (prefix ? prefix : ""), (prefix ? ": " : ""),
+ (ctx && ctx->func ? ctx->func : ""), (ctx && ctx->func ? ": " : ""),
+ uci_errstr[err],
+ error_info);
+ return;
+ }
+
+ err = asprintf(dest, "%s%s%s%s%s%s",
+ (prefix ? prefix : ""), (prefix ? ": " : ""),
+ (ctx && ctx->func ? ctx->func : ""), (ctx && ctx->func ? ": " : ""),
+ uci_errstr[err],
+ error_info);
+
+ if (err < 0)
+ *dest = NULL;
}
int uci_list_configs(struct uci_context *ctx, char ***list)
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);
return 0;
}
-#ifdef UCI_PLUGIN_SUPPORT
-
-__plugin int uci_add_backend(struct uci_context *ctx, struct uci_backend *b)
-{
- struct uci_element *e;
- UCI_HANDLE_ERR(ctx);
-
- e = uci_lookup_list(&ctx->backends, b->e.name);
- if (e)
- UCI_THROW(ctx, UCI_ERR_DUPLICATE);
-
- e = uci_malloc(ctx, sizeof(struct uci_backend));
- memcpy(e, b, sizeof(struct uci_backend));
-
- uci_list_add(&ctx->backends, &e->list);
- return 0;
-}
-
-__plugin int uci_del_backend(struct uci_context *ctx, struct uci_backend *b)
-{
- struct uci_element *e, *tmp;
-
- UCI_HANDLE_ERR(ctx);
-
- e = uci_lookup_list(&ctx->backends, b->e.name);
- if (!e || uci_to_backend(e)->ptr != b->ptr)
- UCI_THROW(ctx, UCI_ERR_NOTFOUND);
- b = uci_to_backend(e);
-
- if (ctx->backend && ctx->backend->ptr == b->ptr)
- ctx->backend = &uci_file_backend;
-
- uci_foreach_element_safe(&ctx->root, tmp, e) {
- struct uci_package *p = uci_to_package(e);
-
- if (!p->backend)
- continue;
-
- if (p->backend->ptr == b->ptr)
- UCI_INTERNAL(uci_unload, ctx, p);
- }
-
- uci_list_del(&b->e.list);
- free(b);
-
- return 0;
-}
-
-#endif
-
int uci_set_backend(struct uci_context *ctx, const char *name)
{
struct uci_element *e;
projects / project / uci.git / blobdiff