X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=4a56b8a96d72eb56a29de133b58e4a02ba289909;hp=36ef34684539f9ea9ed5b26c20997acb777e95d8;hb=c77adc6e931ca6a669c6798b7839c6af18882f05;hpb=85320f3c5c51c2780f1d33866c931de1739b01ce

diff --git a/file.c b/file.c
index 36ef346..4a56b8a 100644
--- 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>
 
@@ -374,13 +375,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]) {
@@ -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,13 +556,82 @@ 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)
+{
+	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;
+}
+
+