projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix building without plugin support
[project/uci.git]
/
cli.c
diff --git
a/cli.c
b/cli.c
index
36ef6e5
..
0e98aa7
100644
(file)
--- 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_NOCOMMIT = (1 << 2),
CLI_FLAG_BATCH = (1 << 3),
CLI_FLAG_SHOW_EXT = (1 << 4),
+ CLI_FLAG_NOPLUGINS= (1 << 5),
} flags;
static FILE *input;
} flags;
static FILE *input;
@@
-40,6
+41,7
@@
enum {
CMD_DEL,
CMD_RENAME,
CMD_REVERT,
CMD_DEL,
CMD_RENAME,
CMD_REVERT,
+ CMD_REORDER,
/* package cmds */
CMD_SHOW,
CMD_CHANGES,
/* package cmds */
CMD_SHOW,
CMD_CHANGES,
@@
-131,11
+133,13
@@
static void uci_usage(void)
"\tdelete <config>[.<section[.<option>]]\n"
"\trename <config>.<section>[.<option>]=<name>\n"
"\trevert <config>[.<section>[.<option>]]\n"
"\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"
"\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-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"
@@
-220,8
+224,8
@@
static void uci_show_changes(struct uci_package *p)
{
struct uci_element *e;
{
struct uci_element *e;
- uci_foreach_element(&p->saved_
history
, e) {
- struct uci_
history *h = uci_to_history
(e);
+ uci_foreach_element(&p->saved_
delta
, e) {
+ struct uci_
delta *h = uci_to_delta
(e);
char *prefix = "";
char *op = "=";
char *prefix = "";
char *op = "=";
@@
-404,7
+408,7
@@
static int uci_do_section_cmd(int cmd, int argc, char **argv)
return 1;
}
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;
return 1;
e = ptr.last;
@@
-439,6
+443,14
@@
static int uci_do_section_cmd(int cmd, int argc, char **argv)
case CMD_ADD_LIST:
ret = uci_add_list(ctx, &ptr);
break;
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;
case CMD_DEL:
ret = uci_delete(ctx, &ptr);
break;
@@
-462,7
+474,7
@@
static int uci_do_section_cmd(int cmd, int argc, char **argv)
static int uci_batch_cmd(void)
{
static int uci_batch_cmd(void)
{
- char *argv[MAX_ARGS];
+ char *argv[MAX_ARGS
+ 2
];
char *str = NULL;
int ret = 0;
int i, j;
char *str = NULL;
int ret = 0;
int i, j;
@@
-550,6
+562,8
@@
static int uci_cmd(int argc, char **argv)
cmd = CMD_RENAME;
else if (!strcasecmp(argv[0], "revert"))
cmd = CMD_REVERT;
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;
else if (!strcasecmp(argv[0], "del") ||
!strcasecmp(argv[0], "delete"))
cmd = CMD_DEL;
@@
-571,6
+585,7
@@
static int uci_cmd(int argc, char **argv)
case CMD_DEL:
case CMD_RENAME:
case CMD_REVERT:
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:
return uci_do_section_cmd(cmd, argc, argv);
case CMD_SHOW:
case CMD_EXPORT:
@@
-603,7
+618,7
@@
int main(int argc, char **argv)
return 1;
}
return 1;
}
- while((c = getopt(argc, argv, "c:d:f:mnNp:P:sSqX")) != -1) {
+ while((c = getopt(argc, argv, "c:d:f:
L
mnNp:P:sSqX")) != -1) {
switch(c) {
case 'c':
uci_set_confdir(ctx, optarg);
switch(c) {
case 'c':
uci_set_confdir(ctx, optarg);
@@
-618,6
+633,9
@@
int main(int argc, char **argv)
return 1;
}
break;
return 1;
}
break;
+ case 'L':
+ flags |= CLI_FLAG_NOPLUGINS;
+ break;
case 'm':
flags |= CLI_FLAG_MERGE;
break;
case 'm':
flags |= CLI_FLAG_MERGE;
break;
@@
-635,10
+653,10
@@
int main(int argc, char **argv)
ctx->flags &= ~UCI_FLAG_EXPORT_NAME;
break;
case 'p':
ctx->flags &= ~UCI_FLAG_EXPORT_NAME;
break;
case 'p':
- uci_add_
history
_path(ctx, optarg);
+ uci_add_
delta
_path(ctx, optarg);
break;
case 'P':
break;
case 'P':
- uci_add_
history
_path(ctx, ctx->savedir);
+ uci_add_
delta
_path(ctx, ctx->savedir);
uci_set_savedir(ctx, optarg);
flags |= CLI_FLAG_NOCOMMIT;
break;
uci_set_savedir(ctx, optarg);
flags |= CLI_FLAG_NOCOMMIT;
break;
@@
-662,6
+680,10
@@
int main(int argc, char **argv)
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);
ret = uci_cmd(argc - 1, argv + 1);
if (input != stdin)
fclose(input);