remove unused variables

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index 3ade534..0c68d08 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -16,6 +16,10 @@
 #include "uci.h"
 
 static const char *appname = "uci";
+static enum {
+       CLI_FLAG_MERGE = (1 << 0),
+} flags;
+static FILE *input = stdin;
 
 static struct uci_context *ctx;
 enum {
@@ -26,6 +30,7 @@ enum {
        CMD_RENAME,
        /* package cmds */
        CMD_SHOW,
+       CMD_IMPORT,
        CMD_EXPORT,
        CMD_COMMIT,
 };
@@ -35,14 +40,18 @@ static void uci_usage(int argc, char **argv)
        fprintf(stderr,
                "Usage: %s [<options>] <command> [<arguments>]\n\n"
                "Commands:\n"
-               "\texport   [<config>]\n"
-               "\tshow     [<config>[.<section>[.<option>]]]\n"
-               "\tget      <config>.<section>[.<option>]\n"
-               "\tset      <config>.<section>[.<option>]=<value>\n"
+               "\texport     [<config>]\n"
+               "\timport     [<config>]\n"
+               "\tshow       [<config>[.<section>[.<option>]]]\n"
+               "\tget        <config>.<section>[.<option>]\n"
+               "\tset        <config>.<section>[.<option>]=<value>\n"
+               "\trename     <config>.<section>[.<option>]=<name>\n"
                "\n"
                "Options:\n"
-               "\t-s       force strict mode (stop on parser errors)\n"
-               "\t-S       disable strict mode\n"
+               "\t-f <file>  use <file> as input instead of stdin\n"
+               "\t-m         when importing, merge data into an existing package\n"
+               "\t-s         force strict mode (stop on parser errors)\n"
+               "\t-S         disable strict mode\n"
                "\n",
                argv[0]
        );
@@ -82,7 +91,7 @@ static int package_cmd(int cmd, char *package)
        }
        switch(cmd) {
        case CMD_COMMIT:
-               if (uci_commit(ctx, &p) != UCI_OK)
+               if (uci_commit(ctx, &p, false) != UCI_OK)
                        uci_perror(ctx, appname);
                break;
        case CMD_EXPORT:
@@ -97,6 +106,47 @@ static int package_cmd(int cmd, char *package)
        return 0;
 }
 
+static int uci_do_import(int argc, char **argv)
+{
+       struct uci_package *package = NULL;
+       char *name = NULL;
+       int ret = UCI_OK;
+
+       if (argc > 2)
+               return 255;
+
+       if (argc == 2)
+               name = argv[1];
+       else if (flags & CLI_FLAG_MERGE)
+               /* need a package to merge */
+               return 255;
+
+       if (flags & CLI_FLAG_MERGE) {
+               if (uci_load(ctx, name, &package) != UCI_OK)
+                       package = NULL;
+       }
+       ret = uci_import(ctx, input, name, &package, (name != NULL));
+       if (ret == UCI_OK) {
+               if (flags & CLI_FLAG_MERGE) {
+                       ret = uci_save(ctx, package);
+               } else {
+                       struct uci_element *e;
+                       /* loop through all config sections and overwrite existing data */
+                       uci_foreach_element(&ctx->root, e) {
+                               struct uci_package *p = uci_to_package(e);
+                               ret = uci_commit(ctx, &p, true);
+                       }
+               }
+       }
+
+       if (ret != UCI_OK) {
+               uci_perror(ctx, appname);
+               return 1;
+       }
+
+       return 0;
+}
+
 static int uci_do_package_cmd(int cmd, int argc, char **argv)
 {
        char **configs = NULL;
@@ -123,13 +173,14 @@ static int uci_do_package_cmd(int cmd, int argc, char **argv)
 
 static int uci_do_section_cmd(int cmd, int argc, char **argv)
 {
+       struct uci_package *p = NULL;
+       struct uci_element *e = NULL;
        char *package = NULL;
        char *section = NULL;
        char *option = NULL;
        char *value = NULL;
        char **ptr = NULL;
-       struct uci_package *p = NULL;
-       struct uci_element *e = NULL;
+       int ret = UCI_OK;
 
        if (argc != 2)
                return 255;
@@ -170,22 +221,13 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
                printf("%s\n", value);
                break;
        case CMD_RENAME:
-               if (uci_rename(ctx, p, section, option, value) != UCI_OK) {
-                       uci_perror(ctx, appname);
-                       return 1;
-               }
+               ret = uci_rename(ctx, p, section, option, value);
                break;
        case CMD_SET:
-               if (uci_set(ctx, p, section, option, value) != UCI_OK) {
-                       uci_perror(ctx, appname);
-                       return 1;
-               }
+               ret = uci_set(ctx, p, section, option, value);
                break;
        case CMD_DEL:
-               if (uci_delete(ctx, p, section, option) != UCI_OK) {
-                       uci_perror(ctx, appname);
-                       return 1;
-               }
+               ret = uci_delete(ctx, p, section, option);
                break;
        }
 
@@ -194,7 +236,10 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
                return 0;
 
        /* save changes, but don't commit them yet */
-       if (uci_save(ctx, p) != UCI_OK) {
+       if (ret == UCI_OK)
+               ret = uci_save(ctx, p);
+
+       if (ret != UCI_OK) {
                uci_perror(ctx, appname);
                return 1;
        }
@@ -221,6 +266,8 @@ static int uci_cmd(int argc, char **argv)
                cmd = CMD_RENAME;
        else if (!strcasecmp(argv[0], "del"))
                cmd = CMD_DEL;
+       else if (!strcasecmp(argv[0], "import"))
+               cmd = CMD_IMPORT;
        else
                cmd = -1;
 
@@ -234,6 +281,8 @@ static int uci_cmd(int argc, char **argv)
                case CMD_EXPORT:
                case CMD_COMMIT:
                        return uci_do_package_cmd(cmd, argc, argv);
+               case CMD_IMPORT:
+                       return uci_do_import(argc, argv);
                default:
                        return 255;
        }
@@ -250,8 +299,18 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       while((c = getopt(argc, argv, "sS")) != -1) {
+       while((c = getopt(argc, argv, "mf:sS")) != -1) {
                switch(c) {
+                       case 'f':
+                               input = fopen(optarg, "r");
+                               if (!input) {
+                                       perror("uci");
+                                       return 1;
+                               }
+                               break;
+                       case 'm':
+                               flags |= CLI_FLAG_MERGE;
+                               break;
                        case 's':
                                ctx->flags |= UCI_FLAG_STRICT;
                                break;
@@ -272,6 +331,8 @@ int main(int argc, char **argv)
        if (argc < 2)
                uci_usage(argc, argv);
        ret = uci_cmd(argc - 1, argv + 1);
+       if (input != stdin)
+               fclose(input);
        if (ret == 255)
                uci_usage(argc, argv);