+ package_cmd(cmd, *p);
+ }
+
+ return 0;
+}
+
+static int uci_do_add(int argc, char **argv)
+{
+ struct uci_package *p = NULL;
+ struct uci_section *s = NULL;
+ int ret;
+
+ if (argc != 3)
+ return 255;
+
+ ret = uci_load(ctx, argv[1], &p);
+ if (ret != UCI_OK)
+ goto done;
+
+ ret = uci_add_section(ctx, p, argv[2], &s);
+ if (ret != UCI_OK)
+ goto done;
+
+ ret = uci_save(ctx, p);
+
+done:
+ if (ret != UCI_OK)
+ cli_perror();
+ else if (s)
+ fprintf(stdout, "%s\n", s->e.name);
+
+ return ret;
+}
+
+static int uci_do_section_cmd(int cmd, int argc, char **argv)
+{
+ struct uci_element *e;
+ struct uci_ptr ptr;
+ int ret = UCI_OK;
+
+ if (argc != 2)
+ return 255;
+
+ if (uci_lookup_ptr(ctx, &ptr, argv[1], true) != UCI_OK) {
+ cli_perror();
+ return 1;
+ }
+
+ if (ptr.value && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) && (cmd != CMD_RENAME))
+ return 1;
+
+ e = ptr.last;
+ switch(cmd) {
+ case CMD_GET:
+ if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
+ ctx->err = UCI_ERR_NOTFOUND;
+ cli_perror();
+ return 1;
+ }
+ switch(e->type) {
+ case UCI_TYPE_SECTION:
+ printf("%s\n", ptr.s->type);
+ break;
+ case UCI_TYPE_OPTION:
+ uci_show_value(ptr.o);
+ break;
+ default:
+ break;
+ }
+ /* throw the value to stdout */
+ break;
+ case CMD_RENAME:
+ ret = uci_rename(ctx, &ptr);
+ break;
+ case CMD_REVERT:
+ ret = uci_revert(ctx, &ptr);
+ break;
+ case CMD_SET:
+ ret = uci_set(ctx, &ptr);
+ break;
+ case CMD_ADD_LIST:
+ ret = uci_add_list(ctx, &ptr);
+ break;
+ case CMD_DEL:
+ ret = uci_delete(ctx, &ptr);
+ break;
+ }
+
+ /* no save necessary for get */
+ if ((cmd == CMD_GET) || (cmd == CMD_REVERT))
+ return 0;
+
+ /* save changes, but don't commit them yet */
+ if (ret == UCI_OK)
+ ret = uci_save(ctx, ptr.p);
+
+ if (ret != UCI_OK) {
+ cli_perror();
+ return 1;
+ }
+
+ return 0;
+}
+
+static int uci_batch_cmd(void)
+{
+ char *argv[MAX_ARGS];
+ char *str = NULL;
+ int ret = 0;
+ int i, j;
+
+ for(i = 0; i <= MAX_ARGS; i++) {
+ if (i == MAX_ARGS) {
+ fprintf(stderr, "Too many arguments\n");
+ return 1;
+ }
+ argv[i] = NULL;
+ if ((ret = uci_parse_argument(ctx, input, &str, &argv[i])) != UCI_OK) {
+ cli_perror();
+ i = 0;
+ break;
+ }
+ if (!argv[i][0])
+ break;
+ argv[i] = strdup(argv[i]);
+ if (!argv[i]) {
+ perror("uci");
+ return 1;
+ }
+ }
+ argv[i] = NULL;
+
+ if (i > 0) {
+ if (!strcasecmp(argv[0], "exit"))
+ return 254;
+ ret = uci_cmd(i, argv);
+ } else
+ return 0;
+
+ for (j = 0; j < i; j++) {
+ if (argv[j])
+ free(argv[j]);
+ }
+
+ return ret;
+}
+
+static int uci_batch(void)
+{
+ int ret = 0;
+
+ flags |= CLI_FLAG_BATCH;
+ while (!feof(input)) {
+ struct uci_element *e, *tmp;
+
+ ret = uci_batch_cmd();
+ if (ret == 254)
+ return 0;
+ else if (ret == 255)
+ fprintf(stderr, "Unknown command\n");
+
+ /* clean up */
+ uci_foreach_element_safe(&ctx->root, tmp, e) {
+ uci_unload(ctx, uci_to_package(e));