X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser.c;h=462d614a5c1abeae1866a79f3748428fc956e9ec;hp=5f4e5149557678c6e0c34c59c02a42f5b5b46317;hb=f7818748090c534b8d835b970373936463bff84a;hpb=92806cf6bc15f680f75879288df12ea9a87e4608

diff --git a/discover/parser.c b/discover/parser.c
index 5f4e514..462d614 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -1,12 +1,17 @@
 
+#include <fcntl.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "types/types.h"
 #include <log/log.h>
+#include <talloc/talloc.h>
 
 #include "device-handler.h"
 #include "parser.h"
 #include "parser-utils.h"
+#include "paths.h"
 
 struct parser __grub2_parser;
 struct parser __kboot_parser;
@@ -21,19 +26,98 @@ static const struct parser *const parsers[] = {
 	NULL
 };
 
+static const int max_file_size = 1024 * 1024;
+
+static int read_file(struct discover_context *ctx,
+		const char *filename, char **bufp, int *lenp)
+{
+	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;
+
+	buf = talloc_array(ctx, char, len);
+	if (!buf)
+		goto err_close;
+
+	for (i = 0; i < len; i += rc) {
+		rc = read(fd, buf + i, len - i);
+
+		/* unexpected EOF: trim and return */
+		if (rc == 0) {
+			len = i;
+			break;
+		}
+
+		if (rc < 0)
+			goto err_free;
+
+	}
+
+	close(fd);
+	*bufp = buf;
+	*lenp = len;
+	return 0;
+
+err_free:
+	talloc_free(buf);
+err_close:
+	close(fd);
+	return -1;
+}
+
+static char *local_path(struct discover_context *ctx,
+		const char *filename)
+{
+	return join_paths(ctx, ctx->device->mount_path, filename);
+}
+
+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, *filename);
+		if (!path)
+			continue;
+
+		rc = read_file(ctx, path, &buf, &len);
+		if (!rc) {
+			parser->parse(ctx, buf, len);
+			talloc_free(buf);
+		}
+	}
+}
+
 void iterate_parsers(struct discover_context *ctx)
 {
 	int i;
-	unsigned int count = 0;
 
 	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);
-		count += parsers[i]->parse(ctx);
+		iterate_parser_files(ctx, parsers[i]);
 	}
-	if (!count)
-		pb_log("\tno boot_options found\n");
 }
 
 void parser_init(void)