utils/pb-console: use getty rather than exec

[petitboot] / discover / parser.c

diff --git a/discover/parser.c b/discover/parser.c
index c04a0afca610b31bfb07468824770445cfc94d92..e2940e19e1b939a3aaaaf2dca45b28d8a02e418b 100644 (file)
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -13,8 +13,12 @@
 #include "parser-utils.h"
 #include "paths.h"
 
-static int n_parsers;
-static struct parser **parsers;
+struct p_item {
+       struct list_item list;
+       struct parser *parser;
+};
+
+STATIC_LIST(parsers);
 
 static const int max_file_size = 1024 * 1024;
 
@@ -37,7 +41,7 @@ static int read_file(struct discover_context *ctx,
        if (len > max_file_size)
                goto err_close;
 
-       buf = talloc_array(ctx, char, len);
+       buf = talloc_array(ctx, char, len + 1);
        if (!buf)
                goto err_close;
 
@@ -55,6 +59,8 @@ static int read_file(struct discover_context *ctx,
 
        }
 
+       buf[len] = '\0';
+
        close(fd);
        *bufp = buf;
        *lenp = len;
@@ -73,6 +79,28 @@ static char *local_path(struct discover_context *ctx,
        return join_paths(ctx, ctx->device->mount_path, filename);
 }
 
+static int download_config(struct discover_context *ctx, char **buf, int *len)
+{
+       unsigned tempfile;
+       const char *file;
+       int rc;
+
+       file = load_url(ctx, ctx->conf_url, &tempfile);
+       if (!file)
+               return -1;
+
+       rc = read_file(ctx, file, buf, len);
+       if (rc)
+               goto out_clean;
+
+       return 0;
+
+out_clean:
+       if (tempfile)
+               unlink(file);
+       return -1;
+}
+
 static void iterate_parser_files(struct discover_context *ctx,
                const struct parser *parser)
 {
@@ -92,6 +120,8 @@ static void iterate_parser_files(struct discover_context *ctx,
 
                rc = read_file(ctx, path, &buf, &len);
                if (!rc) {
+                       pb_log("Running parser %s on file %s\n",
+                                       parser->name, *filename);
                        parser->parse(ctx, buf, len);
                        talloc_free(buf);
                }
@@ -100,28 +130,55 @@ static void iterate_parser_files(struct discover_context *ctx,
 
 void iterate_parsers(struct discover_context *ctx, enum conf_method method)
 {
-       int i;
+       struct p_item* i;
+       int rc, len;
+       char *buf;
 
        pb_log("trying parsers for %s\n", ctx->device->device->id);
 
-       if (method == CONF_METHOD_LOCAL_FILE) {
-               for (i = 0; i < n_parsers; i++) {
-                       if (parsers[i]->method != CONF_METHOD_LOCAL_FILE)
+       switch (method) {
+       case CONF_METHOD_LOCAL_FILE:
+               list_for_each_entry(&parsers, i, list) {
+                       if (i->parser->method != CONF_METHOD_LOCAL_FILE)
                                continue;
 
-                       pb_log("\ttrying parser '%s'\n", parsers[i]->name);
-                       ctx->parser = parsers[i];
+                       pb_log("\ttrying parser '%s'\n", i->parser->name);
+                       ctx->parser = i->parser;
                        iterate_parser_files(ctx, ctx->parser);
                }
                ctx->parser = NULL;
+               break;
+
+       case CONF_METHOD_DHCP:
+               rc = download_config(ctx, &buf, &len);
+               if (rc) {
+                       pb_log("\tdownload failed, aborting\n");
+                       return;
+               }
+
+               list_for_each_entry(&parsers, i, list) {
+                       if (i->parser->method != method)
+                               continue;
+
+                       pb_log("\ttrying parser '%s'\n", i->parser->name);
+                       ctx->parser = i->parser;
+                       i->parser->parse(ctx, buf, len);
+               }
+
+               break;
+
+       case CONF_METHOD_UNKNOWN:
+               break;
+
        }
 }
 
 void __register_parser(struct parser *parser)
 {
-       parsers = talloc_realloc(NULL, parsers, struct parser *, n_parsers + 1);
-       parsers[n_parsers] = parser;
-       n_parsers++;
+       struct p_item* i = talloc(NULL, struct p_item);
+
+       i->parser = parser;
+       list_add(&parsers, &i->list);
 }
 
 void parser_init(void)