file: preserve original file mode after commit

[project/uci.git] / file.c

diff --git a/file.c b/file.c
index 494c6491cb80b68c2967cf2fc462b1004f188283..6486de9c422971e6b886a2b5f2f9ef2fd0200423 100644 (file)
--- a/file.c
+++ b/file.c
@@ -28,6 +28,7 @@
 #include <glob.h>
 #include <string.h>
 #include <stdlib.h>
+#include <errno.h>
 
 #include "uci.h"
 #include "uci_internal.h"
@@ -408,7 +409,6 @@ static void uci_parse_config(struct uci_context *ctx)
        char *name;
        char *type;
 
-       uci_fixup_section(ctx, ctx->pctx->section);
        if (!ctx->pctx->package) {
                if (!ctx->pctx->name)
                        uci_parse_error(ctx, "attempting to import a file without a package name");
@@ -425,9 +425,9 @@ static void uci_parse_config(struct uci_context *ctx)
                uci_parse_error(ctx, "invalid character in type field");
 
        ofs_name = next_arg(ctx, false, true, false);
+       assert_eol(ctx);
        type = pctx_str(pctx, ofs_type);
        name = pctx_str(pctx, ofs_name);
-       assert_eol(ctx);
 
        if (!name || !name[0]) {
                ctx->internal = !pctx->merge;
@@ -471,9 +471,9 @@ static void uci_parse_option(struct uci_context *ctx, bool list)
 
        ofs_name = next_arg(ctx, true, true, false);
        ofs_value = next_arg(ctx, false, false, false);
+       assert_eol(ctx);
        name = pctx_str(pctx, ofs_name);
        value = pctx_str(pctx, ofs_value);
-       assert_eol(ctx);
 
        uci_fill_ptr(ctx, &ptr, &pctx->section->e);
        e = uci_lookup_list(&pctx->section->options, name);
@@ -569,7 +569,7 @@ static const char *uci_escape(struct uci_context *ctx, const char *str)
                len = end - str;
 
                /* make sure that we have enough room in the buffer */
-               while (ofs + len + sizeof(UCI_QUOTE_ESCAPE) + 1 > ctx->bufsz) {
+               while (ofs + len + (int) sizeof(UCI_QUOTE_ESCAPE) + 1 > ctx->bufsz) {
                        ctx->bufsz *= 2;
                        ctx->buf = uci_realloc(ctx, ctx->buf, ctx->bufsz);
                }
@@ -689,7 +689,6 @@ error:
                        UCI_THROW(ctx, ctx->err);
        }
 
-       uci_fixup_section(ctx, ctx->pctx->section);
        if (!pctx->package && name)
                uci_switch_config(ctx);
        if (package)
@@ -722,11 +721,12 @@ static void uci_file_commit(struct uci_context *ctx, struct uci_package **packag
 {
        struct uci_package *p = *package;
        FILE *f1, *f2 = NULL;
-       char *name = NULL;
-       char *path = NULL;
+       char *volatile name = NULL;
+       char *volatile path = NULL;
        char *filename = NULL;
        struct stat statbuf;
-       bool do_rename = false;
+       volatile bool do_rename = false;
+       int fd;
 
        if (!p->path) {
                if (overwrite)
@@ -772,18 +772,20 @@ static void uci_file_commit(struct uci_context *ctx, struct uci_package **packag
                        goto done;
        }
 
-       if (!mktemp(filename))
-               *filename = 0;
+       fd = mkstemp(filename);
+       if (fd == -1)
+               UCI_THROW(ctx, UCI_ERR_IO);
 
-       if (!*filename) {
-               free(filename);
+       if ((flock(fd, LOCK_EX) < 0) && (errno != ENOSYS))
+               UCI_THROW(ctx, UCI_ERR_IO);
+
+       if (lseek(fd, 0, SEEK_SET) < 0)
                UCI_THROW(ctx, UCI_ERR_IO);
-       }
 
-       if ((stat(filename, &statbuf) == 0) && ((statbuf.st_mode & S_IFMT) != S_IFREG))
+       f2 = fdopen(fd, "w+");
+       if (!f2)
                UCI_THROW(ctx, UCI_ERR_IO);
 
-       f2 = uci_open_stream(ctx, filename, p->path, SEEK_SET, true, true);
        uci_export(ctx, f2, p, false);
 
        fflush(f2);
@@ -800,7 +802,7 @@ done:
        uci_close_stream(f1);
        if (do_rename) {
                path = realpath(p->path, NULL);
-               if (!path || rename(filename, path)) {
+               if (!path || stat(path, &statbuf) || chmod(filename, statbuf.st_mode) || rename(filename, path)) {
                        unlink(filename);
                        UCI_THROW(ctx, UCI_ERR_IO);
                }
@@ -833,7 +835,8 @@ static char **uci_list_config_files(struct uci_context *ctx)
 {
        char **configs;
        glob_t globbuf;
-       int size, i, j, skipped;
+       int size, j, skipped;
+       size_t i;
        char *buf;
        char *dir;
 
@@ -880,12 +883,13 @@ static char **uci_list_config_files(struct uci_context *ctx)
        return configs;
 }
 
-static struct uci_package *uci_file_load(struct uci_context *ctx, const char *name)
+static struct uci_package *uci_file_load(struct uci_context *ctx,
+                                        const char *volatile name)
 {
        struct uci_package *package = NULL;
        char *filename;
        bool confdir;
-       FILE *file = NULL;
+       FILE *volatile file = NULL;
 
        switch (name[0]) {
        case '.':