X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=devices%2Fparser-test.c;fp=devices%2Fparser-test.c;h=12348b8991f680bb3c0683f257ff58c823a9165b;hb=81aa8fc95444b14e427befa5b03f52388f64e21c;hp=9622d4d31463e0268207483507f1b990fddaa42c;hpb=827e0b3bdfaf4a218e1d75cb9e6a52ec097a3a38;p=petitboot

diff --git a/devices/parser-test.c b/devices/parser-test.c
index 9622d4d..12348b8 100644
--- a/devices/parser-test.c
+++ b/devices/parser-test.c
@@ -17,31 +17,44 @@ void pb_log(const char *fmt, ...)
 	va_end(ap);
 }
 
-
 int mount_device(const char *dev_path)
 {
-	pb_log("attempt to mount device (%s) not supported\n", dev_path);
+	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;
 }
 
@@ -52,14 +65,10 @@ enum generic_icon_type guess_device_type(void)
 
 static char *mountpoint;
 
+/* pretend that all devices are mounted at our original mountpoint */
 const char *mountpoint_for_device(const char *dev_path)
 {
-	char *tmp, *dev;
-	dev = strrchr(dev_path, '/');
-	if (dev)
-		dev_path = dev + 1;
-	asprintf(&tmp, "%s/%s", mountpoint, dev_path);
-	return tmp;
+	return mountpoint;
 }
 
 char *resolve_path(const char *path, const char *default_mountpoint)