X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=devices%2Fparser-test.c;h=8c94d3f899d4c2f43ea4945ae006ccd619a05065;hb=469642a52fc3f3f1ffd3f29ae16286876500ff9a;hp=9b106b6b2cdf43a2119a63bbf72ee246b96a2d62;hpb=0baa987696e787f5136f2296295206d99c238f19;p=petitboot

diff --git a/devices/parser-test.c b/devices/parser-test.c
index 9b106b6..8c94d3f 100644
--- a/devices/parser-test.c
+++ b/devices/parser-test.c
@@ -1,45 +1,61 @@
+#define _GNU_SOURCE
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <unistd.h>
+#include <string.h>
 
 #include "parser.h"
+#include "paths.h"
 
 void pb_log(const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
-	fprintf(stderr, fmt, ap);
+	vfprintf(stderr, fmt, ap);
 	va_end(ap);
 }
 
-
-int mount_device(const char *dev_path, char *mount_path)
+int mount_device(const char *dev_path)
 {
-	pb_log("attempt to mount device (%s) not supported\n", dev_path);
-	return -1;
+	printf("[mount] %s\n", dev_path);
+	return 0;
 }
 
+static int device_idx;
+static int option_idx;
+
 int add_device(const struct device *dev)
 {
-	printf("device added:\n");
-	printf("\tid: %s\n", dev->id);
-	printf("\tname: %s\n", dev->name);
-	printf("\tdescription: %s\n", dev->description);
-	printf("\tboot_image: %s\n", dev->icon_file);
+	printf("[dev %2d] id: %s\n", device_idx, dev->id);
+	printf("[dev %2d] name: %s\n", device_idx, dev->name);
+	printf("[dev %2d] description: %s\n", device_idx, dev->description);
+	printf("[dev %2d] boot_image: %s\n", device_idx, dev->icon_file);
+
+	device_idx++;
+	option_idx = 0;
 	return 0;
 }
 
+
 int add_boot_option(const struct boot_option *opt)
 {
-	printf("option added:\n");
-	printf("\tname: %s\n", opt->name);
-	printf("\tdescription: %s\n", opt->description);
-	printf("\tboot_image: %s\n", opt->boot_image_file);
-	printf("\tinitrd: %s\n", opt->initrd_file);
-	printf("\tboot_args: %s\n", opt->boot_args);
+	if (!device_idx) {
+		fprintf(stderr, "Option (%s) added before device\n",
+				opt->name);
+		exit(EXIT_FAILURE);
+	}
+
+	printf("[opt %2d] name: %s\n", option_idx, opt->name);
+	printf("[opt %2d] description: %s\n", option_idx, opt->description);
+	printf("[opt %2d] boot_image: %s\n", option_idx, opt->boot_image_file);
+	printf("[opt %2d] initrd: %s\n", option_idx, opt->initrd_file);
+	printf("[opt %2d] boot_args: %s\n", option_idx, opt->boot_args);
+
+	option_idx++;
+
 	return 0;
 }
 
@@ -50,14 +66,20 @@ enum generic_icon_type guess_device_type(void)
 
 int main(int argc, char **argv)
 {
-	const char *dev = "/dev/null";
+	char *mountpoint, *dev;
 
-	if (argc != 2) {
-		fprintf(stderr, "usage: %s <fake-mountpoint>\n", argv[0]);
+	if (argc != 3) {
+		fprintf(stderr, "usage: %s <basedir> <devname>\n", argv[0]);
 		return EXIT_FAILURE;
 	}
 
-	iterate_parsers(dev, argv[1]);
+	mountpoint = argv[1];
+	dev = argv[2];
+
+	set_mount_base(mountpoint);
+
+	iterate_parsers(dev, mountpoint);
+
 
 	return EXIT_SUCCESS;
 }