rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync ubus familly tools.

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2017-04-08 21:34:59 +02:00
parent 0e9f199c9c
commit 63d0813f93
57 changed files with 413 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/3P/ubox/validate/cli.c
View File

@@ -8,7 +8,7 @@
#include <netinet/ether.h>
#include <sys/stat.h>
#include <uci.h>
#include <uci/uci.h>
#include "libvalidate.h"
@@ -109,28 +109,39 @@ static int
validate_value(struct uci_ptr *ptr, const char *expr, const char *def)
{
int i = 0;
bool empty = true;
bool empty = true, first = true;
enum dt_type type = DT_INVALID;
struct uci_element *e;
struct uci_option *opt = NULL;
struct uci_option *opt = ptr->o;
if ((ptr->flags & UCI_LOOKUP_COMPLETE) &&
(ptr->last->type == UCI_TYPE_OPTION))
opt = ptr->o;
if (opt && opt->type == UCI_TYPE_LIST)
if (opt->type == UCI_TYPE_LIST)
{
uci_foreach_element(&opt->v.list, e)
{
if (!e->name || !*e->name)
continue;
if (empty)
empty = false;
break;
}
if (empty)
{
export_value(DT_STRING, ptr->option, def);
return 0;
}
uci_foreach_element(&opt->v.list, e)
{
if (!e->name || !*e->name)
continue;
if (first)
printf("%s=", ptr->option);
else
printf("\\ ");
empty = false;
first = false;
type = dt_parse(expr, e->name);
if (type != DT_INVALID)
@@ -141,12 +152,16 @@ validate_value(struct uci_ptr *ptr, const char *expr, const char *def)
expr, type ? "true" : "false");
}
if (!empty)
printf("; ");
printf("; ");
}
else if (opt && opt->v.string && *opt->v.string)
else
{
empty = false;
if (!opt->v.string || !*opt->v.string)
{
export_value(DT_STRING, ptr->option, def);
return 0;
}
type = dt_parse(expr, opt->v.string);
export_value(type, ptr->option, opt->v.string);
@@ -154,20 +169,6 @@ validate_value(struct uci_ptr *ptr, const char *expr, const char *def)
ptr->package, ptr->section, ptr->option, opt->v.string,
expr, type ? "true" : "false");
}
if (empty)
{
type = dt_parse(expr, def);
if (type == DT_INVALID)
type = DT_STRING;
export_value(type, ptr->option, def);
fprintf(stderr, "%s.%s.%s is unset and defaults to %s %s\n",
ptr->package, ptr->section, ptr->option, expr, def);
}
return type ? 0 : -1;
}
@@ -187,7 +188,13 @@ validate_option(struct uci_context *ctx, char *package, char *section, char *opt
ptr.section = section;
ptr.option = opt;
uci_lookup_ptr(ctx, &ptr, NULL, false);
if (uci_lookup_ptr(ctx, &ptr, NULL, false) ||
!(ptr.flags & UCI_LOOKUP_COMPLETE) ||
(ptr.last->type != UCI_TYPE_OPTION))
{
export_value(DT_STRING, opt, def);
return 0;
}
return validate_value(&ptr, expr, def);
}