X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=601fef5939380ca049480c20d599450171470dea;hp=2ca7fce4580e7cdde690396fd6877cc77b28c7ba;hb=63bc3390aa42f1177da9fb0a71415f31899ae680;hpb=8f5a6c07caaaf5bd692623d1ed8ffbfa20f564d8

diff --git a/file.c b/file.c
index 2ca7fce..601fef5 100644
--- a/file.c
+++ b/file.c
@@ -374,13 +374,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 +413,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) {
@@ -535,9 +535,6 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, name != NULL);
 
-ignore:
-	ctx->errno = 0;
-
 	switch (name[0]) {
 	case '.':
 	case '/':
@@ -567,3 +564,62 @@ ignore:
 	return uci_import(ctx, file, name, package);
 }
 
+/* 
+ * 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;
+}
+
+