implement uci_commit()

diff --git a/cli.c b/cli.c
index 8ab3850..1fa1cb1 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -105,7 +105,7 @@ static int uci_do_export(int argc, char **argv)
                        ret = uci_load(ctx, *p, &package);
                        if (ret)
                                continue;
                        ret = uci_load(ctx, *p, &package);
                        if (ret)
                                continue;

-                       uci_export(ctx, stdout, package);
+                       uci_export(ctx, stdout, package, true);

                        uci_unload(ctx, package);
                }
        }
                        uci_unload(ctx, package);
                }
        }


@@ -209,7 +209,7 @@ static int uci_do_set(int argc, char **argv)
                uci_perror(ctx, "uci");
                return 1;
        }
                uci_perror(ctx, "uci");
                return 1;
        }

-       uci_show_package(p, NULL);
+       uci_commit(ctx, p);

        return 0;
 }
 
        return 0;
 }
 

diff --git a/file.c b/file.c
index 4650a96..e8f0684 100644 (file)
--- a/file.c
+++ b/file.c
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdbool.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdbool.h>

+#include <unistd.h>

 #include <fcntl.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <ctype.h>


@@ -454,7 +455,7 @@ static char *uci_escape(struct uci_context *ctx, char *str)
 /*
  * export a single config package to a file stream
  */
 /*
  * 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;
 {
        struct uci_context *ctx = p->ctx;
        struct uci_element *s, *o;


@@ -473,7 +474,7 @@ static void uci_export_package(struct uci_package *p, FILE *stream)
        fprintf(stream, "\n");
 }
 
        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;
 
 {
        struct uci_element *e;
 


@@ -481,12 +482,12 @@ int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *packag
        UCI_ASSERT(ctx, stream != NULL);
 
        if (package) {
        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) {
                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;
        }
 done:
        return 0;


@@ -590,6 +591,46 @@ done:
        return ctx->errno;
 }
 
        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'
 /* 
  * This function returns the filename by returning the string
  * after the last '/' character. By checking for a non-'\0'

diff --git a/uci.h b/uci.h
index 4420af7..4749985 100644 (file)
--- a/uci.h
+++ b/uci.h
@@ -95,8 +95,9 @@ extern int uci_import(struct uci_context *ctx, FILE *stream, const char *name, s
  * @ctx: uci context
  * @stream: output stream
  * @package: (optional) uci config package to export
  * @ctx: uci context
  * @stream: output stream
  * @package: (optional) uci config package to export

+ * @header: include the package header

  */
  */

-extern int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package);
+extern int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package, bool header);

 
 /**
  * uci_load: Parse an uci config file and store it in the uci context
 
 /**
  * uci_load: Parse an uci config file and store it in the uci context


@@ -158,6 +159,13 @@ extern int uci_set_element_value(struct uci_context *ctx, struct uci_element **e
 extern int uci_set(struct uci_context *ctx, char *package, char *section, char *option, char *value);
 
 /**
 extern int uci_set(struct uci_context *ctx, char *package, char *section, char *option, char *value);
 
 /**

+ * uci_commit: commit changes to a package
+ * @ctx: uci context
+ * @p: uci_package struct
+ */
+extern int uci_commit(struct uci_context *ctx, struct uci_package *p);
+
+/**

  * uci_list_configs: List available uci config files
  *
  * @ctx: uci context
  * uci_list_configs: List available uci config files
  *
  * @ctx: uci context