add shared locking for uci_load

[project/uci.git] / file.c

diff --git a/file.c b/file.c
index 6f43715..4a56b8a 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>
 
@@ -531,6 +532,7 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac
        char *filename;
        bool confpath;
        FILE *file;
+       int fd;
 
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, name != NULL);
@@ -554,16 +556,42 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac
                UCI_THROW(ctx, UCI_ERR_NOTFOUND);
        }
 
-       file = fopen(filename, "r");
+       fd = open(filename, O_RDONLY);
        if (filename != name)
                free(filename);
 
+       flock(fd, LOCK_SH);
+       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);
+
+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)
 {