tests: add test cases for showing nonexistent section and option.

[project/uci.git] / libuci.c

diff --git a/libuci.c b/libuci.c
index 50c17f9..b17cda1 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -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.
  */
 
 /*
@@ -22,11 +22,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <dlfcn.h>
+#include <glob.h>
 #include "uci.h"
-#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",
@@ -39,13 +37,11 @@ static const char *uci_errstr[] = {
        [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)
@@ -53,11 +49,14 @@ struct uci_context *uci_alloc_context(void)
        struct uci_context *ctx;
 
        ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
+       if (!ctx)
+               return NULL;
+
        memset(ctx, 0, sizeof(struct uci_context));
        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;
+       ctx->flags = UCI_FLAG_STRICT | UCI_FLAG_SAVED_DELTA;
 
        ctx->confdir = (char *) uci_confdir;
        ctx->savedir = (char *) uci_savedir;
@@ -83,11 +82,11 @@ void uci_free_context(struct uci_context *ctx)
                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;
@@ -107,7 +106,7 @@ int uci_set_confdir(struct uci_context *ctx, const char *dir)
        return 0;
 }
 
-static void uci_cleanup(struct uci_context *ctx)
+__private void uci_cleanup(struct uci_context *ctx)
 {
        struct uci_parse_context *pctx;
 
@@ -131,34 +130,59 @@ static void uci_cleanup(struct uci_context *ctx)
        free(pctx);
 }
 
-void uci_perror(struct uci_context *ctx, const char *prefix)
+void
+uci_perror(struct uci_context *ctx, const char *str)
 {
+       uci_get_errorstr(ctx, NULL, str);
+}
+
+void
+uci_get_errorstr(struct uci_context *ctx, char **dest, const char *prefix)
+{
+       static char error_info[128];
        int err;
+       const char *format =
+               "%s%s" /* prefix */
+               "%s%s" /* function */
+               "%s" /* error */
+               "%s"; /* details */
+
+       error_info[0] = 0;
 
        if (!ctx)
                err = UCI_ERR_INVAL;
        else
-               err = ctx->errno;
+               err = ctx->err;
 
        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);
+                       snprintf(error_info, sizeof(error_info) - 1, " (%s) at line %d, byte %d", (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), ctx->pctx->line, ctx->pctx->byte);
                        break;
                }
-               /* fall through */
+               break;
        default:
-               fprintf(stderr, "%s\n", uci_errstr[err]);
                break;
        }
+       if (dest) {
+               err = asprintf(dest, format,
+                       (prefix ? prefix : ""), (prefix ? ": " : ""),
+                       (ctx && ctx->func ? ctx->func : ""), (ctx && ctx->func ? ": " : ""),
+                       uci_errstr[err],
+                       error_info);
+               if (err < 0)
+                       *dest = NULL;
+       } else {
+               strcat(error_info, "\n");
+               fprintf(stderr, format,
+                       (prefix ? prefix : ""), (prefix ? ": " : ""),
+                       (ctx && ctx->func ? ctx->func : ""), (ctx && ctx->func ? ": " : ""),
+                       uci_errstr[err],
+                       error_info);
+       }
 }
 
 int uci_list_configs(struct uci_context *ctx, char ***list)
@@ -185,6 +209,7 @@ int uci_commit(struct uci_context *ctx, struct uci_package **package, bool overw
 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);