file: preserve original file mode after commit

[oweals/uci.git] / file.c

diff --git a/file.c b/file.c
index 321b66b02eb3a79e1b74ade1327c10099167da88..6486de9c422971e6b886a2b5f2f9ef2fd0200423 100644 (file)
--- a/file.c
+++ b/file.c
@@ -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);
                }
@@ -724,6 +724,7 @@ static void uci_file_commit(struct uci_context *ctx, struct uci_package **packag
        char *volatile name = NULL;
        char *volatile path = NULL;
        char *filename = NULL;
+       struct stat statbuf;
        volatile bool do_rename = false;
        int fd;
 
@@ -801,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);
                }
@@ -834,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;