+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_package *p = NULL;
+ struct uci_section *s = NULL;
+ struct uci_element *e = NULL;
+ struct uci_option *o = NULL;
+ char *package = NULL;
+ char *section = NULL;
+ char *option = NULL;
+ char *value = NULL;
+ int ret = UCI_OK;
+ char *str;
+
+ if (argc != 2)
+ return 255;
+
+ value = strchr(argv[1], '=');
+ if (value) {
+ *value = 0;
+ value++;
+ if (!uci_validate_text(value))
+ return 1;
+ }
+
+ str = strdup(argv[1]);
+ if (!str)
+ return 1;
+
+ if (value && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) && (cmd != CMD_RENAME))
+ return 1;
+
+ if (uci_parse_tuple(ctx, str, &package, §ion, &option, NULL) != UCI_OK) {
+ cli_perror();
+ return 1;
+ }
+ sprintf(argv[1], "%s.%s", package, section);
+ free(str);
+
+ if (uci_lookup_ext(ctx, &e, argv[1]) != UCI_OK) {
+ cli_perror();
+ return 1;
+ }
+
+ switch(e->type) {
+ case UCI_TYPE_PACKAGE:
+ p = uci_to_package(e);
+ break;
+ case UCI_TYPE_SECTION:
+ s = uci_to_section(e);
+ break;
+ case UCI_TYPE_OPTION:
+ option = e->name;
+ s = uci_to_option(e)->section;
+ break;
+ default:
+ return 1;
+ }
+ if (s) {
+ section = s->e.name;
+ p = s->package;
+ }
+
+ switch(cmd) {
+ case CMD_GET:
+ switch(e->type) {
+ case UCI_TYPE_SECTION:
+ printf("%s\n", s->type);
+ break;
+ case UCI_TYPE_OPTION:
+ o = uci_to_option(e);
+ uci_show_value(o);
+ break;
+ default:
+ break;
+ }
+ /* throw the value to stdout */
+ break;
+ case CMD_RENAME:
+ ret = uci_rename(ctx, p, section, option, value);
+ break;
+ case CMD_REVERT:
+ ret = uci_revert(ctx, &p, section, option);
+ break;
+ case CMD_SET:
+ ret = uci_set(ctx, p, section, option, value, NULL);
+ break;
+ case CMD_ADD_LIST:
+ ret = uci_add_list(ctx, p, section, option, value, NULL);
+ break;
+ case CMD_DEL:
+ ret = uci_delete(ctx, p, section, option);
+ 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, 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)