Fix skipping directories in uci_list_config_files

[project/uci.git] / file.c

diff --git a/file.c b/file.c
index 8e6052c..5a8c6cb 100644 (file)
--- a/file.c
+++ b/file.c
@@ -437,8 +437,13 @@ static void uci_parse_config(struct uci_context *ctx)
        } else {
                uci_fill_ptr(ctx, &ptr, &pctx->package->e);
                e = uci_lookup_list(&pctx->package->sections, name);
-               if (e)
+               if (e) {
                        ptr.s = uci_to_section(e);
+
+                       if ((ctx->flags & UCI_FLAG_STRICT) && strcmp(ptr.s->type, type))
+                               uci_parse_error(ctx, "section of different type overwrites prior section with same name");
+               }
+
                ptr.section = name;
                ptr.value = type;
 
@@ -795,9 +800,13 @@ done:
        free(name);
        free(path);
        uci_close_stream(f1);
-       if (do_rename && rename(filename, p->path)) {
-               unlink(filename);
-               UCI_THROW(ctx, UCI_ERR_IO);
+       if (do_rename) {
+               path = realpath(p->path, NULL);
+               if (!path || rename(filename, path)) {
+                       unlink(filename);
+                       UCI_THROW(ctx, UCI_ERR_IO);
+               }
+               free(path);
        }
        free(filename);
        if (ctx->err)
@@ -826,7 +835,7 @@ static char **uci_list_config_files(struct uci_context *ctx)
 {
        char **configs;
        glob_t globbuf;
-       int size, i;
+       int size, i, j, skipped;
        char *buf;
        char *dir;
 
@@ -838,18 +847,22 @@ static char **uci_list_config_files(struct uci_context *ctx)
        }
 
        size = sizeof(char *) * (globbuf.gl_pathc + 1);
+       skipped = 0;
        for(i = 0; i < globbuf.gl_pathc; i++) {
                char *p;
 
                p = get_filename(globbuf.gl_pathv[i]);
-               if (!p)
+               if (!p) {
+                       skipped++;
                        continue;
+               }
 
                size += strlen(p) + 1;
        }
 
-       configs = uci_malloc(ctx, size);
-       buf = (char *) &configs[globbuf.gl_pathc + 1];
+       configs = uci_malloc(ctx, size - skipped);
+       buf = (char *) &configs[globbuf.gl_pathc + 1 - skipped];
+       j = 0;
        for(i = 0; i < globbuf.gl_pathc; i++) {
                char *p;
 
@@ -860,7 +873,7 @@ static char **uci_list_config_files(struct uci_context *ctx)
                if (!uci_validate_package(p))
                        continue;
 
-               configs[i] = buf;
+               configs[j++] = buf;
                strcpy(buf, p);
                buf += strlen(buf) + 1;
        }