#include "uci.h"
static struct uci_context *ctx;
-static char *buf = NULL;
-static int buflen = 256;
static void uci_usage(int argc, char **argv)
{
fprintf(stderr,
"Usage: %s [<options>] <command> [<arguments>]\n\n"
"Commands:\n"
- "\tshow [<config>[.<section>[.<option>]]]\n"
- "\texport [<config>]\n"
+ "\texport [<config>]\n"
+ "\tshow [<config>[.<section>[.<option>]]]\n"
+ "\tget <config>.<section>[.<option>]\n"
+ "\tset <config>.<section>[.<option>]=<value>\n"
"\n",
argv[0]
);
static void uci_show_section(struct uci_section *p)
{
- struct uci_option *o;
+ struct uci_element *e;
const char *cname, *sname;
- cname = p->config->name;
- sname = p->name;
+ cname = p->package->e.name;
+ sname = p->e.name;
printf("%s.%s=%s\n", cname, sname, p->type);
- uci_foreach_entry(option, &p->options, o) {
- printf("%s.%s.%s=%s\n", cname, sname, o->name, o->value);
+ uci_foreach_element(&p->options, e) {
+ printf("%s.%s.%s=%s\n", cname, sname, e->name, uci_to_option(e)->value);
}
}
-static void foreach_section(const char *configname, const char *section, void (*callback)(struct uci_section *))
+static void uci_show_package(struct uci_package *p, char *section)
{
- struct uci_config *cfg;
- struct uci_section *p;
+ struct uci_element *e;
- if (uci_load(ctx, configname, &cfg) != UCI_OK) {
- uci_perror(ctx, "uci_load");
- return;
- }
-
- uci_foreach_entry(section, &cfg->sections, p) {
- if (!section || !strcmp(p->name, section))
- callback(p);
+ uci_foreach_element( &p->sections, e) {
+ if (!section || !strcmp(e->name, section))
+ uci_show_section(uci_to_section(e));
}
- uci_unload(ctx, configname);
}
static int uci_show(int argc, char **argv)
{
- char **configs = uci_list_configs();
+ char *section = (argc > 2 ? argv[2] : NULL);
+ struct uci_package *package;
+ char **configs;
char **p;
+ configs = uci_list_configs(ctx);
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))
- foreach_section(*p, (argc > 2 ? argv[2] : NULL), uci_show_section);
+ if ((argc < 2) || !strcmp(argv[1], *p)) {
+ if (uci_load(ctx, *p, &package) != UCI_OK) {
+ uci_perror(ctx, NULL);
+ return 1;
+ }
+ uci_show_package(package, section);
+ uci_unload(ctx, package);
+ }
}
return 0;
static int uci_do_export(int argc, char **argv)
{
- char **configs = uci_list_configs();
+ char **configs = uci_list_configs(ctx);
char **p;
if (!configs)
for (p = configs; *p; p++) {
if ((argc < 2) || !strcmp(argv[1], *p)) {
- struct uci_config *cfg = NULL;
+ struct uci_package *package = NULL;
int ret;
- ret = uci_load(ctx, *p, &cfg);
+ ret = uci_load(ctx, *p, &package);
if (ret)
continue;
- uci_export(ctx, stdout, cfg);
- 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;
+ char *section = NULL;
+ char *option = NULL;
+ struct uci_package *p = NULL;
+ struct uci_element *e = NULL;
+ char *value = NULL;
+
+ if (argc != 2)
+ return 255;
+
+ parse_tuple(argv[1], &package, §ion, &option, NULL);
+ if (!package)
+ return 1;
+
+ if (uci_load(ctx, package, &p) != UCI_OK) {
+ uci_perror(ctx, "uci");
+ return 1;
+ }
+
+ if (uci_lookup(ctx, &e, p, section, option) != UCI_OK)
+ return 1;
+
+ switch(e->type) {
+ case UCI_TYPE_SECTION:
+ value = uci_to_section(e)->type;
+ break;
+ case UCI_TYPE_OPTION:
+ value = uci_to_option(e)->value;
+ break;
+ default:
+ /* should not happen */
+ return 1;
+ }
+
+ /* throw the value to stdout */
+ printf("%s\n", value);
+
+ return 0;
+}
+
+static int uci_do_set(int argc, char **argv)
+{
+ struct uci_package *p;
+ char *package = NULL;
+ char *section = NULL;
+ char *option = NULL;
+ char *value = NULL;
+
+ if (argc != 2)
+ return 255;
+
+ parse_tuple(argv[1], &package, §ion, &option, &value);
+ if (!package)
+ return 1;
+
+ if (uci_load(ctx, package, &p) != UCI_OK) {
+ uci_perror(ctx, "uci");
+ return 1;
+ }
+
+ if (uci_set(ctx, package, section, option, value) != UCI_OK) {
+ uci_perror(ctx, "uci");
+ return 1;
+ }
+ uci_commit(ctx, p);
+ return 0;
+}
+
static int uci_cmd(int argc, char **argv)
{
if (!strcasecmp(argv[0], "show"))
return uci_show(argc, argv);
if (!strcasecmp(argv[0], "export"))
return uci_do_export(argc, argv);
+ if (!strcasecmp(argv[0], "get"))
+ return uci_do_get(argc, argv);
+ if (!strcasecmp(argv[0], "set"))
+ return uci_do_set(argc, argv);
return 255;
}
{
int ret;
- ctx = uci_alloc();
+ ctx = uci_alloc_context();
if (argc < 2)
uci_usage(argc, argv);
ret = uci_cmd(argc - 1, argv + 1);
if (ret == 255)
uci_usage(argc, argv);
- uci_free(ctx);
+ uci_free_context(ctx);
return ret;
}
projects / project / uci.git / blobdiff