sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Allow device parameters for devices with dots in name 

Devices can have a dot in the name, so we can't expect to find the
full device name before the first dot. Currently parameters of devices
with a dot in the name are inaccessible from the shell.
Fix this by iterating over the possible device name / parameter name
combinations to find a existing combination.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2016-10-07 08:56:59 +02:00
parent 098635daba
commit f5d77d80f5
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
common/env.c
View File

@ -135,25 +135,45 @@ static const char *getenv_raw(struct list_head *l, const char *name)
return NULL;
}
const char *getenv (const char *name)
static const char *dev_getenv(const char *name)
{
const char *pos, *val, *dot, *varname;
char *devname;
struct device_d *dev;
pos = name;
while (1) {
dot = strchr(pos, '.');
if (!dot)
break;
devname = xstrndup(name, dot - name);
varname = dot + 1;
dev = get_device_by_name(devname);
free(devname);
if (dev) {
val = dev_get_param(dev, varname);
if (val)
return val;
}
pos = dot + 1;
}
return NULL;
}
const char *getenv(const char *name)
{
struct env_context *c;
const char *val;
if (strchr(name, '.')) {
const char *ret = NULL;
char *devstr = strdup(name);
char *par = strchr(devstr, '.');
struct device_d *dev;
*par = 0;
dev = get_device_by_name(devstr);
if (dev) {
par++;
ret = dev_get_param(dev, par);
}
free(devstr);
return ret;
}
if (strchr(name, '.'))
return dev_getenv(name);
c = context;