#include <sys/types.h>
#include <sys/stat.h>
#include <stdbool.h>
+#include <fcntl.h>
#include <stdio.h>
#include <ctype.h>
static void uci_switch_config(struct uci_context *ctx)
{
struct uci_parse_context *pctx;
+ struct uci_element *e;
const char *name;
pctx = ctx->pctx;
* 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;
{
struct stat statbuf;
char *filename;
- bool confpath;
+ bool confdir;
FILE *file;
+ int fd;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, name != NULL);
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;
}
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)
{