From 92c2c33d6162ae0781be47472051305bae332252 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Wed, 22 Apr 2009 15:27:42 +0100 Subject: [PATCH] Fix infinite loop encountered when reading Windows disk in example program. --- examples/to-xml.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/examples/to-xml.c b/examples/to-xml.c index b438d34..5c438f3 100644 --- a/examples/to-xml.c +++ b/examples/to-xml.c @@ -13,6 +13,7 @@ #include #include #include +#include #include @@ -61,7 +62,7 @@ main (int argc, char *argv[]) int64_t size; CALL (size = guestfs_blockdev_getsize64 (g, devices[i]), -1); printf ("\n", devices[i], size); - display_partition (g, devices[i]); + display_partitions (g, devices[i]); free (devices[i]); printf ("\n"); } @@ -117,7 +118,10 @@ display_partition (guestfs_h *g, const char *dev) CALL (what = guestfs_file (g, dev), NULL); - if (strstr (what, "boot sector") != NULL) + if (strcmp (what, "x86 boot sector") == 0) + /* This is what 'file' program shows for Windows/NTFS partitions. */ + printf ("\n"); + else if (strstr (what, "boot sector") != NULL) display_partitions (g, dev); else if (strncmp (what, "LVM2", 4) == 0) printf ("\n"); @@ -137,11 +141,11 @@ display_partition (guestfs_h *g, const char *dev) static void display_partitions (guestfs_h *g, const char *dev) { - /* We can't look into a boot sector which is an LV. That's - * a limitation of sorts of the Linux kernel. (Actually, we - * could do this if we add the kpartx program to libguestfs). + /* We can't look into a boot sector which is an LV or partition. + * That's a limitation of sorts of the Linux kernel. (Actually, + * we could do this if we add the kpartx program to libguestfs). */ - if (strncmp (dev, "/dev/sd", 7) != 0) { + if (strncmp (dev, "/dev/sd", 7) != 0 || isdigit (dev[strlen(dev)-1])) { printf ("\n", dev); return; } @@ -156,7 +160,7 @@ display_partitions (guestfs_h *g, const char *dev) /* Only display partition if it's in the device. */ if (strncmp (parts[i], dev, len) == 0) { int64_t size; - CALL (size = guestfs_blockdev_getsize64 (g, dev), -1); + CALL (size = guestfs_blockdev_getsize64 (g, parts[i]), -1); printf ("\n", parts[i], size); display_partition (g, parts[i]); printf ("\n"); -- 1.8.3.1