X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=cli.c;h=7bef7a907d876ecfc24bab0169a7ee41cff88b0e;hp=0b2a76d5698f9a6c00365e3bfe18456baac3baaa;hb=2b0ba180280ab7e7cf79a66a6a583064911bfa05;hpb=defdac4bf39c2eca8d3def190c6eb6ca6bdf7723 diff --git a/cli.c b/cli.c index 0b2a76d..7bef7a9 100644 --- a/cli.c +++ b/cli.c @@ -27,6 +27,7 @@ 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; @@ -138,6 +139,7 @@ static void uci_usage(void) "\t-c set the search path for config files (default: /etc/config)\n" "\t-d set the delimiter for list values in uci show\n" "\t-f use 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" @@ -616,7 +618,7 @@ int main(int argc, char **argv) return 1; } - while((c = getopt(argc, argv, "c:d:f:mnNp:P:sSqX")) != -1) { + while((c = getopt(argc, argv, "c:d:f:LmnNp:P:sSqX")) != -1) { switch(c) { case 'c': uci_set_confdir(ctx, optarg); @@ -631,6 +633,9 @@ int main(int argc, char **argv) return 1; } break; + case 'L': + flags |= CLI_FLAG_NOPLUGINS; + break; case 'm': flags |= CLI_FLAG_MERGE; break; @@ -675,6 +680,10 @@ int main(int argc, char **argv) uci_usage(); return 0; } + + if (!(flags & CLI_FLAG_NOPLUGINS)) + uci_load_plugins(ctx, NULL); + ret = uci_cmd(argc - 1, argv + 1); if (input != stdin) fclose(input);