fix compilation on later glibc/gcc versions with stricter checks

[project/uci.git] / history.c

diff --git a/history.c b/history.c
index ae66f66..e3e19de 100644 (file)
--- a/history.c
+++ b/history.c
@@ -160,7 +160,8 @@ static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *
                break;
        case UCI_CMD_ADD:
        case UCI_CMD_CHANGE:
-               UCI_INTERNAL(uci_set, ctx, p, ptr.section, ptr.option, ptr.value, &e);
+               UCI_INTERNAL(uci_set, ctx, &ptr);
+               e = ptr.last;
                if (!ptr.option && e && (cmd == UCI_CMD_ADD))
                        uci_to_section(e)->anonymous = true;
                break;
@@ -249,7 +250,10 @@ static int uci_load_history(struct uci_context *ctx, struct uci_package *p, bool
        changes = uci_load_history_file(ctx, p, filename, &f, flush);
        if (flush && f && (changes > 0)) {
                rewind(f);
-               ftruncate(fileno(f), 0);
+               if (ftruncate(fileno(f), 0) < 0) {
+                       uci_close_stream(f);
+                       UCI_THROW(ctx, UCI_ERR_IO);
+               }
        }
        if (filename)
                free(filename);
@@ -307,7 +311,8 @@ static void uci_filter_history(struct uci_context *ctx, const char *name, const
 
        /* rebuild the history file */
        rewind(f);
-       ftruncate(fileno(f), 0);
+       if (ftruncate(fileno(f), 0) < 0)
+               UCI_THROW(ctx, UCI_ERR_IO);
        uci_foreach_element_safe(&list, tmp, e) {
                fprintf(f, "%s\n", e->name);
                uci_free_element(e);
@@ -317,7 +322,7 @@ static void uci_filter_history(struct uci_context *ctx, const char *name, const
 done:
        if (filename)
                free(filename);
-       uci_close_stream(f);
+       uci_close_stream(pctx->file);
        uci_foreach_element_safe(&list, tmp, e) {
                uci_free_element(e);
        }
@@ -331,7 +336,7 @@ int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
        char *option = NULL;
 
        UCI_HANDLE_ERR(ctx);
-       expand_ptr(ctx, ptr, true);
+       expand_ptr(ctx, ptr, false);
        UCI_ASSERT(ctx, ptr->p->has_history);
 
        /* 
@@ -347,8 +352,10 @@ int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
        /* NB: need to clone package, section and option names, 
         * as they may get freed on uci_free_package() */
        package = uci_strdup(ctx, ptr->p->e.name);
-       section = uci_strdup(ctx, ptr->section);
-       option = uci_strdup(ctx, ptr->option);
+       if (ptr->section)
+               section = uci_strdup(ctx, ptr->section);
+       if (ptr->option)
+               option = uci_strdup(ctx, ptr->option);
 
        uci_free_package(&ptr->p);
        uci_filter_history(ctx, package, section, option);