constify

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index 6be3372..229352f 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -43,6 +43,7 @@ enum {
        CMD_EXPORT,
        CMD_COMMIT,
        /* other cmds */
+       CMD_ADD,
        CMD_IMPORT,
        CMD_HELP,
 };
@@ -58,6 +59,8 @@ static void uci_usage(void)
                "\texport     [<config>]\n"
                "\timport     [<config>]\n"
                "\tchanges    [<config>]\n"
+               "\tcommit     [<config>]\n"
+               "\tadd        <config> <section-type>\n"
                "\tshow       [<config>[.<section>[.<option>]]]\n"
                "\tget        <config>.<section>[.<option>]\n"
                "\tset        <config>.<section>[.<option>]=<value>\n"
@@ -171,6 +174,7 @@ static int uci_do_import(int argc, char **argv)
        struct uci_package *package = NULL;
        char *name = NULL;
        int ret = UCI_OK;
+       bool merge = false;
 
        if (argc > 2)
                return 255;
@@ -184,10 +188,12 @@ static int uci_do_import(int argc, char **argv)
        if (flags & CLI_FLAG_MERGE) {
                if (uci_load(ctx, name, &package) != UCI_OK)
                        package = NULL;
+               else
+                       merge = true;
        }
        ret = uci_import(ctx, input, name, &package, (name != NULL));
        if (ret == UCI_OK) {
-               if (flags & CLI_FLAG_MERGE) {
+               if (merge) {
                        ret = uci_save(ctx, package);
                } else {
                        struct uci_element *e;
@@ -230,6 +236,33 @@ static int uci_do_package_cmd(int cmd, int argc, char **argv)
        return 0;
 }
 
+static int uci_do_add(int argc, char **argv)
+{
+       struct uci_package *p = NULL;
+       struct uci_section *s = NULL;
+       int ret;
+
+       if (argc != 3)
+               return 255;
+
+       ret = uci_load(ctx, argv[1], &p);
+       if (ret != UCI_OK)
+               goto done;
+
+       ret = uci_add_section(ctx, p, argv[2], &s);
+       if (ret != UCI_OK)
+               goto done;
+
+       ret = uci_save(ctx, p);
+
+done:
+       if (ret != UCI_OK)
+               cli_perror();
+       else if (s)
+               fprintf(stdout, "%s\n", s->e.name);
+
+       return ret;
+}
 
 static int uci_do_section_cmd(int cmd, int argc, char **argv)
 {
@@ -255,6 +288,8 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
        }
        if (uci_parse_tuple(ctx, argv[1], &package, &section, &option, ptr) != UCI_OK)
                return 1;
+       if (section && !section[0])
+               return 1;
 
        if (uci_load(ctx, package, &p) != UCI_OK) {
                cli_perror();
@@ -289,7 +324,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
                ret = uci_revert(ctx, &p, section, option);
                break;
        case CMD_SET:
-               ret = uci_set(ctx, p, section, option, value);
+               ret = uci_set(ctx, p, section, option, value, NULL);
                break;
        case CMD_DEL:
                ret = uci_delete(ctx, p, section, option);
@@ -369,7 +404,6 @@ static int uci_batch(void)
                        fprintf(stderr, "Unknown command\n");
 
                /* clean up */
-               uci_cleanup(ctx);
                uci_foreach_element_safe(&ctx->root, tmp, e) {
                        uci_unload(ctx, uci_to_package(e));
                }
@@ -406,6 +440,8 @@ static int uci_cmd(int argc, char **argv)
                cmd = CMD_IMPORT;
        else if (!strcasecmp(argv[0], "help"))
                cmd = CMD_HELP;
+       else if (!strcasecmp(argv[0], "add"))
+               cmd = CMD_ADD;
        else
                cmd = -1;
 
@@ -423,6 +459,8 @@ static int uci_cmd(int argc, char **argv)
                        return uci_do_package_cmd(cmd, argc, argv);
                case CMD_IMPORT:
                        return uci_do_import(argc, argv);
+               case CMD_ADD:
+                       return uci_do_add(argc, argv);
                case CMD_HELP:
                        uci_usage();
                        return 0;