tests: remove straying echo in 020_get.

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index 41a78cb..5511114 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -27,7 +27,6 @@ static enum {
        CLI_FLAG_NOCOMMIT = (1 << 2),
        CLI_FLAG_BATCH =    (1 << 3),
        CLI_FLAG_SHOW_EXT = (1 << 4),
-       CLI_FLAG_NOPLUGINS= (1 << 5),
 } flags;
 
 static FILE *input;
@@ -147,7 +146,6 @@ static void uci_usage(void)
                "\t-c <path>  set the search path for config files (default: /etc/config)\n"
                "\t-d <str>   set the delimiter for list values in uci show\n"
                "\t-f <file>  use <file> as input instead of stdin\n"
-               "\t-L         do not load any plugins\n"
                "\t-m         when importing, merge data into an existing package\n"
                "\t-n         name unnamed sections on export (default)\n"
                "\t-N         don't name unnamed sections\n"
@@ -362,6 +360,7 @@ static int uci_do_package_cmd(int cmd, int argc, char **argv)
 {
        char **configs = NULL;
        char **p;
+       int ret = 1;
 
        if (argc > 2)
                return 255;
@@ -371,14 +370,17 @@ static int uci_do_package_cmd(int cmd, int argc, char **argv)
 
        if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs) {
                cli_perror();
-               return 1;
+               goto out;
        }
 
        for (p = configs; *p; p++) {
                package_cmd(cmd, *p);
        }
 
-       return 0;
+       ret = 0;
+out:
+       free(configs);
+       return ret;
 }
 
 static int uci_do_add(int argc, char **argv)
@@ -531,8 +533,7 @@ static int uci_batch_cmd(void)
                return 0;
 
        for (j = 0; j < i; j++) {
-               if (argv[j])
-                       free(argv[j]);
+               free(argv[j]);
        }
 
        return ret;
@@ -664,9 +665,6 @@ int main(int argc, char **argv)
                                        return 1;
                                }
                                break;
-                       case 'L':
-                               flags |= CLI_FLAG_NOPLUGINS;
-                               break;
                        case 'm':
                                flags |= CLI_FLAG_MERGE;
                                break;
@@ -712,9 +710,6 @@ int main(int argc, char **argv)
                return 0;
        }
 
-       if (!(flags & CLI_FLAG_NOPLUGINS))
-               uci_load_plugins(ctx, NULL);
-
        ret = uci_cmd(argc - 1, argv + 1);
        if (input != stdin)
                fclose(input);