projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add new command del_list
[project/uci.git]
/
cli.c
diff --git
a/cli.c
b/cli.c
index
0e98aa7
..
f5dfce0
100644
(file)
--- a/
cli.c
+++ b/
cli.c
@@
-38,6
+38,7
@@
enum {
CMD_GET,
CMD_SET,
CMD_ADD_LIST,
CMD_GET,
CMD_SET,
CMD_ADD_LIST,
+ CMD_DEL_LIST,
CMD_DEL,
CMD_RENAME,
CMD_REVERT,
CMD_DEL,
CMD_RENAME,
CMD_REVERT,
@@
-98,6
+99,8
@@
uci_lookup_section_ref(struct uci_section *s)
}
if (!ti) {
ti = malloc(sizeof(struct uci_type_list));
}
if (!ti) {
ti = malloc(sizeof(struct uci_type_list));
+ if (!ti)
+ return NULL;
memset(ti, 0, sizeof(struct uci_type_list));
ti->next = type_list;
type_list = ti;
memset(ti, 0, sizeof(struct uci_type_list));
ti->next = type_list;
type_list = ti;
@@
-110,8
+113,12
@@
uci_lookup_section_ref(struct uci_section *s)
} else {
typestr = realloc(typestr, maxlen);
}
} else {
typestr = realloc(typestr, maxlen);
}
- sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+
+ if (typestr)
+ sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+
ti->idx++;
ti->idx++;
+
return typestr;
}
return typestr;
}
@@
-127,6
+134,7
@@
static void uci_usage(void)
"\tcommit [<config>]\n"
"\tadd <config> <section-type>\n"
"\tadd_list <config>.<section>.<option>=<string>\n"
"\tcommit [<config>]\n"
"\tadd <config> <section-type>\n"
"\tadd_list <config>.<section>.<option>=<string>\n"
+ "\tdel_list <config>.<section>.<option>=<string>\n"
"\tshow [<config>[.<section>[.<option>]]]\n"
"\tget <config>.<section>[.<option>]\n"
"\tset <config>.<section>[.<option>]=<value>\n"
"\tshow [<config>[.<section>[.<option>]]]\n"
"\tget <config>.<section>[.<option>]\n"
"\tset <config>.<section>[.<option>]=<value>\n"
@@
-236,6
+244,9
@@
static void uci_show_changes(struct uci_package *p)
case UCI_CMD_LIST_ADD:
op = "+=";
break;
case UCI_CMD_LIST_ADD:
op = "+=";
break;
+ case UCI_CMD_LIST_DEL:
+ op = "-=";
+ break;
default:
break;
}
default:
break;
}
@@
-252,6
+263,7
@@
static int package_cmd(int cmd, char *tuple)
{
struct uci_element *e = NULL;
struct uci_ptr ptr;
{
struct uci_element *e = NULL;
struct uci_ptr ptr;
+ int ret = 0;
if (uci_lookup_ptr(ctx, &ptr, tuple, true) != UCI_OK) {
cli_perror();
if (uci_lookup_ptr(ctx, &ptr, tuple, true) != UCI_OK) {
cli_perror();
@@
-266,8
+278,10
@@
static int package_cmd(int cmd, char *tuple)
case CMD_COMMIT:
if (flags & CLI_FLAG_NOCOMMIT)
return 0;
case CMD_COMMIT:
if (flags & CLI_FLAG_NOCOMMIT)
return 0;
- if (uci_commit(ctx, &ptr.p, false) != UCI_OK)
+ if (uci_commit(ctx, &ptr.p, false) != UCI_OK)
{
cli_perror();
cli_perror();
+ ret = 1;
+ }
break;
case CMD_EXPORT:
uci_export(ctx, stdout, ptr.p, true);
break;
case CMD_EXPORT:
uci_export(ctx, stdout, ptr.p, true);
@@
-276,7
+290,7
@@
static int package_cmd(int cmd, char *tuple)
if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
ctx->err = UCI_ERR_NOTFOUND;
cli_perror();
if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
ctx->err = UCI_ERR_NOTFOUND;
cli_perror();
- ret
urn
1;
+ ret
=
1;
}
switch(e->type) {
case UCI_TYPE_PACKAGE:
}
switch(e->type) {
case UCI_TYPE_PACKAGE:
@@
-295,8
+309,9
@@
static int package_cmd(int cmd, char *tuple)
break;
}
break;
}
- uci_unload(ctx, ptr.p);
- return 0;
+ if (ptr.p)
+ uci_unload(ctx, ptr.p);
+ return ret;
}
static int uci_do_import(int argc, char **argv)
}
static int uci_do_import(int argc, char **argv)
@@
-408,7
+423,9
@@
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) && (cmd != CMD_REORDER))
+ if (ptr.value && (cmd != CMD_SET) &&
+ (cmd != CMD_ADD_LIST) && (cmd != CMD_DEL_LIST) &&
+ (cmd != CMD_RENAME) && (cmd != CMD_REORDER))
return 1;
e = ptr.last;
return 1;
e = ptr.last;
@@
-443,8
+460,11
@@
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_DEL_LIST:
+ ret = uci_del_list(ctx, &ptr);
+ break;
case CMD_REORDER:
case CMD_REORDER:
- if (!ptr.s) {
+ if (!ptr.s
|| !ptr.value
) {
ctx->err = UCI_ERR_NOTFOUND;
cli_perror();
return 1;
ctx->err = UCI_ERR_NOTFOUND;
cli_perror();
return 1;
@@
-575,11
+595,14
@@
static int uci_cmd(int argc, char **argv)
cmd = CMD_ADD;
else if (!strcasecmp(argv[0], "add_list"))
cmd = CMD_ADD_LIST;
cmd = CMD_ADD;
else if (!strcasecmp(argv[0], "add_list"))
cmd = CMD_ADD_LIST;
+ else if (!strcasecmp(argv[0], "del_list"))
+ cmd = CMD_DEL_LIST;
else
cmd = -1;
switch(cmd) {
case CMD_ADD_LIST:
else
cmd = -1;
switch(cmd) {
case CMD_ADD_LIST:
+ case CMD_DEL_LIST:
case CMD_GET:
case CMD_SET:
case CMD_DEL:
case CMD_GET:
case CMD_SET:
case CMD_DEL:
@@
-627,6
+650,11
@@
int main(int argc, char **argv)
delimiter = optarg;
break;
case 'f':
delimiter = optarg;
break;
case 'f':
+ if (input != stdin) {
+ perror("uci");
+ return 1;
+ }
+
input = fopen(optarg, "r");
if (!input) {
perror("uci");
input = fopen(optarg, "r");
if (!input) {
perror("uci");
@@
-687,10
+715,9
@@
int main(int argc, char **argv)
ret = uci_cmd(argc - 1, argv + 1);
if (input != stdin)
fclose(input);
ret = uci_cmd(argc - 1, argv + 1);
if (input != stdin)
fclose(input);
- if (ret == 255) {
+
+ if (ret == 255)
uci_usage();
uci_usage();
- return 0;
- }
uci_free_context(ctx);
uci_free_context(ctx);