#include <sys/types.h>
#include <sys/stat.h>
#include <stdbool.h>
+#include <unistd.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;
/*
* 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;
name = next_arg(ctx, str, true);
assert_eol(ctx, str);
+ if (single)
+ return;
+
ctx->pctx->name = name;
uci_switch_config(ctx);
}
/*
* 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 = NULL;
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"))
}
/* max number of characters that escaping adds to the string */
-#define UCI_QUOTE_ESCAPE "'\\'"
+#define UCI_QUOTE_ESCAPE "'\\''"
/*
* escape an uci string for export
/*
* export a single config package to a file stream
*/
-static void uci_export_package(struct uci_package *p, FILE *stream)
+static void uci_export_package(struct uci_package *p, FILE *stream, bool header)
{
struct uci_context *ctx = p->ctx;
struct uci_element *s, *o;
fprintf(stream, "\n");
}
-int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package)
+int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package, bool header)
{
struct uci_element *e;
UCI_ASSERT(ctx, stream != NULL);
if (package) {
- uci_export_package(package, stream);
+ uci_export_package(package, stream, header);
goto done;
}
uci_foreach_element(&ctx->root, e) {
- uci_export_package(uci_to_package(e), stream);
+ uci_export_package(uci_to_package(e), stream, header);
}
done:
return 0;
}
-int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package)
+int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single)
{
struct uci_parse_context *pctx;
while (!feof(pctx->file)) {
uci_getln(ctx, 0);
if (pctx->buf[0])
- uci_parse_line(ctx);
+ uci_parse_line(ctx, single);
}
if (package)
{
struct stat statbuf;
char *filename;
- bool confpath;
+ bool confdir;
FILE *file;
int fd;
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;
}
}
fd = open(filename, O_RDONLY);
- if (filename != name)
- free(filename);
+ if (fd <= 0)
+ UCI_THROW(ctx, UCI_ERR_IO);
+
+ if (flock(fd, LOCK_SH) < 0)
+ UCI_THROW(ctx, UCI_ERR_IO);
- flock(fd, LOCK_SH);
file = fdopen(fd, "r");
if (!file)
UCI_THROW(ctx, UCI_ERR_IO);
ctx->errno = 0;
UCI_TRAP_SAVE(ctx, done);
- uci_import(ctx, file, name, package);
+ uci_import(ctx, file, name, package, true);
UCI_TRAP_RESTORE(ctx);
+ if (*package) {
+ (*package)->path = filename;
+ (*package)->confdir = confdir;
+ }
+
done:
flock(fd, LOCK_UN);
fclose(file);
return ctx->errno;
}
+int uci_commit(struct uci_context *ctx, struct uci_package *p)
+{
+ FILE *f = NULL;
+ int fd = 0;
+ int err = UCI_ERR_IO;
+
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, p != NULL);
+ UCI_ASSERT(ctx, p->path != NULL);
+
+ fd = open(p->path, O_RDWR);
+ if (fd < 0)
+ goto done;
+
+ if (flock(fd, LOCK_EX) < 0)
+ goto done;
+
+ ftruncate(fd, 0);
+ f = fdopen(fd, "w");
+ if (!f)
+ goto done;
+
+ UCI_TRAP_SAVE(ctx, done);
+ uci_export(ctx, f, p, false);
+ UCI_TRAP_RESTORE(ctx);
+
+done:
+ if (f)
+ fclose(f);
+ else if (fd > 0)
+ close(fd);
+
+ if (ctx->errno)
+ UCI_THROW(ctx, ctx->errno);
+ if (err)
+ UCI_THROW(ctx, UCI_ERR_IO);
+ return 0;
+}
+
+
/*
* This function returns the filename by returning the string
* after the last '/' character. By checking for a non-'\0'