#include "uci.h"
static struct uci_context *ctx;
-static char *buf = NULL;
-static int buflen = 256;
static void uci_usage(int argc, char **argv)
{
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 int uci_show(int argc, char **argv)
{
char *section = (argc > 2 ? argv[2] : NULL);
- struct uci_config *cfg;
- struct uci_section *s;
+ struct uci_package *package;
+ struct uci_element *e;
char **configs;
char **p;
- configs = uci_list_configs();
+ configs = uci_list_configs(ctx);
if (!configs)
return 0;
for (p = configs; *p; p++) {
if ((argc < 2) || !strcmp(argv[1], *p)) {
- if (uci_load(ctx, *p, &cfg) != UCI_OK) {
+ if (uci_load(ctx, *p, &package) != UCI_OK) {
uci_perror(ctx, "uci_load");
return 255;
}
- uci_foreach_entry(section, &cfg->sections, s) {
- if (!section || !strcmp(s->name, section))
- uci_show_section(s);
+ uci_foreach_element( &package->sections, e) {
+ if (!section || !strcmp(e->name, section))
+ uci_show_section(uci_to_section(e));
}
uci_unload(ctx, *p);
}
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_export(ctx, stdout, package);
uci_unload(ctx, *p);
}
}
{
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;
}