X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser.c;h=7b701181811d4f358b777b2ea2ea8394c431f95b;hp=6896075ed1742b82b4e9306a5b1072556c8463df;hb=089d0a6eb769d531129a7cd1061493a1a24b4bef;hpb=a70807730ef59efc4116556ecabe1b9f70ce605b

diff --git a/discover/parser.c b/discover/parser.c
index 6896075..7b70118 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -22,30 +22,80 @@ struct p_item {
 STATIC_LIST(parsers);
 
 static char *local_path(struct discover_context *ctx,
+		struct discover_device *dev,
 		const char *filename)
 {
-	return join_paths(ctx, ctx->device->mount_path, filename);
+	return join_paths(ctx, dev->mount_path, filename);
+}
+
+int parser_request_file(struct discover_context *ctx,
+		struct discover_device *dev, const char *filename,
+		char **buf, int *len)
+
+{
+	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;
+}
+
+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;
 }
 
 static int download_config(struct discover_context *ctx, char **buf, int *len)
 {
-	unsigned tempfile;
-	const char *file;
+	struct load_url_result *result;
 	int rc;
 
-	file = load_url(ctx, ctx->conf_url, &tempfile);
-	if (!file)
+	result = load_url(ctx, ctx->conf_url);
+	if (!result)
 		return -1;
 
-	rc = read_file(ctx, file, buf, len);
+	rc = read_file(ctx, result->local, buf, len);
 	if (rc)
 		goto out_clean;
 
 	return 0;
 
 out_clean:
-	if (tempfile)
-		unlink(file);
+	if (result->cleanup_local)
+		unlink(result->local);
 	return -1;
 }
 
@@ -62,7 +112,7 @@ static void iterate_parser_files(struct discover_context *ctx,
 		int rc, len;
 		char *buf;
 
-		path = local_path(ctx, *filename);
+		path = local_path(ctx, ctx->device, *filename);
 		if (!path)
 			continue;
 
@@ -90,7 +140,7 @@ void iterate_parsers(struct discover_context *ctx, enum conf_method method)
 			if (i->parser->method != CONF_METHOD_LOCAL_FILE)
 				continue;
 
-			pb_log("\ttrying parser '%s'\n", i->parser->name);
+			pb_debug("\ttrying parser '%s'\n", i->parser->name);
 			ctx->parser = i->parser;
 			iterate_parser_files(ctx, ctx->parser);
 		}
@@ -108,7 +158,7 @@ void iterate_parsers(struct discover_context *ctx, enum conf_method method)
 			if (i->parser->method != method)
 				continue;
 
-			pb_log("\ttrying parser '%s'\n", i->parser->name);
+			pb_debug("\ttrying parser '%s'\n", i->parser->name);
 			ctx->parser = i->parser;
 			i->parser->parse(ctx, buf, len);
 		}
@@ -121,14 +171,25 @@ void iterate_parsers(struct discover_context *ctx, enum conf_method method)
 	}
 }
 
+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)
 {
 }