add an extra check

[project/uci.git] / file.c

diff --git a/file.c b/file.c
index 2ca7fce..4650a96 100644 (file)
--- a/file.c
+++ b/file.c
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdbool.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <ctype.h>
 
@@ -274,6 +275,7 @@ static void assert_eol(struct uci_context *ctx, char **str)
 static void uci_switch_config(struct uci_context *ctx)
 {
        struct uci_parse_context *pctx;
+       struct uci_element *e;
        const char *name;
 
        pctx = ctx->pctx;
@@ -295,7 +297,9 @@ static void uci_switch_config(struct uci_context *ctx)
         * ignore errors here, e.g. if the config was not found
         */
        UCI_TRAP_SAVE(ctx, ignore);
-       uci_unload(ctx, name);
+       e = uci_lookup_list(ctx, &ctx->root, name);
+       if (e)
+               uci_unload(ctx, uci_to_package(e));
        UCI_TRAP_RESTORE(ctx);
 ignore:
        ctx->errno = 0;
@@ -374,13 +378,13 @@ static void uci_parse_option(struct uci_context *ctx, char **str)
 static void uci_parse_line(struct uci_context *ctx)
 {
        struct uci_parse_context *pctx = ctx->pctx;
-       char *word, *brk;
+       char *word, *brk = NULL;
 
        for (word = strtok_r(pctx->buf, ";", &brk);
                 word;
                 word = strtok_r(NULL, ";", &brk)) {
 
-               char *pbrk;
+               char *pbrk = NULL;
                word = strtok_r(word, " \t", &pbrk);
 
                switch(word[0]) {
@@ -413,7 +417,7 @@ static void uci_parse_line(struct uci_context *ctx)
  */
 static char *uci_escape(struct uci_context *ctx, char *str)
 {
-       char *s, *p, *t;
+       char *s, *p;
        int pos = 0;
 
        if (!ctx->buf) {
@@ -529,26 +533,28 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac
 {
        struct stat statbuf;
        char *filename;
-       bool confpath;
+       bool confdir;
        FILE *file;
+       int fd;
 
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, name != NULL);
 
-ignore:
-       ctx->errno = 0;
-
        switch (name[0]) {
        case '.':
+               if (name[1] != '/')
+                       UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+               /* fall through */
        case '/':
                /* absolute/relative path outside of /etc/config */
-               filename = (char *) name;
-               confpath = false;
+               filename = uci_strdup(ctx, name);
+               name = strrchr(name, '/') + 1;
+               confdir = false;
                break;
        default:
                filename = uci_malloc(ctx, strlen(name) + sizeof(UCI_CONFDIR) + 2);
                sprintf(filename, UCI_CONFDIR "/%s", name);
-               confpath = true;
+               confdir = true;
                break;
        }
 
@@ -557,13 +563,89 @@ ignore:
                UCI_THROW(ctx, UCI_ERR_NOTFOUND);
        }
 
-       file = fopen(filename, "r");
-       if (filename != name)
-               free(filename);
+       fd = open(filename, O_RDONLY);
+       if (fd <= 0)
+               UCI_THROW(ctx, UCI_ERR_IO);
 
+       if (flock(fd, LOCK_SH) < 0)
+               UCI_THROW(ctx, UCI_ERR_IO);
+
+       file = fdopen(fd, "r");
        if (!file)
                UCI_THROW(ctx, UCI_ERR_IO);
 
-       return uci_import(ctx, file, name, package);
+       ctx->errno = 0;
+       UCI_TRAP_SAVE(ctx, done);
+       uci_import(ctx, file, name, package);
+       UCI_TRAP_RESTORE(ctx);
+
+       if (*package) {
+               (*package)->path = filename;
+               (*package)->confdir = confdir;
+       }
+
+done:
+       flock(fd, LOCK_UN);
+       fclose(file);
+       return ctx->errno;
+}
+
+/* 
+ * This function returns the filename by returning the string
+ * after the last '/' character. By checking for a non-'\0'
+ * character afterwards, directories are ignored (glob marks
+ * those with a trailing '/'
+ */
+static inline char *get_filename(char *path)
+{
+       char *p;
+
+       p = strrchr(path, '/');
+       p++;
+       if (!*p)
+               return NULL;
+       return p;
 }
 
+char **uci_list_configs(struct uci_context *ctx)
+{
+       char **configs;
+       glob_t globbuf;
+       int size, i;
+       char *buf;
+
+       if (glob(UCI_CONFDIR "/*", GLOB_MARK, NULL, &globbuf) != 0)
+               return NULL;
+
+       size = sizeof(char *) * (globbuf.gl_pathc + 1);
+       for(i = 0; i < globbuf.gl_pathc; i++) {
+               char *p;
+
+               p = get_filename(globbuf.gl_pathv[i]);
+               if (!p)
+                       continue;
+
+               size += strlen(p) + 1;
+       }
+
+       configs = malloc(size);
+       if (!configs)
+               return NULL;
+
+       memset(configs, 0, size);
+       buf = (char *) &configs[globbuf.gl_pathc + 1];
+       for(i = 0; i < globbuf.gl_pathc; i++) {
+               char *p;
+
+               p = get_filename(globbuf.gl_pathv[i]);
+               if (!p)
+                       continue;
+
+               configs[i] = buf;
+               strcpy(buf, p);
+               buf += strlen(buf) + 1;
+       }
+       return configs;
+}
+
+