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

diff --git a/discover/parser.c b/discover/parser.c
index 641e06b..74b2559 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -12,111 +12,148 @@
 #include "parser.h"
 #include "parser-utils.h"
 #include "paths.h"
+#include "file.h"
 
-static int n_parsers;
-static struct parser **parsers;
+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;
+	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)
 
-	fd = open(filename, O_RDONLY);
-	if (fd < 0)
+{
+	char *path;
+	int rc;
+
+	/* we only support local files at present */
+	if (!dev->mount_path)
 		return -1;
 
-	rc = fstat(fd, &statbuf);
-	if (rc < 0)
-		goto err_close;
+	path = local_path(ctx, dev, filename);
 
-	len = statbuf.st_size;
-	if (len > max_file_size)
-		goto err_close;
+	rc = read_file(ctx, path, buf, len);
 
-	buf = talloc_array(ctx, char, len);
-	if (!buf)
-		goto err_close;
+	talloc_free(path);
 
-	for (i = 0; i < len; i += rc) {
-		rc = read(fd, buf + i, len - i);
+	return rc;
+}
 
-		/* unexpected EOF: trim and return */
-		if (rc == 0) {
-			len = i;
-			break;
-		}
+int parser_check_dir(struct discover_context *ctx,
+		struct discover_device *dev, const char *dirname)
+{
+	struct stat statbuf;
+	char *path;
+	int rc;
 
-		if (rc < 0)
-			goto err_free;
+	if (!dev->mount_path)
+		return -1;
 
-	}
+	path = local_path(ctx, dev, dirname);
 
-	close(fd);
-	*bufp = buf;
-	*lenp = len;
-	return 0;
+	rc = stat(path, &statbuf);
+	if (!rc)
+		return -1;
 
-err_free:
-	talloc_free(buf);
-err_close:
-	close(fd);
-	return -1;
+	return S_ISDIR(statbuf.st_mode) ? 0 : -1;
 }
 
-static char *local_path(struct discover_context *ctx,
-		const char *filename)
+int parser_replace_file(struct discover_context *ctx,
+		struct discover_device *dev, const char *filename,
+		char *buf, int len)
 {
-	return join_paths(ctx, ctx->device->mount_path, filename);
-}
+	bool release;
+	char *path;
+	int rc;
 
-static void iterate_parser_files(struct discover_context *ctx,
-		const struct parser *parser)
-{
-	const char * const *filename;
-	const char *path;
+	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);
 
-	if (!parser->filenames)
-		return;
+	rc = replace_file(path, buf, len);
 
-	for (filename = parser->filenames; *filename; filename++) {
-		int rc, len;
-		char *buf;
+	talloc_free(path);
 
-		path = local_path(ctx, *filename);
-		if (!path)
-			continue;
+	device_release_write(dev, release);
 
-		rc = read_file(ctx, path, &buf, &len);
-		if (!rc) {
-			parser->parse(ctx, buf, len);
-			talloc_free(buf);
-		}
+	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; i < n_parsers; i++) {
-		pb_log("\ttrying parser '%s'\n", parsers[i]->name);
-		ctx->parser = parsers[i];
-		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)
 {
-	parsers = talloc_realloc(NULL, parsers, struct parser *, n_parsers + 1);
-	parsers[n_parsers] = parser;
-	n_parsers++;
+	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)