discover/grub2: Ignore sign-compare warning for generated code

[petitboot] / discover / parser.c

diff --git a/discover/parser.c b/discover/parser.c
index b0668808cd859cfe7706ad5df870005878639a4e..5598f963e236d2c6806aa0ac9166b242c18d266a 100644 (file)
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -1,10 +1,9 @@
 
 #include <fcntl.h>
 #include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 
 #include "types/types.h"
+#include <file/file.h>
 #include <log/log.h>
 #include <talloc/talloc.h>
 
@@ -12,7 +11,6 @@
 #include "parser.h"
 #include "parser-utils.h"
 #include "paths.h"
-#include "file.h"
 
 struct p_item {
        struct list_item list;
@@ -25,7 +23,7 @@ static char *local_path(struct discover_context *ctx,
                struct discover_device *dev,
                const char *filename)
 {
-       return join_paths(ctx, dev->mount_path, filename);
+       return join_paths(ctx, dev->root_path, filename);
 }
 
 int parser_request_file(struct discover_context *ctx,
@@ -49,6 +47,32 @@ int parser_request_file(struct discover_context *ctx,
        return rc;
 }
 
+int parser_stat_path(struct discover_context *ctx,
+               struct discover_device *dev, const char *path,
+               struct stat *statbuf)
+{
+       int rc = -1;
+       char *full_path;
+
+       /* we only support local files at present */
+       if (!dev->mount_path)
+               return -1;
+
+       full_path = local_path(ctx, dev, path);
+
+       rc = stat(full_path, statbuf);
+       if (rc) {
+               rc = -1;
+               goto out;
+       }
+
+       rc = 0;
+out:
+       talloc_free(full_path);
+
+       return rc;
+}
+
 int parser_replace_file(struct discover_context *ctx,
                struct discover_device *dev, const char *filename,
                char *buf, int len)
@@ -78,107 +102,65 @@ int parser_replace_file(struct discover_context *ctx,
        return rc;
 }
 
-static int download_config(struct discover_context *ctx, char **buf, int *len)
+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, ctx->conf_url);
+       result = load_url(ctx, url);
        if (!result)
-               return -1;
+               goto out;
 
        rc = read_file(ctx, result->local, buf, len);
-       if (rc)
+       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;
 }
 
-static void iterate_parser_files(struct discover_context *ctx,
-               const struct parser *parser)
-{
-       const char * const *filename;
-       const char *path;
-
-       if (!parser->filenames)
-               return;
-
-       for (filename = parser->filenames; *filename; filename++) {
-               int rc, len;
-               char *buf;
-
-               path = local_path(ctx, ctx->device, *filename);
-               if (!path)
-                       continue;
-
-               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);
-               }
-       }
-}
-
-void iterate_parsers(struct discover_context *ctx, enum conf_method method)
+void iterate_parsers(struct discover_context *ctx)
 {
        struct p_item* i;
-       int rc, len;
-       char *buf;
 
        pb_log("trying parsers for %s\n", ctx->device->device->id);
 
-       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", 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;
-
+       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 = talloc(NULL, struct p_item);
+       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)
 {
 }