if (!configs)
return 0;
+ if (argc >= 2) {
+ if (uci_load(ctx, argv[1], &package) != UCI_OK) {
+ uci_perror(ctx, NULL);
+ return 1;
+ }
+ uci_show_package(package, section);
+ uci_unload(ctx, package);
+ return 0;
+ }
+
for (p = configs; *p; p++) {
if ((argc < 2) || !strcmp(argv[1], *p)) {
if (uci_load(ctx, *p, &package) != UCI_OK) {
- uci_perror(ctx, "uci_load");
- return 255;
+ uci_perror(ctx, NULL);
+ return 1;
}
uci_show_package(package, section);
- uci_unload(ctx, *p);
+ uci_unload(ctx, package);
}
}
ret = uci_load(ctx, *p, &package);
if (ret)
continue;
- uci_export(ctx, stdout, package);
- uci_unload(ctx, *p);
+ uci_export(ctx, stdout, package, true);
+ uci_unload(ctx, package);
}
}
return 0;
}
-static void parse_tuple(char *str, char **package, char **section, char **option, char **value)
-{
- char *last = NULL;
-
- *package = strtok(str, ".");
- if (!*package)
- goto done;
-
- last = *package;
- *section = strtok(NULL, ".");
- if (!*section)
- goto done;
-
- last = *section;
- *option = strtok(NULL, ".");
- if (!*option)
- goto done;
-
- last = *option;
-done:
- if (!value)
- return;
-
- last = strtok(last, "=");
- if (!last)
- return;
-
- *value = last + strlen(last) + 1;
-}
-
-
static int uci_do_get(int argc, char **argv)
{
char *package = NULL;
if (argc != 2)
return 255;
- parse_tuple(argv[1], &package, §ion, &option, NULL);
- if (!package)
+ if (uci_parse_tuple(ctx, argv[1], &package, §ion, &option, NULL) != UCI_OK)
return 1;
if (uci_load(ctx, package, &p) != UCI_OK) {
return 1;
}
- if (uci_lookup(ctx, &e, package, section, option) != UCI_OK)
+ if (uci_lookup(ctx, &e, p, section, option) != UCI_OK)
return 1;
switch(e->type) {
if (argc != 2)
return 255;
- parse_tuple(argv[1], &package, §ion, &option, &value);
- if (!package)
+ if (uci_parse_tuple(ctx, argv[1], &package, §ion, &option, &value) != UCI_OK)
return 1;
if (uci_load(ctx, package, &p) != UCI_OK) {
uci_perror(ctx, "uci");
return 1;
}
- uci_show_package(p, NULL);
+ if (uci_save(ctx, p) != UCI_OK) {
+ uci_perror(ctx, "uci");
+ return 1;
+ }
return 0;
}