fix a stupid duplicate value checking bug (patch by Frédéric Moulins)

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index e05f5d4..8227987 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -12,6 +12,7 @@
  * GNU General Public License for more details.
  */
 #include <strings.h>
+#include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include "uci.h"
@@ -38,9 +39,11 @@ enum {
        CMD_REVERT,
        /* package cmds */
        CMD_SHOW,
+       CMD_CHANGES,
        CMD_EXPORT,
        CMD_COMMIT,
        /* other cmds */
+       CMD_ADD,
        CMD_IMPORT,
        CMD_HELP,
 };
@@ -55,6 +58,9 @@ static void uci_usage(void)
                "\tbatch\n"
                "\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"
@@ -62,6 +68,7 @@ static void uci_usage(void)
                "\trevert     <config>[.<section>[.<option>]]\n"
                "\n"
                "Options:\n"
+               "\t-c <path>  set the search path for config files (default: /etc/config)\n"
                "\t-f <file>  use <file> as input instead of stdin\n"
                "\t-m         when importing, merge data into an existing package\n"
                "\t-n         name unnamed sections on export (default)\n"
@@ -106,18 +113,41 @@ static void uci_show_package(struct uci_package *p)
        }
 }
 
+static void uci_show_changes(struct uci_package *p)
+{
+       struct uci_element *e;
+
+       uci_foreach_element(&p->saved_history, e) {
+               struct uci_history *h = uci_to_history(e);
+
+               if (h->cmd == UCI_CMD_REMOVE)
+                       printf("-");
+               printf("%s.%s", p->e.name, h->section);
+               if (e->name)
+                       printf(".%s", e->name);
+               if (h->cmd != UCI_CMD_REMOVE)
+                       printf("=%s", h->value);
+               printf("\n");
+       }
+}
 
 static int package_cmd(int cmd, char *package)
 {
        struct uci_package *p = NULL;
+       int ret;
 
-       if (uci_load(ctx, package, &p) != UCI_OK) {
+       ret = uci_load(ctx, package, &p);
+
+       if (ret != UCI_OK) {
                cli_perror();
                return 1;
        }
        if (!p)
                return 0;
        switch(cmd) {
+       case CMD_CHANGES:
+               uci_show_changes(p);
+               break;
        case CMD_COMMIT:
                if (flags & CLI_FLAG_NOCOMMIT)
                        return 0;
@@ -141,6 +171,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;
@@ -154,10 +185,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;
@@ -200,6 +233,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)
 {
@@ -225,6 +285,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();
@@ -259,7 +321,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);
@@ -339,7 +401,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));
                }
@@ -355,6 +416,8 @@ static int uci_cmd(int argc, char **argv)
                return uci_batch();
        else if (!strcasecmp(argv[0], "show"))
                cmd = CMD_SHOW;
+       else if (!strcasecmp(argv[0], "changes"))
+               cmd = CMD_CHANGES;
        else if (!strcasecmp(argv[0], "export"))
                cmd = CMD_EXPORT;
        else if (!strcasecmp(argv[0], "commit"))
@@ -374,6 +437,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;
 
@@ -387,9 +452,12 @@ static int uci_cmd(int argc, char **argv)
                case CMD_SHOW:
                case CMD_EXPORT:
                case CMD_COMMIT:
+               case CMD_CHANGES:
                        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;
@@ -411,8 +479,11 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       while((c = getopt(argc, argv, "f:mnNp:P:sSq")) != -1) {
+       while((c = getopt(argc, argv, "c:f:mnNp:P:sSq")) != -1) {
                switch(c) {
+                       case 'c':
+                               uci_set_confdir(ctx, optarg);
+                               break;
                        case 'f':
                                input = fopen(optarg, "r");
                                if (!input) {