X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=be63247be7da3eec4d5c7472168bd30b7d506ba3;hp=54003c18043a18d74857f32dc60bee1d8762e08e;hb=92f4eac56f3cf1bf21c352193e3bf40723a6e87f;hpb=6e141df7e2a603fcfced2f020e8964492c34a307

diff --git a/file.c b/file.c
index 54003c1..be63247 100644
--- a/file.c
+++ b/file.c
@@ -19,12 +19,23 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdbool.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <ctype.h>
 
 #define LINEBUF	32
 #define LINEBUF_MAX	4096
 
+static void uci_parse_error(struct uci_context *ctx, char *pos, char *reason)
+{
+	struct uci_parse_context *pctx = ctx->pctx;
+
+	pctx->reason = reason;
+	pctx->byte = pos - pctx->buf;
+	UCI_THROW(ctx, UCI_ERR_PARSE);
+}
+
 /*
  * Fetch a new line from the input stream and resize buffer if necessary
  */
@@ -55,11 +66,8 @@ static void uci_getln(struct uci_context *ctx, int offset)
 			return;
 		}
 
-		if (pctx->bufsz > LINEBUF_MAX/2) {
-			pctx->reason = "line too long";
-			pctx->byte = LINEBUF_MAX;
-			UCI_THROW(ctx, UCI_ERR_PARSE);
-		}
+		if (pctx->bufsz > LINEBUF_MAX/2)
+			uci_parse_error(ctx, p, "line too long");
 
 		pctx->bufsz *= 2;
 		pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz);
@@ -84,14 +92,11 @@ static void uci_file_cleanup(struct uci_context *ctx)
 		return;
 
 	ctx->pctx = NULL;
-	if (pctx->cfg) {
-		uci_list_del(&pctx->cfg->list);
-		uci_drop_config(pctx->cfg);
-	}
+	if (pctx->package)
+		uci_free_package(pctx->package);
+
 	if (pctx->buf)
 		free(pctx->buf);
-	if (pctx->file)
-		fclose(pctx->file);
 
 	free(pctx);
 }
@@ -165,9 +170,7 @@ static void parse_double_quote(struct uci_context *ctx, char **str, char **targe
 			break;
 		}
 	}
-	ctx->pctx->reason = "unterminated \"";
-	ctx->pctx->byte = *str - ctx->pctx->buf;
-	UCI_THROW(ctx, UCI_ERR_PARSE);
+	uci_parse_error(ctx, *str, "unterminated \"");
 }
 
 /*
@@ -189,9 +192,7 @@ static void parse_single_quote(struct uci_context *ctx, char **str, char **targe
 			addc(target, str);
 		}
 	}
-	ctx->pctx->reason = "unterminated '";
-	ctx->pctx->byte = *str - ctx->pctx->buf;
-	UCI_THROW(ctx, UCI_ERR_PARSE);
+	uci_parse_error(ctx, *str, "unterminated '");
 }
 
 /*
@@ -235,7 +236,7 @@ done:
 /*
  * extract the next argument from the command line
  */
-static char *next_arg(struct uci_context *ctx, char **str, bool required)
+static char *next_arg(struct uci_context *ctx, char **str, bool required, bool name)
 {
 	char *val;
 	char *ptr;
@@ -243,13 +244,12 @@ static char *next_arg(struct uci_context *ctx, char **str, bool required)
 	val = ptr = *str;
 	skip_whitespace(ctx, str);
 	parse_str(ctx, str, &ptr);
-	if (required && !*val) {
-		ctx->pctx->reason = "insufficient arguments";
-		ctx->pctx->byte = *str - ctx->pctx->buf;
-		UCI_THROW(ctx, UCI_ERR_PARSE);
-	}
+	if (required && !*val)
+		uci_parse_error(ctx, *str, "insufficient arguments");
+	if (name && !uci_validate_name(val))
+		uci_parse_error(ctx, val, "invalid character in field");
 
-	return uci_strdup(ctx, val);
+	return val;
 }
 
 /*
@@ -260,12 +260,9 @@ static void assert_eol(struct uci_context *ctx, char **str)
 {
 	char *tmp;
 
-	tmp = next_arg(ctx, str, false);
-	if (tmp && *tmp) {
-		ctx->pctx->reason = "too many arguments";
-		ctx->pctx->byte = tmp - ctx->pctx->buf;
-		UCI_THROW(ctx, UCI_ERR_PARSE);
-	}
+	tmp = next_arg(ctx, str, false, false);
+	if (tmp && *tmp)
+		uci_parse_error(ctx, *str, "too many arguments");
 }
 
 /* 
@@ -275,16 +272,17 @@ 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;
 	name = pctx->name;
 
 	/* add the last config to main config file list */
-	if (pctx->cfg) {
-		uci_list_add(&ctx->root, &pctx->cfg->list);
+	if (pctx->package) {
+		uci_list_add(&ctx->root, &pctx->package->e.list);
 
-		pctx->cfg = NULL;
+		pctx->package = NULL;
 		pctx->section = NULL;
 	}
 
@@ -295,37 +293,29 @@ static void uci_switch_config(struct uci_context *ctx)
 	 * if an older config under the same name exists, unload it
 	 * ignore errors here, e.g. if the config was not found
 	 */
-	UCI_TRAP_SAVE(ctx, ignore);
-	uci_unload(ctx, name);
-	UCI_TRAP_RESTORE(ctx);
-ignore:
-	ctx->errno = 0;
-
-	pctx->cfg = uci_alloc_config(ctx, name);
+	e = uci_lookup_list(ctx, &ctx->root, name);
+	if (e)
+		UCI_THROW(ctx, UCI_ERR_DUPLICATE);
+	pctx->package = uci_alloc_package(ctx, name);
 }
 
 /*
  * parse the 'package' uci command (next config package)
  */
-static void uci_parse_package(struct uci_context *ctx, char **str)
+static void uci_parse_package(struct uci_context *ctx, char **str, bool single)
 {
 	char *name = NULL;
 
 	/* command string null-terminated by strtok */
 	*str += strlen(*str) + 1;
 
-	UCI_TRAP_SAVE(ctx, error);
-	name = next_arg(ctx, str, true);
+	name = next_arg(ctx, str, true, true);
 	assert_eol(ctx, str);
+	if (single)
+		return;
+
 	ctx->pctx->name = name;
 	uci_switch_config(ctx);
-	UCI_TRAP_RESTORE(ctx);
-	return;
-
-error:
-	if (name)
-		free(name);
-	UCI_THROW(ctx, ctx->errno);
 }
 
 /*
@@ -336,32 +326,20 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
 	char *name = NULL;
 	char *type = NULL;
 
-	if (!ctx->pctx->cfg) {
-		if (!ctx->pctx->name) {
-			ctx->pctx->byte = *str - ctx->pctx->buf;
-			ctx->pctx->reason = "attempting to import a file without a package name";
-			UCI_THROW(ctx, UCI_ERR_PARSE);
-		}
+	if (!ctx->pctx->package) {
+		if (!ctx->pctx->name)
+			uci_parse_error(ctx, *str, "attempting to import a file without a package name");
+
 		uci_switch_config(ctx);
 	}
 
 	/* command string null-terminated by strtok */
 	*str += strlen(*str) + 1;
 
-	UCI_TRAP_SAVE(ctx, error);
-	type = next_arg(ctx, str, true);
-	name = next_arg(ctx, str, false);
+	type = next_arg(ctx, str, true, true);
+	name = next_arg(ctx, str, false, true);
 	assert_eol(ctx, str);
-	ctx->pctx->section = uci_add_section(ctx->pctx->cfg, type, name);
-	UCI_TRAP_RESTORE(ctx);
-	return;
-
-error:
-	if (name)
-		free(name);
-	if (type)
-		free(type);
-	UCI_THROW(ctx, ctx->errno);
+	ctx->pctx->section = uci_alloc_section(ctx->pctx->package, type, name);
 }
 
 /*
@@ -372,50 +350,38 @@ static void uci_parse_option(struct uci_context *ctx, char **str)
 	char *name = NULL;
 	char *value = NULL;
 
-	if (!ctx->pctx->section) {
-		ctx->pctx->byte = *str - ctx->pctx->buf;
-		ctx->pctx->reason = "option command found before the first section";
-		UCI_THROW(ctx, UCI_ERR_PARSE);
-	}
+	if (!ctx->pctx->section)
+		uci_parse_error(ctx, *str, "option command found before the first section");
+
 	/* command string null-terminated by strtok */
 	*str += strlen(*str) + 1;
 
-	UCI_TRAP_SAVE(ctx, error);
-	name = next_arg(ctx, str, true);
-	value = next_arg(ctx, str, true);
+	name = next_arg(ctx, str, true, true);
+	value = next_arg(ctx, str, true, false);
 	assert_eol(ctx, str);
-	uci_add_option(ctx->pctx->section, name, value);
-	UCI_TRAP_RESTORE(ctx);
-	return;
-
-error:
-	if (name)
-		free(name);
-	if (value)
-		free(value);
-	UCI_THROW(ctx, ctx->errno);
+	uci_alloc_option(ctx->pctx->section, name, value);
 }
 
 
 /*
  * parse a complete input line, split up combined commands by ';'
  */
-static void uci_parse_line(struct uci_context *ctx)
+static void uci_parse_line(struct uci_context *ctx, bool single)
 {
 	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]) {
 			case 'p':
 				if ((word[1] == 0) || !strcmp(word + 1, "ackage"))
-					uci_parse_package(ctx, &word);
+					uci_parse_package(ctx, &word, single);
 				break;
 			case 'c':
 				if ((word[1] == 0) || !strcmp(word + 1, "onfig"))
@@ -426,23 +392,21 @@ static void uci_parse_line(struct uci_context *ctx)
 					uci_parse_option(ctx, &word);
 				break;
 			default:
-				pctx->reason = "unterminated command";
-				pctx->byte = word - pctx->buf;
-				UCI_THROW(ctx, UCI_ERR_PARSE);
+				uci_parse_error(ctx, word, "unterminated command");
 				break;
 		}
 	}
 }
 
 /* max number of characters that escaping adds to the string */
-#define UCI_QUOTE_ESCAPE	"'\\'"
+#define UCI_QUOTE_ESCAPE	"'\\''"
 
 /*
  * escape an uci string for export
  */
 static char *uci_escape(struct uci_context *ctx, char *str)
 {
-	char *s, *p, *t;
+	char *s, *p;
 	int pos = 0;
 
 	if (!ctx->buf) {
@@ -479,42 +443,45 @@ static char *uci_escape(struct uci_context *ctx, char *str)
 /*
  * export a single config package to a file stream
  */
-static void uci_export_config(struct uci_config *cfg, FILE *stream)
+static void uci_export_package(struct uci_package *p, FILE *stream, bool header)
 {
-	struct uci_context *ctx = cfg->ctx;
-	struct uci_section *s;
-	struct uci_option *o;
-
-	fprintf(stream, "package '%s'\n", uci_escape(ctx, cfg->name));
-	uci_foreach_entry(section, &cfg->sections, s) {
-		fprintf(stream, "\nconfig '%s'", uci_escape(ctx, s->type));
-		fprintf(stream, " '%s'\n", uci_escape(ctx, s->name));
-		uci_foreach_entry(option, &s->options, o) {
-			fprintf(stream, "\toption '%s'", uci_escape(ctx, o->name));
-			fprintf(stream, " '%s'\n", uci_escape(ctx, o->value));
+	struct uci_context *ctx = p->ctx;
+	struct uci_element *s, *o;
+
+	if (header)
+		fprintf(stream, "package '%s'\n", uci_escape(ctx, p->e.name));
+	uci_foreach_element(&p->sections, s) {
+		struct uci_section *sec = uci_to_section(s);
+		fprintf(stream, "\nconfig '%s'", uci_escape(ctx, sec->type));
+		fprintf(stream, " '%s'\n", uci_escape(ctx, sec->e.name));
+		uci_foreach_element(&sec->options, o) {
+			struct uci_option *opt = uci_to_option(o);
+			fprintf(stream, "\toption '%s'", uci_escape(ctx, opt->e.name));
+			fprintf(stream, " '%s'\n", uci_escape(ctx, opt->value));
 		}
 	}
 	fprintf(stream, "\n");
 }
 
-int uci_export(struct uci_context *ctx, FILE *stream, struct uci_config *cfg)
+int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package, bool header)
 {
+	struct uci_element *e;
+
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, stream != NULL);
 
-	if (cfg) {
-		uci_export_config(cfg, stream);
-		goto done;
+	if (package)
+		uci_export_package(package, stream, header);
+	else {
+		uci_foreach_element(&ctx->root, e) {
+			uci_export_package(uci_to_package(e), stream, header);
+		}
 	}
 
-	uci_foreach_entry(config, &ctx->root, cfg) {
-		uci_export_config(cfg, stream);
-	}
-done:
 	return 0;
 }
 
-int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_config **cfg)
+int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single)
 {
 	struct uci_parse_context *pctx;
 
@@ -535,12 +502,22 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 
 	while (!feof(pctx->file)) {
 		uci_getln(ctx, 0);
+
+		UCI_TRAP_SAVE(ctx, error);
 		if (pctx->buf[0])
-			uci_parse_line(ctx);
+			uci_parse_line(ctx, single);
+		UCI_TRAP_RESTORE(ctx);
+		continue;
+error:
+		if (ctx->flags & UCI_FLAG_PERROR)
+			uci_perror(ctx, NULL);
+		if ((ctx->errno != UCI_ERR_PARSE) ||
+			(ctx->flags & UCI_FLAG_STRICT))
+			UCI_THROW(ctx, ctx->errno);
 	}
 
-	if (cfg)
-		*cfg = pctx->cfg;
+	if (package)
+		*package = pctx->package;
 
 	pctx->name = NULL;
 	uci_switch_config(ctx);
@@ -551,45 +528,314 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 	return 0;
 }
 
-int uci_load(struct uci_context *ctx, const char *name, struct uci_config **cfg)
+/*
+ * open a stream and go to the right position
+ *
+ * note: when opening for write and seeking to the beginning of
+ * the stream, truncate the file
+ */
+static FILE *uci_open_stream(struct uci_context *ctx, const char *filename, int pos, bool write)
 {
 	struct stat statbuf;
+	FILE *file = NULL;
+	int fd, ret;
+
+	if (!write && ((stat(filename, &statbuf) < 0) ||
+		((statbuf.st_mode &  S_IFMT) != S_IFREG))) {
+		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+	}
+
+	fd = open(filename, (write ? O_RDWR | O_CREAT : O_RDONLY));
+	if (fd <= 0)
+		goto error;
+
+	if (flock(fd, (write ? LOCK_EX : LOCK_SH)) < 0)
+		goto error;
+
+	if (write && (pos == SEEK_SET))
+		ret = ftruncate(fd, 0);
+	else
+		ret = lseek(fd, 0, pos);
+
+	if (ret < 0)
+		goto error;
+
+	file = fdopen(fd, (write ? "w" : "r"));
+	if (file)
+		goto done;
+
+error:
+	UCI_THROW(ctx, UCI_ERR_IO);
+done:
+	return file;
+}
+
+static void uci_close_stream(FILE *stream)
+{
+	int fd;
+
+	if (!stream)
+		return;
+
+	fd = fileno(stream);
+	flock(fd, LOCK_UN);
+	fclose(stream);
+}
+
+static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *p, char *buf)
+{
+	bool delete = false;
+	char *package = NULL;
+	char *section = NULL;
+	char *option = NULL;
+	char *value = NULL;
+
+	if (buf[0] == '-') {
+		delete = true;
+		buf++;
+	}
+
+	UCI_INTERNAL(uci_parse_tuple, ctx, buf, &package, &section, &option, &value);
+	if (!package || !section || (!delete && !value))
+		goto error;
+	if (strcmp(package, p->e.name) != 0)
+		goto error;
+	if (!uci_validate_name(section))
+		goto error;
+	if (option && !uci_validate_name(option))
+		goto error;
+
+	if (delete)
+		UCI_INTERNAL(uci_del, ctx, p, section, option);
+	else
+		UCI_INTERNAL(uci_set, ctx, p, section, option, value);
+
+	return;
+error:
+	UCI_THROW(ctx, UCI_ERR_PARSE);
+}
+
+static void uci_parse_history(struct uci_context *ctx, FILE *stream, struct uci_package *p)
+{
+	struct uci_parse_context *pctx;
+
+	/* make sure no memory from previous parse attempts is leaked */
+	uci_file_cleanup(ctx);
+
+	pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
+	ctx->pctx = pctx;
+	pctx->file = stream;
+
+	rewind(stream);
+	while (!feof(pctx->file)) {
+		uci_getln(ctx, 0);
+		if (!pctx->buf[0])
+			continue;
+		uci_parse_history_line(ctx, p, pctx->buf);
+	}
+
+	/* no error happened, we can get rid of the parser context now */
+	uci_file_cleanup(ctx);
+}
+
+static void uci_load_history(struct uci_context *ctx, struct uci_package *p)
+{
+	char *filename = NULL;
+	FILE *f = NULL;
+
+	if (!p->confdir)
+		return;
+	if ((asprintf(&filename, "%s/%s", UCI_SAVEDIR, p->e.name) < 0) || !filename)
+		UCI_THROW(ctx, UCI_ERR_MEM);
+
+	UCI_TRAP_SAVE(ctx, done);
+	f = uci_open_stream(ctx, filename, SEEK_SET, false);
+	uci_parse_history(ctx, f, p);
+	UCI_TRAP_RESTORE(ctx);
+done:
+	if (filename)
+		free(filename);
+	uci_close_stream(f);
+	ctx->errno = 0;
+}
+
+int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package)
+{
 	char *filename;
-	bool confpath;
-	FILE *file;
+	bool confdir;
+	FILE *file = NULL;
 
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, name != NULL);
 
-ignore:
-	ctx->errno = 0;
-
 	switch (name[0]) {
 	case '.':
+		/* relative path outside of /etc/config */
+		if (name[1] != '/')
+			UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+		/* fall through */
 	case '/':
-		/* absolute/relative path outside of /etc/config */
-		filename = (char *) name;
-		confpath = false;
+		/* absolute path outside of /etc/config */
+		filename = uci_strdup(ctx, name);
+		name = strrchr(name, '/') + 1;
+		confdir = false;
 		break;
 	default:
+		/* config in /etc/config */
+		if (strchr(name, '/'))
+			UCI_THROW(ctx, UCI_ERR_INVAL);
 		filename = uci_malloc(ctx, strlen(name) + sizeof(UCI_CONFDIR) + 2);
 		sprintf(filename, UCI_CONFDIR "/%s", name);
-		confpath = true;
+		confdir = true;
 		break;
 	}
 
-	if ((stat(filename, &statbuf) < 0) ||
-		((statbuf.st_mode &  S_IFMT) != S_IFREG)) {
-		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+	file = uci_open_stream(ctx, filename, SEEK_SET, false);
+	ctx->errno = 0;
+	UCI_TRAP_SAVE(ctx, done);
+	uci_import(ctx, file, name, package, true);
+	UCI_TRAP_RESTORE(ctx);
+
+	if (*package) {
+		(*package)->path = filename;
+		(*package)->confdir = confdir;
+		uci_load_history(ctx, *package);
 	}
 
-	file = fopen(filename, "r");
-	if (filename != name)
+done:
+	uci_close_stream(file);
+	return ctx->errno;
+}
+
+int uci_save(struct uci_context *ctx, struct uci_package *p)
+{
+	FILE *f = NULL;
+	char *filename = NULL;
+	struct uci_element *e, *tmp;
+
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, p != NULL);
+
+	/* 
+	 * if the config file was outside of the /etc/config path,
+	 * don't save the history to a file, update the real file
+	 * directly
+	 */
+	if (!p->confdir)
+		return uci_commit(ctx, p);
+
+	if (uci_list_empty(&p->history))
+		return 0;
+
+	if ((asprintf(&filename, "%s/%s", UCI_SAVEDIR, p->e.name) < 0) || !filename)
+		UCI_THROW(ctx, UCI_ERR_MEM);
+
+	ctx->errno = 0;
+	UCI_TRAP_SAVE(ctx, done);
+	f = uci_open_stream(ctx, filename, SEEK_END, true);
+	UCI_TRAP_RESTORE(ctx);
+
+	uci_foreach_element_safe(&p->history, tmp, e) {
+		struct uci_history *h = uci_to_history(e);
+
+		if (h->cmd == UCI_CMD_REMOVE)
+			fprintf(f, "-");
+
+		fprintf(f, "%s.%s", p->e.name, h->section);
+		if (e->name)
+			fprintf(f, ".%s", e->name);
+
+		if (h->cmd == UCI_CMD_REMOVE)
+			fprintf(f, "\n");
+		else
+			fprintf(f, "=%s\n", h->value);
+		uci_list_del(&e->list);
+	}
+
+done:
+	uci_close_stream(f);
+	if (filename)
 		free(filename);
+	if (ctx->errno)
+		UCI_THROW(ctx, ctx->errno);
 
-	if (!file)
-		UCI_THROW(ctx, UCI_ERR_IO);
+	return 0;
+}
 
-	return uci_import(ctx, file, name, cfg);
+int uci_commit(struct uci_context *ctx, struct uci_package *p)
+{
+	FILE *f = NULL;
+
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, p != NULL);
+	UCI_ASSERT(ctx, p->path != NULL);
+
+	f = uci_open_stream(ctx, p->path, SEEK_SET, true);
+
+	UCI_TRAP_SAVE(ctx, done);
+	uci_export(ctx, f, p, false);
+	UCI_TRAP_RESTORE(ctx);
+
+done:
+	uci_close_stream(f);
+	if (ctx->errno)
+		UCI_THROW(ctx, ctx->errno);
+
+	return 0;
+}
+
+
+/* 
+ * 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 = uci_malloc(ctx, 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;
 }