fix a typo that was breaking the export

[project/uci.git] / file.c

diff --git a/file.c b/file.c
index 6f43715..8ab40d9 100644 (file)
--- a/file.c
+++ b/file.c
@@ -19,6 +19,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdbool.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <ctype.h>
 
@@ -274,6 +276,7 @@ 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;
@@ -295,7 +298,9 @@ static void uci_switch_config(struct uci_context *ctx)
         * 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;
@@ -406,7 +411,7 @@ static void uci_parse_line(struct uci_context *ctx)
 }
 
 /* max number of characters that escaping adds to the string */
-#define UCI_QUOTE_ESCAPE       "'\\'"
+#define UCI_QUOTE_ESCAPE       "'\\''"
 
 /*
  * escape an uci string for export
@@ -450,7 +455,7 @@ static char *uci_escape(struct uci_context *ctx, char *str)
 /*
  * 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;
@@ -469,7 +474,7 @@ static void uci_export_package(struct uci_package *p, FILE *stream)
        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;
 
@@ -477,12 +482,12 @@ int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *packag
        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;
@@ -529,23 +534,28 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac
 {
        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;
        }
 
@@ -554,16 +564,89 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac
                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;
 }
 
+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'
+ * 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)
 {