Fixes for Java.

[libguestfs.git] / examples / to-xml.c

diff --git a/examples/to-xml.c b/examples/to-xml.c
index eba3a7a..b438d34 100644 (file)
--- a/examples/to-xml.c
+++ b/examples/to-xml.c
@@ -10,6 +10,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
+#include <inttypes.h>
 #include <unistd.h>
 
 #include <guestfs.h>
@@ -23,6 +25,7 @@
 
 static void display_partition (guestfs_h *g, const char *dev);
 static void display_partitions (guestfs_h *g, const char *dev);
+static void display_ext23 (guestfs_h *g, const char *dev, const char *fstype);
 
 int
 main (int argc, char *argv[])
@@ -55,7 +58,9 @@ main (int argc, char *argv[])
   CALL (devices = guestfs_list_devices (g), NULL);
   printf ("<devices>\n");
   for (i = 0; devices[i] != NULL; ++i) {
-    printf ("<device dev=\"%s\">\n", devices[i]);
+    int64_t size;
+    CALL (size = guestfs_blockdev_getsize64 (g, devices[i]), -1);
+    printf ("<device dev=\"%s\" size=\"%" PRIi64 "\">\n", devices[i], size);
     display_partition (g, devices[i]);
     free (devices[i]);
     printf ("</device>\n");
@@ -82,7 +87,9 @@ main (int argc, char *argv[])
       if (strncmp (lvs[j], "/dev/", 5) == 0 &&
          strncmp (&lvs[j][5], vgs[i], len) == 0 &&
          lvs[j][len+5] == '/') {
-       printf ("<logvol name=\"%s\">\n", lvs[j]);
+       int64_t size;
+       CALL (size = guestfs_blockdev_getsize64 (g, lvs[j]), -1);
+       printf ("<logvol name=\"%s\" size=\"%" PRIi64 "\">\n", lvs[j], size);
        display_partition (g, lvs[j]);
        printf ("</logvol>\n");
        free (lvs[j]);
@@ -114,10 +121,12 @@ display_partition (guestfs_h *g, const char *dev)
     display_partitions (g, dev);
   else if (strncmp (what, "LVM2", 4) == 0)
     printf ("<physvol/>\n");
-  else if (strstr (what, "ext2 filesystem data") == 0)
-    printf ("<fs type=\"ext2\"/>\n");
-  else if (strstr (what, "ext3 filesystem data") == 0)
-    printf ("<fs type=\"ext3\"/>\n");
+  else if (strstr (what, "ext2 filesystem data") != NULL)
+    display_ext23 (g, dev, "ext2");
+  else if (strstr (what, "ext3 filesystem data") != NULL)
+    display_ext23 (g, dev, "ext3");
+  else if (strstr (what, "Linux/i386 swap file") != NULL)
+    printf ("<linux-swap/>\n");
   else
     printf ("<unknown/>\n");
 
@@ -146,7 +155,9 @@ display_partitions (guestfs_h *g, const char *dev)
   for (i = 0; parts[i] != NULL; ++i) {
     /* Only display partition if it's in the device. */
     if (strncmp (parts[i], dev, len) == 0) {
-      printf ("<partition dev=\"%s\">\n", parts[i]);
+      int64_t size;
+      CALL (size = guestfs_blockdev_getsize64 (g, dev), -1);
+      printf ("<partition dev=\"%s\" size=\"%" PRIi64 "\">\n", parts[i], size);
       display_partition (g, parts[i]);
       printf ("</partition>\n");
     }
@@ -156,3 +167,30 @@ display_partitions (guestfs_h *g, const char *dev)
   free (parts);
   printf ("</partitions>\n");
 }
+
+/* Display some details on the ext2/3 filesystem on dev. */
+static void
+display_ext23 (guestfs_h *g, const char *dev, const char *fstype)
+{
+  char **sbfields;
+  int i;
+
+  printf ("<fs type=\"%s\">\n", fstype);
+  CALL (sbfields = guestfs_tune2fs_l (g, dev), NULL);
+
+  for (i = 0; sbfields[i] != NULL; i += 2) {
+    /* Just pick out a few important fields to display.  There
+     * is much more that could be displayed here.
+     */
+    if (strcmp (sbfields[i], "Filesystem UUID") == 0)
+      printf ("<uuid>%s</uuid>\n", sbfields[i+1]);
+    else if (strcmp (sbfields[i], "Block size") == 0)
+      printf ("<blocksize>%s</blocksize>\n", sbfields[i+1]);
+
+    free (sbfields[i]);
+    free (sbfields[i+1]);
+  }
+  free (sbfields);
+
+  printf ("</fs>\n");
+}