delta: add a simple duplication check when adding delta path.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

diff --git a/delta.c b/delta.c
index 082633b1c2ccd75f6889efe7c46e19091c8b7f4f..b56df5bbc01c5433dd1b6555584f5123f040d9a1 100644 (file)
--- a/delta.c
+++ b/delta.c
@@ -87,6 +87,8 @@ int uci_add_delta_path(struct uci_context *ctx, const char *dir)
 
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, dir != NULL);
+       if (!strcmp(dir, ctx->savedir))
+               return -1;
        e = uci_alloc_generic(ctx, UCI_TYPE_PATH, dir, sizeof(struct uci_element));
        uci_list_add(&ctx->delta_path, &e->list);
 

diff --git a/uci.h b/uci.h
index 36c8890dba0ce9fe86cf4eac8bc43f366720c927..eb7470c459c771e731cc6897f840d0c6ffc2b7a0 100644 (file)
--- a/uci.h
+++ b/uci.h
@@ -262,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);