summaryrefslogtreecommitdiffstats
path: root/discover/parser-conf.c
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-03-12 16:13:55 +0800
committerJeremy Kerr <jk@ozlabs.org>2013-04-29 14:31:12 +1000
commit06a49ebdfc795a70b938f5aee29f3c488ef9fc21 (patch)
tree57ef497f90ed6dbbccbdd0cedae6e7f0989bd150 /discover/parser-conf.c
parent39e06f5cfda0ed0c1eeb7a7604a3d05dda81ccf1 (diff)
downloadtalos-petitboot-06a49ebdfc795a70b938f5aee29f3c488ef9fc21.tar.gz
talos-petitboot-06a49ebdfc795a70b938f5aee29f3c488ef9fc21.zip
parsers: change parser.parse to accept a buffer
Rather than having each of the parsers do their own open(), read(), etc, use the registered filenames array to find & open parser conf files. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/parser-conf.c')
-rw-r--r--discover/parser-conf.c84
1 files changed, 3 insertions, 81 deletions
diff --git a/discover/parser-conf.c b/discover/parser-conf.c
index 247e29d..94612c3 100644
--- a/discover/parser-conf.c
+++ b/discover/parser-conf.c
@@ -220,14 +220,15 @@ const char *conf_get_global_option(struct conf_context *conf,
* Called from conf_parse() with data read from a conf file.
*/
-static void conf_parse_buf(struct conf_context *conf)
+void conf_parse_buf(struct conf_context *conf, char *buf,
+ int len __attribute__((unused)))
{
char *pos, *name, *value;
assert(conf->get_pair);
assert(conf->process_pair);
- for (pos = conf->buf; pos;) {
+ for (pos = buf; pos;) {
pos = conf->get_pair(conf, pos, &name, &value, '\n');
if (!value)
@@ -245,82 +246,3 @@ static void conf_parse_buf(struct conf_context *conf)
if (conf->finish)
conf->finish(conf);
}
-
-/**
- * conf_parse - The common parser entry.
- *
- * Called from the parser specific setup routines. Searches for .conf
- * files, reads data into buffers, and calls conf_parse_buf().
- */
-
-int conf_parse(struct conf_context *conf)
-{
- struct device *dev;
- int fd, rc;
- unsigned int i;
- struct stat stat;
- ssize_t len;
-
- rc = 0;
- fd = -1;
- len = 0;
-
- /* The parser is only run on the first file found. */
- /* FIXME: Could try others on error, etc. */
-
- for (i = 0; conf->conf_files[i]; i++) {
- char *filepath = resolve_path(conf->dc,
- conf->conf_files[i], conf->dc->device->device_path);
-
- pb_log("%s: try: %s\n", __func__, filepath);
-
- fd = open(filepath, O_RDONLY);
-
- talloc_free(filepath);
-
- if (fd < 0) {
- pb_log("%s: open failed: %s\n", __func__,
- strerror(errno));
- continue;
- }
-
- if (fstat(fd, &stat)) {
- pb_log("%s: fstat failed: %s\n", __func__,
- strerror(errno));
- continue;
- }
-
- conf->buf = talloc_array(conf, char, stat.st_size + 1);
-
- len = read(fd, conf->buf, stat.st_size);
-
- if (len < 0) {
- pb_log("%s: read failed: %s\n", __func__,
- strerror(errno));
- continue;
- }
- conf->buf[len] = 0;
-
- break;
- }
-
- if (fd >= 0)
- close(fd);
-
- if (len <= 0)
- goto out;
-
- dev = conf->dc->device->device;
- if (!dev->icon_file)
- dev->icon_file = talloc_strdup(dev,
- generic_icon_file(guess_device_type(conf->dc)));
-
- conf_parse_buf(conf);
-
- rc = 1;
-
-out:
- pb_log("%s: %s\n", __func__, (rc ? "ok" : "failed"));
- return rc;
-}
-
OpenPOWER on IntegriCloud