linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

env: Add regex support to env_attrs

Browse Source 
Allow the features that use env_attrs to specify regexs for the name

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Joe Hershberger
2015-05-20 14:27:20 -05:00
committed by Tom Rini
parent cca98fd6aa
commit bdf1fe4e68
3 changed files with 101 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
common/env_attr.c
View File

@ -11,6 +11,7 @@
#include <linux/linux_string.h>
#else
#include <common.h>
#include <slre.h>
#endif
#include <env_attr.h>
@ -109,6 +110,89 @@ int env_attr_walk(const char *attr_list,
return 0;
}
#if defined(CONFIG_REGEX)
struct regex_callback_priv {
const char *searched_for;
char *regex;
char *attributes;
};
static int regex_callback(const char *name, const char *attributes, void *priv)
{
int retval = 0;
struct regex_callback_priv *cbp = (struct regex_callback_priv *)priv;
struct slre slre;
char regex[strlen(name) + 3];
/* Require the whole string to be described by the regex */
sprintf(regex, "^%s$", name);
if (slre_compile(&slre, regex)) {
struct cap caps[slre.num_caps + 2];
if (slre_match(&slre, cbp->searched_for,
strlen(cbp->searched_for), caps)) {
free(cbp->regex);
cbp->regex = malloc(strlen(regex) + 1);
if (cbp->regex) {
strcpy(cbp->regex, regex);
} else {
retval = -ENOMEM;
goto done;
}
free(cbp->attributes);
cbp->attributes = malloc(strlen(attributes) + 1);
if (cbp->attributes) {
strcpy(cbp->attributes, attributes);
} else {
retval = -ENOMEM;
free(cbp->regex);
cbp->regex = NULL;
goto done;
}
}
} else {
printf("Error compiling regex: %s\n", slre.err_str);
retval = EINVAL;
}
done:
return retval;
}
/*
* Retrieve the attributes string associated with a single name in the list
* There is no protection on attributes being too small for the value
*/
int env_attr_lookup(const char *attr_list, const char *name, char *attributes)
{
if (!attributes)
/* bad parameter */
return -EINVAL;
if (!attr_list)
/* list not found */
return -EINVAL;
struct regex_callback_priv priv;
int retval;
priv.searched_for = name;
priv.regex = NULL;
priv.attributes = NULL;
retval = env_attr_walk(attr_list, regex_callback, &priv);
if (retval)
return retval; /* error */
if (priv.regex) {
strcpy(attributes, priv.attributes);
free(priv.attributes);
free(priv.regex);
/* success */
return 0;
}
return -ENOENT; /* not found in list */
}
#else
/*
* Search for the last exactly matching name in an attribute list
*/
@ -219,3 +303,4 @@ int env_attr_lookup(const char *attr_list, const char *name, char *attributes)
/* not found in list */
return -ENOENT;
}
#endif