From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 1/2] Allow device parameters for devices with dots in name
Date: Fri, 7 Oct 2016 09:09:07 +0200 [thread overview]
Message-ID: <20161007070908.14855-1-s.hauer@pengutronix.de> (raw)
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>
---
common/env.c | 48 ++++++++++++++++++++++++++++++++++--------------
1 file changed, 34 insertions(+), 14 deletions(-)
diff --git a/common/env.c b/common/env.c
index 6f736d5..df8a4df 100644
--- a/common/env.c
+++ b/common/env.c
@@ -135,26 +135,46 @@ 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)
{
- struct env_context *c;
- const char *val;
+ 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 (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);
+ val = dev_get_param(dev, varname);
+ if (val)
+ return val;
}
- free(devstr);
- return ret;
+
+ pos = dot + 1;
}
+ return NULL;
+}
+
+const char *getenv(const char *name)
+{
+ struct env_context *c;
+ const char *val;
+
+ if (strchr(name, '.'))
+ return dev_getenv(name);
+
c = context;
val = getenv_raw(&c->local, name);
--
2.9.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2016-10-07 7:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-07 7:09 Sascha Hauer [this message]
2016-10-07 7:09 ` [PATCH 2/2] completion: Fix completion for devices with a dot in the name Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161007070908.14855-1-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox