discover: Change parsers to explicitly request configuration files

[petitboot] / discover / parser.c

diff --git a/discover/parser.c b/discover/parser.c
index 5e50dcbdafc292f8c05a29f986f1d5510259938b..21b48debcb31d52e4f788040c1ce391e4ded7fc6 100644 (file)
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -1,85 +1,142 @@
 
-#include <petitboot-paths.h>
+#include <fcntl.h>
 #include <stdlib.h>
-#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
-#include "parser.h"
+#include "types/types.h"
+#include <log/log.h>
+#include <talloc/talloc.h>
 
-extern struct parser native_parser;
-extern struct parser yaboot_parser;
-extern struct parser kboot_parser;
+#include "device-handler.h"
+#include "parser.h"
+#include "parser-utils.h"
+#include "paths.h"
+#include "file.h"
 
-/* array of parsers, ordered by priority */
-static struct parser *parsers[] = {
-       &native_parser,
-       &yaboot_parser,
-       &kboot_parser,
-       NULL
+struct p_item {
+       struct list_item list;
+       struct parser *parser;
 };
 
-void iterate_parsers(const char *devpath, const char *mountpoint)
+STATIC_LIST(parsers);
+
+static char *local_path(struct discover_context *ctx,
+               struct discover_device *dev,
+               const char *filename)
 {
-       int i;
+       return join_paths(ctx, dev->mount_path, filename);
+}
 
-       pb_log("trying parsers for %s\n", devpath);
+int parser_request_file(struct discover_context *ctx,
+               struct discover_device *dev, const char *filename,
+               char **buf, int *len)
 
-       for (i = 0; parsers[i]; i++) {
-               pb_log("\ttrying parser '%s'\n", parsers[i]->name);
-               /* just use a dummy device path for now */
-               if (parsers[i]->parse(devpath))
-                       return;
-       }
-       pb_log("\tno boot_options found\n");
+{
+       char *path;
+       int rc;
+
+       /* we only support local files at present */
+       if (!dev->mount_path)
+               return -1;
+
+       path = local_path(ctx, dev, filename);
+
+       rc = read_file(ctx, path, buf, len);
+
+       talloc_free(path);
+
+       return rc;
 }
 
-/* convenience functions for parsers */
-void free_device(struct device *dev)
+int parser_replace_file(struct discover_context *ctx,
+               struct discover_device *dev, const char *filename,
+               char *buf, int len)
 {
-       if (!dev)
-               return;
-       if (dev->id)
-               free(dev->id);
-       if (dev->name)
-               free(dev->name);
-       if (dev->description)
-               free(dev->description);
-       if (dev->icon_file)
-               free(dev->icon_file);
-       free(dev);
+       bool release;
+       char *path;
+       int rc;
+
+       if (!dev->mounted)
+               return -1;
+
+       rc = device_request_write(dev, &release);
+       if (rc) {
+               pb_log("Can't write file %s: device doesn't allow write\n",
+                               dev->device_path);
+               return -1;
+       }
+
+       path = local_path(ctx, dev, filename);
+
+       rc = replace_file(path, buf, len);
+
+       talloc_free(path);
+
+       device_release_write(dev, release);
+
+       return rc;
 }
 
-void free_boot_option(struct boot_option *opt)
+int parser_request_url(struct discover_context *ctx, struct pb_url *url,
+               char **buf, int *len)
 {
-       if (!opt)
-               return;
-       if (opt->name)
-               free(opt->name);
-       if (opt->description)
-               free(opt->description);
-       if (opt->icon_file)
-               free(opt->icon_file);
-       if (opt->boot_image_file)
-               free(opt->boot_image_file);
-       if (opt->initrd_file)
-               free(opt->initrd_file);
-       if (opt->boot_args)
-               free(opt->boot_args);
-       free(opt);
+       struct load_url_result *result;
+       int rc;
+
+       result = load_url(ctx, url);
+       if (!result)
+               goto out;
+
+       rc = read_file(ctx, result->local, buf, len);
+       if (rc) {
+               pb_log("Read failed for the parser %s on file %s\n",
+                               ctx->parser->name, result->local);
+               goto out_clean;
+       }
+
+       return 0;
+
+out_clean:
+       if (result->cleanup_local)
+               unlink(result->local);
+out:
+       return -1;
 }
 
-const char *generic_icon_file(enum generic_icon_type type)
+void iterate_parsers(struct discover_context *ctx)
 {
-       switch (type) {
-       case ICON_TYPE_DISK:
-               return artwork_pathname("hdd.png");
-       case ICON_TYPE_USB:
-               return artwork_pathname("usbpen.png");
-       case ICON_TYPE_OPTICAL:
-               return artwork_pathname("cdrom.png");
-       case ICON_TYPE_NETWORK:
-       case ICON_TYPE_UNKNOWN:
-               break;
+       struct p_item* i;
+
+       pb_log("trying parsers for %s\n", ctx->device->device->id);
+
+       list_for_each_entry(&parsers, i, list) {
+               pb_debug("\ttrying parser '%s'\n", i->parser->name);
+               ctx->parser = i->parser;
+               i->parser->parse(ctx);
        }
-       return artwork_pathname("hdd.png");
+       ctx->parser = NULL;
+}
+
+static void *parsers_ctx;
+
+void __register_parser(struct parser *parser)
+{
+       struct p_item *i;
+
+       if (!parsers_ctx)
+               parsers_ctx = talloc_new(NULL);
+
+       i = talloc(parsers_ctx, struct p_item);
+       i->parser = parser;
+       list_add(&parsers, &i->list);
 }
 
+static __attribute__((destructor)) void cleanup_parsers(void)
+{
+       talloc_free(parsers_ctx);
+}
+
+void parser_init(void)
+{
+}