CLI_FLAG_QUIET = (1 << 1),
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;
CMD_DEL,
CMD_RENAME,
CMD_REVERT,
+ CMD_REORDER,
/* package cmds */
CMD_SHOW,
CMD_CHANGES,
struct uci_type_list *ti = type_list;
int maxlen;
- if (!s->anonymous)
+ if (!s->anonymous || !(flags & CLI_FLAG_SHOW_EXT))
return s->e.name;
/* look up in section type list */
"\tdelete <config>[.<section[.<option>]]\n"
"\trename <config>.<section>[.<option>]=<name>\n"
"\trevert <config>[.<section>[.<option>]]\n"
+ "\treorder <config>.<section>=<position>\n"
"\n"
"Options:\n"
"\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"
"\t-q quiet mode (don't print error messages)\n"
"\t-s force strict mode (stop on parser errors, default)\n"
"\t-S disable strict mode\n"
+ "\t-X do not use extended syntax on 'show'\n"
"\n",
appname
);
return 1;
}
- if (ptr.value && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) && (cmd != CMD_RENAME))
+ if (ptr.value && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) && (cmd != CMD_RENAME) && (cmd != CMD_REORDER))
return 1;
e = ptr.last;
case CMD_ADD_LIST:
ret = uci_add_list(ctx, &ptr);
break;
+ case CMD_REORDER:
+ if (!ptr.s) {
+ ctx->err = UCI_ERR_NOTFOUND;
+ cli_perror();
+ return 1;
+ }
+ ret = uci_reorder_section(ctx, ptr.s, strtoul(ptr.value, NULL, 10));
+ break;
case CMD_DEL:
ret = uci_delete(ctx, &ptr);
break;
static int uci_batch_cmd(void)
{
- char *argv[MAX_ARGS];
+ char *argv[MAX_ARGS + 2];
char *str = NULL;
int ret = 0;
int i, j;
cmd = CMD_RENAME;
else if (!strcasecmp(argv[0], "revert"))
cmd = CMD_REVERT;
+ else if (!strcasecmp(argv[0], "reorder"))
+ cmd = CMD_REORDER;
else if (!strcasecmp(argv[0], "del") ||
!strcasecmp(argv[0], "delete"))
cmd = CMD_DEL;
case CMD_DEL:
case CMD_RENAME:
case CMD_REVERT:
+ case CMD_REORDER:
return uci_do_section_cmd(cmd, argc, argv);
case CMD_SHOW:
case CMD_EXPORT:
int ret;
int c;
+ flags = CLI_FLAG_SHOW_EXT;
appname = argv[0];
input = stdin;
ctx = uci_alloc_context();
return 1;
}
- while((c = getopt(argc, argv, "c:d:f:mnNp:P:sSq")) != -1) {
+ while((c = getopt(argc, argv, "c:d:f:LmnNp:P:sSqX")) != -1) {
switch(c) {
case 'c':
uci_set_confdir(ctx, optarg);
return 1;
}
break;
+ case 'L':
+ flags |= CLI_FLAG_NOPLUGINS;
+ break;
case 'm':
flags |= CLI_FLAG_MERGE;
break;
case 'q':
flags |= CLI_FLAG_QUIET;
break;
+ case 'X':
+ flags &= ~CLI_FLAG_SHOW_EXT;
+ break;
default:
uci_usage();
return 0;
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);