discover: Use pxeconffile for udhcpc option name

[petitboot] / discover / parser.c

diff --git a/discover/parser.c b/discover/parser.c
index 1f3674d3ee461cc24fac0f9ca5a8fc11d765fb1c..21b48debcb31d52e4f788040c1ce391e4ded7fc6 100644 (file)
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -12,117 +12,129 @@
 #include "parser.h"
 #include "parser-utils.h"
 #include "paths.h"
+#include "file.h"
 
-struct parser __grub2_parser;
-struct parser __kboot_parser;
-struct parser __native_parser;
-struct parser __yaboot_parser;
-
-static const struct parser *const parsers[] = {
-//     &__native_parser,
-       &__kboot_parser,
-       &__grub2_parser,
-       &__yaboot_parser,
-       NULL
+struct p_item {
+       struct list_item list;
+       struct parser *parser;
 };
 
-static const int max_file_size = 1024 * 1024;
+STATIC_LIST(parsers);
 
-static int read_file(struct discover_context *ctx,
-               const char *filename, char **bufp, int *lenp)
+static char *local_path(struct discover_context *ctx,
+               struct discover_device *dev,
+               const char *filename)
 {
-       struct stat statbuf;
-       int rc, fd, i, len;
-       char *buf;
-
-       fd = open(filename, O_RDONLY);
-       if (fd < 0)
-               return -1;
-
-       rc = fstat(fd, &statbuf);
-       if (rc < 0)
-               goto err_close;
-
-       len = statbuf.st_size;
-       if (len > max_file_size)
-               goto err_close;
+       return join_paths(ctx, dev->mount_path, filename);
+}
 
-       buf = talloc_array(ctx, char, len);
-       if (!buf)
-               goto err_close;
+int parser_request_file(struct discover_context *ctx,
+               struct discover_device *dev, const char *filename,
+               char **buf, int *len)
 
-       for (i = 0; i < len; i += rc) {
-               rc = read(fd, buf + i, len - i);
+{
+       char *path;
+       int rc;
 
-               /* unexpected EOF: trim and return */
-               if (rc == 0) {
-                       len = i;
-                       break;
-               }
+       /* we only support local files at present */
+       if (!dev->mount_path)
+               return -1;
 
-               if (rc < 0)
-                       goto err_free;
+       path = local_path(ctx, dev, filename);
 
-       }
+       rc = read_file(ctx, path, buf, len);
 
-       close(fd);
-       *bufp = buf;
-       *lenp = len;
-       return 0;
+       talloc_free(path);
 
-err_free:
-       talloc_free(buf);
-err_close:
-       close(fd);
-       return -1;
+       return rc;
 }
 
-static void iterate_parser_files(struct discover_context *ctx,
-               const struct parser *parser)
+int parser_replace_file(struct discover_context *ctx,
+               struct discover_device *dev, const char *filename,
+               char *buf, int len)
 {
-       const char * const *filename;
-       const char *path, *url;
-       unsigned int tempfile;
+       bool release;
+       char *path;
+       int rc;
 
-       if (!parser->filenames)
-               return;
+       if (!dev->mounted)
+               return -1;
 
-       for (filename = parser->filenames; *filename; filename++) {
-               int rc, len;
-               char *buf;
+       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;
+       }
 
-               url = resolve_path(ctx, *filename, ctx->device->device_path);
-               if (!url)
-                       continue;
+       path = local_path(ctx, dev, filename);
 
-               path = load_file(ctx, url, &tempfile);
+       rc = replace_file(path, buf, len);
 
-               if (!path)
-                       continue;
+       talloc_free(path);
 
-               rc = read_file(ctx, path, &buf, &len);
-               if (!rc) {
-                       parser->parse(ctx, buf, len);
-                       talloc_free(buf);
-               }
+       device_release_write(dev, release);
 
-               if (tempfile)
-                       unlink(path);
+       return rc;
+}
 
+int parser_request_url(struct discover_context *ctx, struct pb_url *url,
+               char **buf, int *len)
+{
+       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;
 }
 
 void iterate_parsers(struct discover_context *ctx)
 {
-       int i;
+       struct p_item* i;
 
        pb_log("trying parsers for %s\n", ctx->device->device->id);
 
-       for (i = 0; parsers[i]; i++) {
-               pb_log("\ttrying parser '%s'\n", parsers[i]->name);
-               iterate_parser_files(ctx, parsers[i]);
+       list_for_each_entry(&parsers, i, list) {
+               pb_debug("\ttrying parser '%s'\n", i->parser->name);
+               ctx->parser = i->parser;
+               i->parser->parse(ctx);
        }
+       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)