X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser.c;h=74b2559c8ab9776d138bddc7a8ea51ef9625351d;hp=87241a9cdb2e60b98913791b81eae86f371d08f3;hb=4896183708855fbfd0aa892537fbcc17ed7eb971;hpb=89ccc8e6dc81bc1d613454b9944c2f3324d43e2a

diff --git a/discover/parser.c b/discover/parser.c
index 87241a9..74b2559 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -1,46 +1,161 @@
 
+#include <fcntl.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
-#include "pb-protocol/pb-protocol.h"
+#include "types/types.h"
+#include <log/log.h>
+#include <talloc/talloc.h>
 
 #include "device-handler.h"
-#include "log.h"
 #include "parser.h"
 #include "parser-utils.h"
+#include "paths.h"
+#include "file.h"
 
-extern struct parser __start_parsers[], __stop_parsers[];
+struct p_item {
+	struct list_item list;
+	struct parser *parser;
+};
 
-void iterate_parsers(struct discover_context *ctx)
+STATIC_LIST(parsers);
+
+static char *local_path(struct discover_context *ctx,
+		struct discover_device *dev,
+		const char *filename)
 {
-	struct parser *parser;
+	return join_paths(ctx, dev->mount_path, filename);
+}
 
-	pb_log("trying parsers for %s\n", ctx->device_path);
+int parser_request_file(struct discover_context *ctx,
+		struct discover_device *dev, const char *filename,
+		char **buf, int *len)
 
-	for (parser = __start_parsers; parser < __stop_parsers; parser++) {
-		pb_log("\ttrying parser '%s'\n", parser->name);
-		/* just use a dummy device path for now */
-		if (parser->parse(ctx))
-			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;
 }
 
-static int compare_parsers(const void *a, const void *b)
+int parser_check_dir(struct discover_context *ctx,
+		struct discover_device *dev, const char *dirname)
 {
-	const struct parser *parser_a = a, *parser_b = b;
+	struct stat statbuf;
+	char *path;
+	int rc;
 
-	if (parser_a->priority > parser_b->priority)
+	if (!dev->mount_path)
 		return -1;
 
-	if (parser_a->priority < parser_b->priority)
-		return 1;
+	path = local_path(ctx, dev, dirname);
+
+	rc = stat(path, &statbuf);
+	if (!rc)
+		return -1;
+
+	return S_ISDIR(statbuf.st_mode) ? 0 : -1;
+}
+
+int parser_replace_file(struct discover_context *ctx,
+		struct discover_device *dev, const char *filename,
+		char *buf, int len)
+{
+	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;
+}
+
+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)
+{
+	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);
+	}
+	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)
 {
-	/* sort our parsers into descending priority order */
-	qsort(__start_parsers, __stop_parsers - __start_parsers,
-			sizeof(struct parser), compare_parsers);
 }