X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Finspect.c;h=70612087841853b76e1b005b90c281f3632d23c6;hp=74ae29fea919360d3394e3fb13296ab8834a0b5a;hb=2b0ca7e7b8d369a42a51b1feec72ae8f17257c78;hpb=b3d94d6a71e74e817ad5bdb9497e88d19ec2e29d

diff --git a/src/inspect.c b/src/inspect.c
index 74ae29f..7061208 100644
--- a/src/inspect.c
+++ b/src/inspect.c
@@ -1,5 +1,5 @@
 /* libguestfs
- * Copyright (C) 2010 Red Hat Inc.
+ * Copyright (C) 2010-2011 Red Hat Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,14 +23,21 @@
 #include <stdint.h>
 #include <inttypes.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <errno.h>
+#include <endian.h>
 
+#ifdef HAVE_PCRE
 #include <pcre.h>
-#include <magic.h>
+#endif
+
+#ifdef HAVE_HIVEX
 #include <hivex.h>
-#include <augeas.h>
+#endif
 
+#include "c-ctype.h"
 #include "ignore-value.h"
 #include "xstrtol.h"
 
@@ -39,296 +46,9 @@
 #include "guestfs-internal-actions.h"
 #include "guestfs_protocol.h"
 
-/* Compile all the regular expressions once when the shared library is
- * loaded.  PCRE is thread safe so we're supposedly OK here if
- * multiple threads call into the libguestfs API functions below
- * simultaneously.
- */
-static pcre *re_file_elf;
-static pcre *re_file_win64;
-static pcre *re_elf_ppc64;
-static pcre *re_fedora;
-static pcre *re_rhel_old;
-static pcre *re_rhel;
-static pcre *re_rhel_no_minor;
-static pcre *re_debian;
-static pcre *re_aug_seq;
-static pcre *re_xdev;
-static pcre *re_windows_version;
-
-static void compile_regexps (void) __attribute__((constructor));
-static void
-compile_regexps (void)
-{
-  const char *err;
-  int offset;
-
-#define COMPILE(re,pattern,options)                                     \
-  do {                                                                  \
-    re = pcre_compile ((pattern), (options), &err, &offset, NULL);      \
-    if (re == NULL) {                                                   \
-      ignore_value (write (2, err, strlen (err)));                      \
-      abort ();                                                         \
-    }                                                                   \
-  } while (0)
-
-  COMPILE (re_file_elf,
-           "ELF.*(?:executable|shared object|relocatable), (.+?),", 0);
-  COMPILE (re_elf_ppc64, "64.*PowerPC", 0);
-  COMPILE (re_fedora, "Fedora release (\\d+)", 0);
-  COMPILE (re_rhel_old,
-           "(?:Red Hat Enterprise Linux|CentOS|Scientific Linux).*release (\\d+).*Update (\\d+)", 0);
-  COMPILE (re_rhel,
-           "(?:Red Hat Enterprise Linux|CentOS|Scientific Linux).*release (\\d+)\\.(\\d+)", 0);
-  COMPILE (re_rhel_no_minor,
-           "(?:Red Hat Enterprise Linux|CentOS|Scientific Linux).*release (\\d+)", 0);
-  COMPILE (re_debian, "(\\d+)\\.(\\d+)", 0);
-  COMPILE (re_aug_seq, "/\\d+$", 0);
-  COMPILE (re_xdev, "^/dev/(?:h|s|v|xv)d([a-z]\\d*)$", 0);
-  COMPILE (re_windows_version, "^(\\d+)\\.(\\d+)", 0);
-}
-
-/* Match a regular expression which contains no captures.  Returns
- * true if it matches or false if it doesn't.
- */
-static int
-match (guestfs_h *g, const char *str, const pcre *re)
-{
-  size_t len = strlen (str);
-  int vec[30], r;
-
-  r = pcre_exec (re, NULL, str, len, 0, 0, vec, sizeof vec / sizeof vec[0]);
-  if (r == PCRE_ERROR_NOMATCH)
-    return 0;
-  if (r != 1) {
-    /* Internal error -- should not happen. */
-    fprintf (stderr, "libguestfs: %s: %s: internal error: pcre_exec returned unexpected error code %d when matching against the string \"%s\"\n",
-             __FILE__, __func__, r, str);
-    return 0;
-  }
-
-  return 1;
-}
-
-/* Match a regular expression which contains exactly one capture.  If
- * the string matches, return the capture, otherwise return NULL.  The
- * caller must free the result.
- */
-static char *
-match1 (guestfs_h *g, const char *str, const pcre *re)
-{
-  size_t len = strlen (str);
-  int vec[30], r;
-
-  r = pcre_exec (re, NULL, str, len, 0, 0, vec, sizeof vec / sizeof vec[0]);
-  if (r == PCRE_ERROR_NOMATCH)
-    return NULL;
-  if (r != 2) {
-    /* Internal error -- should not happen. */
-    fprintf (stderr, "libguestfs: %s: %s: internal error: pcre_exec returned unexpected error code %d when matching against the string \"%s\"\n",
-             __FILE__, __func__, r, str);
-    return NULL;
-  }
-
-  return safe_strndup (g, &str[vec[2]], vec[3]-vec[2]);
-}
-
-/* Match a regular expression which contains exactly two captures. */
-static int
-match2 (guestfs_h *g, const char *str, const pcre *re, char **ret1, char **ret2)
-{
-  size_t len = strlen (str);
-  int vec[30], r;
-
-  r = pcre_exec (re, NULL, str, len, 0, 0, vec, 30);
-  if (r == PCRE_ERROR_NOMATCH)
-    return 0;
-  if (r != 3) {
-    /* Internal error -- should not happen. */
-    fprintf (stderr, "libguestfs: %s: %s: internal error: pcre_exec returned unexpected error code %d when matching against the string \"%s\"\n",
-             __FILE__, __func__, r, str);
-    return 0;
-  }
-
-  *ret1 = safe_strndup (g, &str[vec[2]], vec[3]-vec[2]);
-  *ret2 = safe_strndup (g, &str[vec[4]], vec[5]-vec[4]);
-
-  return 1;
-}
-
-/* Convert output from 'file' command on ELF files to the canonical
- * architecture string.  Caller must free the result.
- */
-static char *
-canonical_elf_arch (guestfs_h *g, const char *elf_arch)
-{
-  const char *r;
-
-  if (strstr (elf_arch, "Intel 80386"))
-    r = "i386";
-  else if (strstr (elf_arch, "Intel 80486"))
-    r = "i486";
-  else if (strstr (elf_arch, "x86-64"))
-    r = "x86_64";
-  else if (strstr (elf_arch, "AMD x86-64"))
-    r = "x86_64";
-  else if (strstr (elf_arch, "SPARC32"))
-    r = "sparc";
-  else if (strstr (elf_arch, "SPARC V9"))
-    r = "sparc64";
-  else if (strstr (elf_arch, "IA-64"))
-    r = "ia64";
-  else if (match (g, elf_arch, re_elf_ppc64))
-    r = "ppc64";
-  else if (strstr (elf_arch, "PowerPC"))
-    r = "ppc";
-  else
-    r = elf_arch;
-
-  char *ret = safe_strdup (g, r);
-  return ret;
-}
-
-static int
-is_regular_file (const char *filename)
-{
-  struct stat statbuf;
-
-  return lstat (filename, &statbuf) == 0 && S_ISREG (statbuf.st_mode);
-}
-
-/* Download and uncompress the cpio file to find binaries within.
- * Notes:
- * (1) Two lists must be identical.
- * (2) Implicit limit of 31 bytes for length of each element (see code
- * below).
- */
-#define INITRD_BINARIES1 "bin/ls bin/rm bin/modprobe sbin/modprobe bin/sh bin/bash bin/dash bin/nash"
-#define INITRD_BINARIES2 {"bin/ls", "bin/rm", "bin/modprobe", "sbin/modprobe", "bin/sh", "bin/bash", "bin/dash", "bin/nash"}
-
-static char *
-cpio_arch (guestfs_h *g, const char *file, const char *path)
-{
-  char *ret = NULL;
-
-  const char *method;
-  if (strstr (file, "gzip"))
-    method = "zcat";
-  else if (strstr (file, "bzip2"))
-    method = "bzcat";
-  else
-    method = "cat";
-
-  char dir[] = "/tmp/initrd.XXXXXX";
-#define dir_len (sizeof dir)
-  if (mkdtemp (dir) == NULL) {
-    perrorf (g, "mkdtemp");
-    goto out;
-  }
-
-  char dir_initrd[dir_len + 16];
-  snprintf (dir_initrd, dir_len + 16, "%s/initrd", dir);
-  if (guestfs_download (g, path, dir_initrd) == -1)
-    goto out;
-
-  char cmd[dir_len + 256];
-  snprintf (cmd, dir_len + 256,
-            "cd %s && %s initrd | cpio --quiet -id " INITRD_BINARIES1,
-            dir, method);
-  int r = system (cmd);
-  if (r == -1 || WEXITSTATUS (r) != 0) {
-    perrorf (g, "cpio command failed");
-    goto out;
-  }
-
-  char bin[dir_len + 32];
-  const char *bins[] = INITRD_BINARIES2;
-  size_t i;
-  for (i = 0; i < sizeof bins / sizeof bins[0]; ++i) {
-    snprintf (bin, dir_len + 32, "%s/%s", dir, bins[i]);
-
-    if (is_regular_file (bin)) {
-      int flags = g->verbose ? MAGIC_DEBUG : 0;
-      flags |= MAGIC_ERROR | MAGIC_RAW;
-
-      magic_t m = magic_open (flags);
-      if (m == NULL) {
-        perrorf (g, "magic_open");
-        goto out;
-      }
-
-      if (magic_load (m, NULL) == -1) {
-        perrorf (g, "magic_load: default magic database file");
-        magic_close (m);
-        goto out;
-      }
-
-      const char *line = magic_file (m, bin);
-      if (line == NULL) {
-        perrorf (g, "magic_file: %s", bin);
-        magic_close (m);
-        goto out;
-      }
-
-      char *elf_arch;
-      if ((elf_arch = match1 (g, line, re_file_elf)) != NULL) {
-        ret = canonical_elf_arch (g, elf_arch);
-        free (elf_arch);
-        magic_close (m);
-        goto out;
-      }
-      magic_close (m);
-    }
-  }
-  error (g, "file_architecture: could not determine architecture of cpio archive");
-
- out:
-  /* Free up the temporary directory.  Note the directory name cannot
-   * contain shell meta-characters because of the way it was
-   * constructed above.
-   */
-  snprintf (cmd, dir_len + 256, "rm -rf %s", dir);
-  ignore_value (system (cmd));
-
-  return ret;
-#undef dir_len
-}
-
-char *
-guestfs__file_architecture (guestfs_h *g, const char *path)
-{
-  char *file = NULL;
-  char *elf_arch = NULL;
-  char *ret = NULL;
-
-  /* Get the output of the "file" command.  Note that because this
-   * runs in the daemon, LANG=C so it's in English.
-   */
-  file = guestfs_file (g, path);
-  if (file == NULL)
-    return NULL;
-
-  if ((elf_arch = match1 (g, file, re_file_elf)) != NULL)
-    ret = canonical_elf_arch (g, elf_arch);
-  else if (strstr (file, "PE32 executable"))
-    ret = safe_strdup (g, "i386");
-  else if (strstr (file, "PE32+ executable"))
-    ret = safe_strdup (g, "x86_64");
-  else if (strstr (file, "cpio archive"))
-    ret = cpio_arch (g, file, path);
-  else
-    error (g, "file_architecture: unknown architecture: %s", path);
-
-  free (file);
-  free (elf_arch);
-  return ret;                   /* caller frees */
-}
+#if defined(HAVE_PCRE) && defined(HAVE_HIVEX)
 
 /* The main inspection code. */
-static int feature_available (guestfs_h *g, const char *feature);
-static void free_string_list (char **);
-static int check_for_filesystem_on (guestfs_h *g, const char *device);
-
 char **
 guestfs__inspect_os (guestfs_h *g)
 {
@@ -350,13 +70,13 @@ guestfs__inspect_os (guestfs_h *g)
 
   size_t i;
   for (i = 0; devices[i] != NULL; ++i) {
-    if (check_for_filesystem_on (g, devices[i]) == -1) {
-      free_string_list (devices);
+    if (guestfs___check_for_filesystem_on (g, devices[i], 1, 0) == -1) {
+      guestfs___free_string_list (devices);
       guestfs___free_inspect_info (g);
       return NULL;
     }
   }
-  free_string_list (devices);
+  guestfs___free_string_list (devices);
 
   /* Look at all partitions. */
   char **partitions;
@@ -367,16 +87,16 @@ guestfs__inspect_os (guestfs_h *g)
   }
 
   for (i = 0; partitions[i] != NULL; ++i) {
-    if (check_for_filesystem_on (g, partitions[i]) == -1) {
-      free_string_list (partitions);
+    if (guestfs___check_for_filesystem_on (g, partitions[i], 0, i+1) == -1) {
+      guestfs___free_string_list (partitions);
       guestfs___free_inspect_info (g);
       return NULL;
     }
   }
-  free_string_list (partitions);
+  guestfs___free_string_list (partitions);
 
   /* Look at all LVs. */
-  if (feature_available (g, "lvm2")) {
+  if (guestfs___feature_available (g, "lvm2")) {
     char **lvs;
     lvs = guestfs_lvs (g);
     if (lvs == NULL) {
@@ -385,19 +105,34 @@ guestfs__inspect_os (guestfs_h *g)
     }
 
     for (i = 0; lvs[i] != NULL; ++i) {
-      if (check_for_filesystem_on (g, lvs[i]) == -1) {
-        free_string_list (lvs);
+      if (guestfs___check_for_filesystem_on (g, lvs[i], 0, 0) == -1) {
+        guestfs___free_string_list (lvs);
         guestfs___free_inspect_info (g);
         return NULL;
       }
     }
-    free_string_list (lvs);
+    guestfs___free_string_list (lvs);
   }
 
   /* At this point we have, in the handle, a list of all filesystems
    * found and data about each one.  Now we assemble the list of
    * filesystems which are root devices and return that to the user.
+   * Fall through to guestfs__inspect_get_roots to do that.
+   */
+  char **ret = guestfs__inspect_get_roots (g);
+  if (ret == NULL)
+    guestfs___free_inspect_info (g);
+  return ret;
+}
+
+char **
+guestfs__inspect_get_roots (guestfs_h *g)
+{
+  /* NB. Doesn't matter if g->nr_fses == 0.  We just return an empty
+   * list in this case.
    */
+
+  size_t i;
   size_t count = 0;
   for (i = 0; i < g->nr_fses; ++i)
     if (g->fses[i].is_root)
@@ -406,7 +141,6 @@ guestfs__inspect_os (guestfs_h *g)
   char **ret = calloc (count+1, sizeof (char *));
   if (ret == NULL) {
     perrorf (g, "calloc");
-    guestfs___free_inspect_info (g);
     return NULL;
   }
 
@@ -422,711 +156,417 @@ guestfs__inspect_os (guestfs_h *g)
   return ret;
 }
 
-void
-guestfs___free_inspect_info (guestfs_h *g)
+char *
+guestfs__inspect_get_type (guestfs_h *g, const char *root)
 {
-  size_t i;
-  for (i = 0; i < g->nr_fses; ++i) {
-    free (g->fses[i].device);
-    free (g->fses[i].product_name);
-    free (g->fses[i].arch);
-    size_t j;
-    for (j = 0; j < g->fses[i].nr_fstab; ++j) {
-      free (g->fses[i].fstab[j].device);
-      free (g->fses[i].fstab[j].mountpoint);
-    }
-    free (g->fses[i].fstab);
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
+    return NULL;
+
+  char *ret;
+  switch (fs->type) {
+  case OS_TYPE_LINUX: ret = safe_strdup (g, "linux"); break;
+  case OS_TYPE_WINDOWS: ret = safe_strdup (g, "windows"); break;
+  case OS_TYPE_FREEBSD: ret = safe_strdup (g, "freebsd"); break;
+  case OS_TYPE_UNKNOWN: default: ret = safe_strdup (g, "unknown"); break;
   }
-  free (g->fses);
-  g->nr_fses = 0;
-  g->fses = NULL;
-}
 
-static void
-free_string_list (char **argv)
-{
-  size_t i;
-  for (i = 0; argv[i] != NULL; ++i)
-    free (argv[i]);
-  free (argv);
+  return ret;
 }
 
-/* In the Perl code this is a public function. */
-static int
-feature_available (guestfs_h *g, const char *feature)
+char *
+guestfs__inspect_get_arch (guestfs_h *g, const char *root)
 {
-  /* If there's an error we should ignore it, so to do that we have to
-   * temporarily replace the error handler with a null one.
-   */
-  guestfs_error_handler_cb old_error_cb = g->error_cb;
-  g->error_cb = NULL;
-
-  const char *groups[] = { feature, NULL };
-  int r = guestfs_available (g, (char * const *) groups);
-
-  g->error_cb = old_error_cb;
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
+    return NULL;
 
-  return r == 0 ? 1 : 0;
+  return safe_strdup (g, fs->arch ? : "unknown");
 }
 
-/* Find out if 'device' contains a filesystem.  If it does, add
- * another entry in g->fses.
- */
-static int check_filesystem (guestfs_h *g, const char *device);
-static int check_linux_root (guestfs_h *g, struct inspect_fs *fs);
-static int check_fstab (guestfs_h *g, struct inspect_fs *fs);
-static int check_windows_root (guestfs_h *g, struct inspect_fs *fs);
-static int check_windows_arch (guestfs_h *g, struct inspect_fs *fs,
-                               const char *systemroot);
-static int check_windows_registry (guestfs_h *g, struct inspect_fs *fs,
-                                   const char *systemroot);
-static char *resolve_windows_path_silently (guestfs_h *g, const char *);
-static int extend_fses (guestfs_h *g);
-static int parse_unsigned_int (guestfs_h *g, const char *str);
-static int add_fstab_entry (guestfs_h *g, struct inspect_fs *fs,
-                            const char *spec, const char *mp);
-static char *resolve_fstab_device (guestfs_h *g, const char *spec);
-
-static int
-check_for_filesystem_on (guestfs_h *g, const char *device)
+char *
+guestfs__inspect_get_distro (guestfs_h *g, const char *root)
 {
-  /* Get vfs-type in order to check if it's a Linux(?) swap device.
-   * If there's an error we should ignore it, so to do that we have to
-   * temporarily replace the error handler with a null one.
-   */
-  guestfs_error_handler_cb old_error_cb = g->error_cb;
-  g->error_cb = NULL;
-  char *vfs_type = guestfs_vfs_type (g, device);
-  g->error_cb = old_error_cb;
-
-  int is_swap = vfs_type && STREQ (vfs_type, "swap");
-
-  if (g->verbose)
-    fprintf (stderr, "check_for_filesystem_on: %s (%s)\n",
-             device, vfs_type ? vfs_type : "failed to get vfs type");
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
+    return NULL;
 
-  if (is_swap) {
-    free (vfs_type);
-    if (extend_fses (g) == -1)
-      return -1;
-    g->fses[g->nr_fses-1].is_swap = 1;
-    return 0;
+  char *ret;
+  switch (fs->distro) {
+  case OS_DISTRO_ARCHLINUX: ret = safe_strdup (g, "archlinux"); break;
+  case OS_DISTRO_CENTOS: ret = safe_strdup (g, "centos"); break;
+  case OS_DISTRO_DEBIAN: ret = safe_strdup (g, "debian"); break;
+  case OS_DISTRO_FEDORA: ret = safe_strdup (g, "fedora"); break;
+  case OS_DISTRO_GENTOO: ret = safe_strdup (g, "gentoo"); break;
+  case OS_DISTRO_LINUX_MINT: ret = safe_strdup (g, "linuxmint"); break;
+  case OS_DISTRO_MANDRIVA: ret = safe_strdup (g, "mandriva"); break;
+  case OS_DISTRO_MEEGO: ret = safe_strdup (g, "meego"); break;
+  case OS_DISTRO_PARDUS: ret = safe_strdup (g, "pardus"); break;
+  case OS_DISTRO_REDHAT_BASED: ret = safe_strdup (g, "redhat-based"); break;
+  case OS_DISTRO_RHEL: ret = safe_strdup (g, "rhel"); break;
+  case OS_DISTRO_SCIENTIFIC_LINUX: ret = safe_strdup (g, "scientificlinux"); break;
+  case OS_DISTRO_SLACKWARE: ret = safe_strdup (g, "slackware"); break;
+  case OS_DISTRO_WINDOWS: ret = safe_strdup (g, "windows"); break;
+  case OS_DISTRO_UBUNTU: ret = safe_strdup (g, "ubuntu"); break;
+  case OS_DISTRO_UNKNOWN: default: ret = safe_strdup (g, "unknown"); break;
   }
 
-  /* Try mounting the device.  As above, ignore errors. */
-  g->error_cb = NULL;
-  int r = guestfs_mount_ro (g, device, "/");
-  if (r == -1 && vfs_type && STREQ (vfs_type, "ufs")) /* Hack for the *BSDs. */
-    r = guestfs_mount_vfs (g, "ro,ufstype=ufs2", "ufs", device, "/");
-  free (vfs_type);
-  g->error_cb = old_error_cb;
-  if (r == -1)
-    return 0;
-
-  /* Do the rest of the checks. */
-  r = check_filesystem (g, device);
-
-  /* Unmount the filesystem. */
-  if (guestfs_umount_all (g) == -1)
-    return -1;
-
-  return r;
+  return ret;
 }
 
-static int
-check_filesystem (guestfs_h *g, const char *device)
+int
+guestfs__inspect_get_major_version (guestfs_h *g, const char *root)
 {
-  if (extend_fses (g) == -1)
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
     return -1;
 
-  struct inspect_fs *fs = &g->fses[g->nr_fses-1];
-
-  fs->device = safe_strdup (g, device);
-  fs->is_mountable = 1;
-
-  /* Grub /boot? */
-  if (guestfs_is_file (g, "/grub/menu.lst") > 0 ||
-      guestfs_is_file (g, "/grub/grub.conf") > 0)
-    fs->content = FS_CONTENT_LINUX_BOOT;
-  /* Linux root? */
-  else if (guestfs_is_dir (g, "/etc") > 0 &&
-           guestfs_is_dir (g, "/bin") > 0 &&
-           guestfs_is_file (g, "/etc/fstab") > 0) {
-    fs->is_root = 1;
-    fs->content = FS_CONTENT_LINUX_ROOT;
-    if (check_linux_root (g, fs) == -1)
-      return -1;
-  }
-  /* Linux /usr/local? */
-  else if (guestfs_is_dir (g, "/etc") > 0 &&
-           guestfs_is_dir (g, "/bin") > 0 &&
-           guestfs_is_dir (g, "/share") > 0 &&
-           guestfs_exists (g, "/local") == 0 &&
-           guestfs_is_file (g, "/etc/fstab") == 0)
-    fs->content = FS_CONTENT_LINUX_USR_LOCAL;
-  /* Linux /usr? */
-  else if (guestfs_is_dir (g, "/etc") > 0 &&
-           guestfs_is_dir (g, "/bin") > 0 &&
-           guestfs_is_dir (g, "/share") > 0 &&
-           guestfs_exists (g, "/local") > 0 &&
-           guestfs_is_file (g, "/etc/fstab") == 0)
-    fs->content = FS_CONTENT_LINUX_USR;
-  /* Linux /var? */
-  else if (guestfs_is_dir (g, "/log") > 0 &&
-           guestfs_is_dir (g, "/run") > 0 &&
-           guestfs_is_dir (g, "/spool") > 0)
-    fs->content = FS_CONTENT_LINUX_VAR;
-  /* Windows root? */
-  else if (guestfs_is_file (g, "/AUTOEXEC.BAT") > 0 ||
-           guestfs_is_file (g, "/autoexec.bat") > 0 ||
-           guestfs_is_dir (g, "/Program Files") > 0 ||
-           guestfs_is_dir (g, "/WINDOWS") > 0 ||
-           guestfs_is_dir (g, "/Windows") > 0 ||
-           guestfs_is_dir (g, "/windows") > 0 ||
-           guestfs_is_dir (g, "/WIN32") > 0 ||
-           guestfs_is_dir (g, "/Win32") > 0 ||
-           guestfs_is_dir (g, "/WINNT") > 0 ||
-           guestfs_is_file (g, "/boot.ini") > 0 ||
-           guestfs_is_file (g, "/ntldr") > 0) {
-    fs->is_root = 1;
-    fs->content = FS_CONTENT_WINDOWS_ROOT;
-    if (check_windows_root (g, fs) == -1)
-      return -1;
-  }
-
-  return 0;
+  return fs->major_version;
 }
 
-/* The currently mounted device is known to be a Linux root.  Try to
- * determine from this the distro, version, etc.  Also parse
- * /etc/fstab to determine the arrangement of mountpoints and
- * associated devices.
- */
-static int
-check_linux_root (guestfs_h *g, struct inspect_fs *fs)
+int
+guestfs__inspect_get_minor_version (guestfs_h *g, const char *root)
 {
-  fs->type = OS_TYPE_LINUX;
-
-  if (guestfs_exists (g, "/etc/redhat-release") > 0) {
-    fs->distro = OS_DISTRO_REDHAT_BASED; /* Something generic Red Hat-like. */
-
-    char **product_name = guestfs_head_n (g, 1, "/etc/redhat-release");
-    if (product_name == NULL)
-      return -1;
-    if (product_name[0] == NULL) {
-      error (g, "/etc/redhat-release file is empty");
-      free_string_list (product_name);
-      return -1;
-    }
-
-    /* Note that this string becomes owned by the handle and will
-     * be freed by guestfs___free_inspect_info.
-     */
-    fs->product_name = product_name[0];
-    free (product_name);
-
-    char *major, *minor;
-    if ((major = match1 (g, fs->product_name, re_fedora)) != NULL) {
-      fs->distro = OS_DISTRO_FEDORA;
-      fs->major_version = parse_unsigned_int (g, major);
-      free (major);
-      if (fs->major_version == -1)
-        return -1;
-    }
-    else if (match2 (g, fs->product_name, re_rhel_old, &major, &minor) ||
-             match2 (g, fs->product_name, re_rhel, &major, &minor)) {
-      fs->distro = OS_DISTRO_RHEL;
-      fs->major_version = parse_unsigned_int (g, major);
-      free (major);
-      if (fs->major_version == -1) {
-        free (minor);
-        return -1;
-      }
-      fs->minor_version = parse_unsigned_int (g, minor);
-      free (minor);
-      if (fs->minor_version == -1)
-        return -1;
-    }
-    else if ((major = match1 (g, fs->product_name, re_rhel_no_minor)) != NULL) {
-      fs->distro = OS_DISTRO_RHEL;
-      fs->major_version = parse_unsigned_int (g, major);
-      free (major);
-      if (fs->major_version == -1)
-        return -1;
-      fs->minor_version = 0;
-    }
-  }
-  else if (guestfs_exists (g, "/etc/debian_version") > 0) {
-    fs->distro = OS_DISTRO_DEBIAN;
-
-    char **product_name = guestfs_head_n (g, 1, "/etc/debian_version");
-    if (product_name == NULL)
-      return -1;
-    if (product_name[0] == NULL) {
-      error (g, "/etc/debian_version file is empty");
-      free_string_list (product_name);
-      return -1;
-    }
-
-    /* Note that this string becomes owned by the handle and will
-     * be freed by guestfs___free_inspect_info.
-     */
-    fs->product_name = product_name[0];
-    free (product_name);
-
-    char *major, *minor;
-    if (match2 (g, fs->product_name, re_debian, &major, &minor)) {
-      fs->major_version = parse_unsigned_int (g, major);
-      free (major);
-      if (fs->major_version == -1) {
-        free (minor);
-        return -1;
-      }
-      fs->minor_version = parse_unsigned_int (g, minor);
-      free (minor);
-      if (fs->minor_version == -1)
-        return -1;
-    }
-  }
-
-  /* Determine the architecture. */
-  const char *binaries[] =
-    { "/bin/bash", "/bin/ls", "/bin/echo", "/bin/rm", "/bin/sh" };
-  size_t i;
-  for (i = 0; i < sizeof binaries / sizeof binaries[0]; ++i) {
-    if (guestfs_is_file (g, binaries[i]) > 0) {
-      /* Ignore errors from file_architecture call. */
-      guestfs_error_handler_cb old_error_cb = g->error_cb;
-      g->error_cb = NULL;
-      char *arch = guestfs_file_architecture (g, binaries[i]);
-      g->error_cb = old_error_cb;
-
-      if (arch) {
-        /* String will be owned by handle, freed by
-         * guestfs___free_inspect_info.
-         */
-        fs->arch = arch;
-        break;
-      }
-    }
-  }
-
-  /* We already know /etc/fstab exists because it's part of the test
-   * for Linux root above.  We must now parse this file to determine
-   * which filesystems are used by the operating system and how they
-   * are mounted.
-   * XXX What if !feature_available (g, "augeas")?
-   */
-  if (guestfs_aug_init (g, "/", AUG_NO_LOAD|AUG_SAVE_NOOP) == -1)
-    return -1;
-
-  /* Tell Augeas to only load /etc/fstab (thanks Raphaël Pinson). */
-  guestfs_aug_rm (g, "/augeas/load//incl[. != \"/etc/fstab\"]");
-  guestfs_aug_load (g);
-
-  int r = check_fstab (g, fs);
-  guestfs_aug_close (g);
-  if (r == -1)
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
     return -1;
 
-  return 0;
+  return fs->minor_version;
 }
 
-static int
-check_fstab (guestfs_h *g, struct inspect_fs *fs)
+char *
+guestfs__inspect_get_product_name (guestfs_h *g, const char *root)
 {
-  char **lines = guestfs_aug_ls (g, "/files/etc/fstab");
-  if (lines == NULL)
-    return -1;
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
+    return NULL;
 
-  if (lines[0] == NULL) {
-    error (g, "could not parse /etc/fstab or empty file");
-    free_string_list (lines);
-    return -1;
-  }
+  return safe_strdup (g, fs->product_name ? : "unknown");
+}
 
-  size_t i;
-  char augpath[256];
-  for (i = 0; lines[i] != NULL; ++i) {
-    /* Ignore comments.  Only care about sequence lines which
-     * match m{/\d+$}.
-     */
-    if (match (g, lines[i], re_aug_seq)) {
-      snprintf (augpath, sizeof augpath, "%s/spec", lines[i]);
-      char *spec = guestfs_aug_get (g, augpath);
-      if (spec == NULL) {
-        free_string_list (lines);
-        return -1;
-      }
+char *
+guestfs__inspect_get_product_variant (guestfs_h *g, const char *root)
+{
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
+    return NULL;
 
-      snprintf (augpath, sizeof augpath, "%s/file", lines[i]);
-      char *mp = guestfs_aug_get (g, augpath);
-      if (mp == NULL) {
-        free_string_list (lines);
-        free (spec);
-        return -1;
-      }
+  return safe_strdup (g, fs->product_variant ? : "unknown");
+}
 
-      int r = add_fstab_entry (g, fs, spec, mp);
-      free (spec);
-      free (mp);
+char *
+guestfs__inspect_get_windows_systemroot (guestfs_h *g, const char *root)
+{
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
+    return NULL;
 
-      if (r == -1) {
-        free_string_list (lines);
-        return -1;
-      }
-    }
+  if (!fs->windows_systemroot) {
+    error (g, _("not a Windows guest, or systemroot could not be determined"));
+    return NULL;
   }
 
-  free_string_list (lines);
-  return 0;
+  return safe_strdup (g, fs->windows_systemroot);
 }
 
-/* Add a filesystem and possibly a mountpoint entry for
- * the root filesystem 'fs'.
- *
- * 'spec' is the fstab spec field, which might be a device name or a
- * pseudodevice or 'UUID=...' or 'LABEL=...'.
- *
- * 'mp' is the mount point, which could also be 'swap' or 'none'.
- */
-static int
-add_fstab_entry (guestfs_h *g, struct inspect_fs *fs,
-                 const char *spec, const char *mp)
+char *
+guestfs__inspect_get_windows_current_control_set (guestfs_h *g,
+                                                  const char *root)
 {
-  /* Ignore certain mountpoints. */
-  if (STRPREFIX (mp, "/dev/") ||
-      STREQ (mp, "/dev") ||
-      STRPREFIX (mp, "/media/") ||
-      STRPREFIX (mp, "/proc/") ||
-      STREQ (mp, "/proc") ||
-      STRPREFIX (mp, "/selinux/") ||
-      STREQ (mp, "/selinux") ||
-      STRPREFIX (mp, "/sys/") ||
-      STREQ (mp, "/sys"))
-    return 0;
-
-  /* Resolve UUID= and LABEL= to the actual device. */
-  char *device = NULL;
-  if (STRPREFIX (spec, "UUID="))
-    device = guestfs_findfs_uuid (g, &spec[5]);
-  else if (STRPREFIX (spec, "LABEL="))
-    device = guestfs_findfs_label (g, &spec[6]);
-  /* Resolve guest block device names. */
-  else if (spec[0] == '/')
-    device = resolve_fstab_device (g, spec);
-  /* Also ignore pseudo-devices completely, like spec == "tmpfs".
-   * If we haven't resolved the device successfully by this point,
-   * we don't care, just ignore it.
-   */
-  if (device == NULL)
-    return 0;
-
-  char *mountpoint = safe_strdup (g, mp);
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
+    return NULL;
 
-  /* Add this to the fstab entry in 'fs'.
-   * Note these are further filtered by guestfs_inspect_get_mountpoints
-   * and guestfs_inspect_get_filesystems.
-   */
-  size_t n = fs->nr_fstab + 1;
-  struct inspect_fstab_entry *p;
-
-  p = realloc (fs->fstab, n * sizeof (struct inspect_fstab_entry));
-  if (p == NULL) {
-    perrorf (g, "realloc");
-    free (device);
-    free (mountpoint);
-    return -1;
+  if (!fs->windows_current_control_set) {
+    error (g, _("not a Windows guest, or CurrentControlSet could not be determined"));
+    return NULL;
   }
 
-  fs->fstab = p;
-  fs->nr_fstab = n;
-
-  /* These are owned by the handle and freed by guestfs___free_inspect_info. */
-  fs->fstab[n-1].device = device;
-  fs->fstab[n-1].mountpoint = mountpoint;
-
-  if (g->verbose)
-    fprintf (stderr, "fstab: device=%s mountpoint=%s\n", device, mountpoint);
-
-  return 0;
+  return safe_strdup (g, fs->windows_current_control_set);
 }
 
-/* Resolve block device name to the libguestfs device name, eg.
- * /dev/xvdb1 => /dev/vdb1.  This assumes that disks were added in the
- * same order as they appear to the real VM, which is a reasonable
- * assumption to make.  Return things like LV names unchanged (or
- * anything we don't recognize).
- */
-static char *
-resolve_fstab_device (guestfs_h *g, const char *spec)
+char *
+guestfs__inspect_get_format (guestfs_h *g, const char *root)
 {
-  char **devices = guestfs_list_devices (g);
-  if (devices == NULL)
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
     return NULL;
 
-  size_t count;
-  for (count = 0; devices[count] != NULL; count++)
-    ;
-
-  char *device = NULL;
-  char *a1 = match1 (g, spec, re_xdev);
-  if (a1) {
-    size_t i = a1[0] - 'a'; /* a1[0] is always [a-z] because of regex. */
-    if (i < count) {
-      size_t len = strlen (devices[i]) + strlen (a1) + 16;
-      device = safe_malloc (g, len);
-      snprintf (device, len, "%s%s", devices[i], &a1[1]);
-    }
-  } else {
-    /* Didn't match device pattern, return original spec unchanged. */
-    device = safe_strdup (g, spec);
+  char *ret;
+  switch (fs->format) {
+  case OS_FORMAT_INSTALLED: ret = safe_strdup (g, "installed"); break;
+  case OS_FORMAT_INSTALLER: ret = safe_strdup (g, "installer"); break;
+  case OS_FORMAT_UNKNOWN: default: ret = safe_strdup (g, "unknown"); break;
   }
 
-  free (a1);
-  free_string_list (devices);
-
-  return device;
+  return ret;
 }
 
-/* XXX Handling of boot.ini in the Perl version was pretty broken.  It
- * essentially didn't do anything for modern Windows guests.
- * Therefore I've omitted all that code.
- */
-static int
-check_windows_root (guestfs_h *g, struct inspect_fs *fs)
+int
+guestfs__inspect_is_live (guestfs_h *g, const char *root)
 {
-  fs->type = OS_TYPE_WINDOWS;
-  fs->distro = OS_DISTRO_WINDOWS;
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
+    return -1;
 
-  /* Try to find Windows systemroot using some common locations. */
-  const char *systemroots[] =
-    { "/windows", "/winnt", "/win32", "/win" };
-  size_t i;
-  char *systemroot = NULL;
-  for (i = 0;
-       systemroot == NULL && i < sizeof systemroots / sizeof systemroots[0];
-       ++i) {
-    systemroot = resolve_windows_path_silently (g, systemroots[i]);
-  }
+  return fs->is_live_disk;
+}
 
-  if (!systemroot) {
-    error (g, _("cannot resolve Windows %%SYSTEMROOT%%"));
+int
+guestfs__inspect_is_netinst (guestfs_h *g, const char *root)
+{
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
     return -1;
-  }
-
-  /* XXX There is a case for exposing systemroot and many variables
-   * from the registry through the libguestfs API.
-   */
 
-  if (g->verbose)
-    fprintf (stderr, "windows %%SYSTEMROOT%% = %s", systemroot);
+  return fs->is_netinst_disk;
+}
 
-  if (check_windows_arch (g, fs, systemroot) == -1) {
-    free (systemroot);
+int
+guestfs__inspect_is_multipart (guestfs_h *g, const char *root)
+{
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
     return -1;
-  }
 
-  if (check_windows_registry (g, fs, systemroot) == -1) {
-    free (systemroot);
-    return -1;
-  }
-
-  free (systemroot);
-  return 0;
+  return fs->is_multipart_disk;
 }
 
-static int
-check_windows_arch (guestfs_h *g, struct inspect_fs *fs,
-                    const char *systemroot)
+char **
+guestfs__inspect_get_mountpoints (guestfs_h *g, const char *root)
 {
-  size_t len = strlen (systemroot) + 32;
-  char cmd_exe[len];
-  snprintf (cmd_exe, len, "%s/system32/cmd.exe", systemroot);
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
+    return NULL;
 
-  char *cmd_exe_path = resolve_windows_path_silently (g, cmd_exe);
-  if (!cmd_exe_path)
-    return 0;
+  char **ret;
 
-  char *arch = guestfs_file_architecture (g, cmd_exe_path);
-  free (cmd_exe_path);
+  /* If no fstab information (Windows) return just the root. */
+  if (fs->nr_fstab == 0) {
+    ret = calloc (3, sizeof (char *));
+    ret[0] = safe_strdup (g, "/");
+    ret[1] = safe_strdup (g, root);
+    ret[2] = NULL;
+    return ret;
+  }
 
-  if (arch)
-    fs->arch = arch;        /* freed by guestfs___free_inspect_info */
+#define CRITERION fs->fstab[i].mountpoint[0] == '/'
+  size_t i, count = 0;
+  for (i = 0; i < fs->nr_fstab; ++i)
+    if (CRITERION)
+      count++;
+
+  /* Hashtables have 2N+1 entries. */
+  ret = calloc (2*count+1, sizeof (char *));
+  if (ret == NULL) {
+    perrorf (g, "calloc");
+    return NULL;
+  }
 
-  return 0;
+  count = 0;
+  for (i = 0; i < fs->nr_fstab; ++i)
+    if (CRITERION) {
+      ret[2*count] = safe_strdup (g, fs->fstab[i].mountpoint);
+      ret[2*count+1] = safe_strdup (g, fs->fstab[i].device);
+      count++;
+    }
+#undef CRITERION
+
+  return ret;
 }
 
-/* At the moment, pull just the ProductName and version numbers from
- * the registry.  In future there is a case for making many more
- * registry fields available to callers.
- */
-static int
-check_windows_registry (guestfs_h *g, struct inspect_fs *fs,
-                        const char *systemroot)
+char **
+guestfs__inspect_get_filesystems (guestfs_h *g, const char *root)
 {
-  size_t len = strlen (systemroot) + 64;
-  char software[len];
-  snprintf (software, len, "%s/system32/config/software", systemroot);
-
-  char *software_path = resolve_windows_path_silently (g, software);
-  if (!software_path)
-    /* If the software hive doesn't exist, just accept that we cannot
-     * find product_name etc.
-     */
-    return 0;
-
-  int ret = -1;
-  hive_h *h = NULL;
-  hive_value_h *values = NULL;
-
-  char dir[] = "/tmp/winreg.XXXXXX";
-#define dir_len 18
-  if (mkdtemp (dir) == NULL) {
-    perrorf (g, "mkdtemp");
-    goto out;
-  }
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
+    return NULL;
 
-  char software_hive[dir_len + 16];
-  snprintf (software_hive, dir_len + 16, "%s/software", dir);
+  char **ret;
 
-  if (guestfs_download (g, software_path, software_hive) == -1)
-    goto out;
+  /* If no fstab information (Windows) return just the root. */
+  if (fs->nr_fstab == 0) {
+    ret = calloc (2, sizeof (char *));
+    ret[0] = safe_strdup (g, root);
+    ret[1] = NULL;
+    return ret;
+  }
 
-  h = hivex_open (software_hive, g->verbose ? HIVEX_OPEN_VERBOSE : 0);
-  if (h == NULL) {
-    perrorf (g, "hivex_open");
-    goto out;
+  ret = calloc (fs->nr_fstab + 1, sizeof (char *));
+  if (ret == NULL) {
+    perrorf (g, "calloc");
+    return NULL;
   }
 
-  hive_node_h node = hivex_root (h);
-  const char *hivepath[] =
-    { "Microsoft", "Windows NT", "CurrentVersion" };
   size_t i;
-  for (i = 0;
-       node != 0 && i < sizeof hivepath / sizeof hivepath[0];
-       ++i) {
-    node = hivex_node_get_child (h, node, hivepath[i]);
+  for (i = 0; i < fs->nr_fstab; ++i)
+    ret[i] = safe_strdup (g, fs->fstab[i].device);
+
+  return ret;
+}
+
+char **
+guestfs__inspect_get_drive_mappings (guestfs_h *g, const char *root)
+{
+  char **ret;
+  size_t i, count;
+  struct inspect_fs *fs;
+
+  fs = guestfs___search_for_root (g, root);
+  if (!fs)
+    return NULL;
+
+  /* If no drive mappings, return an empty hashtable. */
+  if (!fs->drive_mappings)
+    count = 0;
+  else {
+    for (count = 0; fs->drive_mappings[count] != NULL; count++)
+      ;
   }
 
-  if (node == 0) {
-    perrorf (g, "hivex: cannot locate HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion");
-    goto out;
+  ret = calloc (count+1, sizeof (char *));
+  if (ret == NULL) {
+    perrorf (g, "calloc");
+    return NULL;
   }
 
-  values = hivex_node_values (h, node);
+  /* We need to make a deep copy of the hashtable since the caller
+   * will free it.
+   */
+  for (i = 0; i < count; ++i)
+    ret[i] = safe_strdup (g, fs->drive_mappings[i]);
 
-  for (i = 0; values[i] != 0; ++i) {
-    char *key = hivex_value_key (h, values[i]);
-    if (key == NULL) {
-      perrorf (g, "hivex_value_key");
-      goto out;
-    }
+  ret[count] = NULL;
 
-    if (STRCASEEQ (key, "ProductName")) {
-      fs->product_name = hivex_value_string (h, values[i]);
-      if (!fs->product_name) {
-        perrorf (g, "hivex_value_string");
-        free (key);
-        goto out;
-      }
-    }
-    else if (STRCASEEQ (key, "CurrentVersion")) {
-      char *version = hivex_value_string (h, values[i]);
-      if (!version) {
-        perrorf (g, "hivex_value_string");
-        free (key);
-        goto out;
-      }
-      char *major, *minor;
-      if (match2 (g, version, re_windows_version, &major, &minor)) {
-        fs->major_version = parse_unsigned_int (g, major);
-        free (major);
-        if (fs->major_version == -1) {
-          free (minor);
-          free (key);
-          free (version);
-          goto out;
-        }
-        fs->minor_version = parse_unsigned_int (g, minor);
-        free (minor);
-        if (fs->minor_version == -1) {
-          free (key);
-          free (version);
-          return -1;
-        }
-      }
+  return ret;
+}
 
-      free (version);
-    }
+char *
+guestfs__inspect_get_package_format (guestfs_h *g, const char *root)
+{
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
+    return NULL;
 
-    free (key);
+  char *ret;
+  switch (fs->package_format) {
+  case OS_PACKAGE_FORMAT_RPM: ret = safe_strdup (g, "rpm"); break;
+  case OS_PACKAGE_FORMAT_DEB: ret = safe_strdup (g, "deb"); break;
+  case OS_PACKAGE_FORMAT_PACMAN: ret = safe_strdup (g, "pacman"); break;
+  case OS_PACKAGE_FORMAT_EBUILD: ret = safe_strdup (g, "ebuild"); break;
+  case OS_PACKAGE_FORMAT_PISI: ret = safe_strdup (g, "pisi"); break;
+  case OS_PACKAGE_FORMAT_UNKNOWN:
+  default:
+    ret = safe_strdup (g, "unknown");
+    break;
   }
 
-  ret = 0;
+  return ret;
+}
 
- out:
-  if (h) hivex_close (h);
-  free (values);
-  free (software_path);
+char *
+guestfs__inspect_get_package_management (guestfs_h *g, const char *root)
+{
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
+    return NULL;
 
-  /* Free up the temporary directory.  Note the directory name cannot
-   * contain shell meta-characters because of the way it was
-   * constructed above.
-   */
-  char cmd[dir_len + 16];
-  snprintf (cmd, dir_len + 16, "rm -rf %s", dir);
-  ignore_value (system (cmd));
-#undef dir_len
+  char *ret;
+  switch (fs->package_management) {
+  case OS_PACKAGE_MANAGEMENT_YUM: ret = safe_strdup (g, "yum"); break;
+  case OS_PACKAGE_MANAGEMENT_UP2DATE: ret = safe_strdup (g, "up2date"); break;
+  case OS_PACKAGE_MANAGEMENT_APT: ret = safe_strdup (g, "apt"); break;
+  case OS_PACKAGE_MANAGEMENT_PACMAN: ret = safe_strdup (g, "pacman"); break;
+  case OS_PACKAGE_MANAGEMENT_PORTAGE: ret = safe_strdup (g, "portage"); break;
+  case OS_PACKAGE_MANAGEMENT_PISI: ret = safe_strdup (g, "pisi"); break;
+  case OS_PACKAGE_MANAGEMENT_URPMI: ret = safe_strdup (g, "urpmi"); break;
+  case OS_PACKAGE_MANAGEMENT_UNKNOWN:
+  default:
+    ret = safe_strdup (g, "unknown");
+    break;
+  }
 
   return ret;
 }
 
-static char *
-resolve_windows_path_silently (guestfs_h *g, const char *path)
+char *
+guestfs__inspect_get_hostname (guestfs_h *g, const char *root)
 {
-  guestfs_error_handler_cb old_error_cb = g->error_cb;
-  g->error_cb = NULL;
-  char *ret = guestfs_case_sensitive_path (g, path);
-  g->error_cb = old_error_cb;
-  return ret;
+  struct inspect_fs *fs = guestfs___search_for_root (g, root);
+  if (!fs)
+    return NULL;
+
+  return safe_strdup (g, fs->hostname ? : "unknown");
 }
 
-static int
-extend_fses (guestfs_h *g)
+/* Download a guest file to a local temporary file.  The file is
+ * downloaded into g->tmpdir, unless it already exists in g->tmpdir.
+ * The final name will be g->tmpdir + "/" + basename.  Refuse to
+ * download the guest file if it is larger than max_size.  The caller
+ * does not need to delete the temporary file after use: it will be
+ * deleted when the handle is cleaned up.
+ */
+int
+guestfs___download_to_tmp (guestfs_h *g, const char *filename,
+                           const char *basename, int64_t max_size)
 {
-  size_t n = g->nr_fses + 1;
-  struct inspect_fs *p;
+  int tmpdirfd, fd, r = -1;
+  char buf[32];
+  int64_t size;
 
-  p = realloc (g->fses, n * sizeof (struct inspect_fs));
-  if (p == NULL) {
-    perrorf (g, "realloc");
+  tmpdirfd = open (g->tmpdir, O_RDONLY);
+  if (tmpdirfd == -1) {
+    perrorf (g, _("%s: temporary directory not found"), g->tmpdir);
     return -1;
   }
 
-  g->fses = p;
-  g->nr_fses = n;
+  /* If the file has already been downloaded, return. */
+  if (faccessat (tmpdirfd, basename, R_OK, 0) == 0) {
+    r = 0;
+    goto out;
+  }
 
-  memset (&g->fses[n-1], 0, sizeof (struct inspect_fs));
+  /* Check size of remote file. */
+  size = guestfs_filesize (g, filename);
+  if (size == -1)
+    /* guestfs_filesize failed and has already set error in handle */
+    goto out;
+  if (size > max_size) {
+    error (g, _("size of %s is unreasonably large (%" PRIi64 " bytes)"),
+           filename, size);
+    goto out;
+  }
 
-  return 0;
-}
+  fd = openat (tmpdirfd, basename, O_WRONLY|O_CREAT|O_TRUNC|O_NOCTTY, 0600);
+  if (fd == -1) {
+    perrorf (g, "openat: %s/%s", g->tmpdir, basename);
+    goto out;
+  }
 
-/* Parse small, unsigned ints, as used in version numbers. */
-static int
-parse_unsigned_int (guestfs_h *g, const char *str)
-{
-  long ret;
-  int r = xstrtol (str, NULL, 10, &ret, "");
-  if (r != LONGINT_OK) {
-    error (g, "could not parse integer in version number: %s", str);
-    return -1;
+  snprintf (buf, sizeof buf, "/dev/fd/%d", fd);
+
+  if (guestfs_download (g, filename, buf) == -1) {
+    unlinkat (tmpdirfd, basename, 0);
+    close (fd);
+    goto out;
   }
-  return ret;
+
+  if (close (fd) == -1) {
+    perrorf (g, "close: %s/%s", g->tmpdir, basename);
+    unlinkat (tmpdirfd, basename, 0);
+    goto out;
+  }
+
+  r = 0;
+ out:
+  if (tmpdirfd >= 0)
+    close (tmpdirfd);
+
+  return r;
 }
 
-static struct inspect_fs *
-search_for_root (guestfs_h *g, const char *root)
+struct inspect_fs *
+guestfs___search_for_root (guestfs_h *g, const char *root)
 {
   if (g->nr_fses == 0) {
     error (g, _("no inspection data: call guestfs_inspect_os first"));
@@ -1146,152 +586,183 @@ search_for_root (guestfs_h *g, const char *root)
   return NULL;
 }
 
-char *
-guestfs__inspect_get_type (guestfs_h *g, const char *root)
+#else /* no PCRE or hivex at compile time */
+
+/* XXX These functions should be in an optgroup. */
+
+#define NOT_IMPL(r)                                                     \
+  error (g, _("inspection API not available since this version of libguestfs was compiled without PCRE or hivex libraries")); \
+  return r
+
+char **
+guestfs__inspect_os (guestfs_h *g)
 {
-  struct inspect_fs *fs = search_for_root (g, root);
-  if (!fs)
-    return NULL;
+  NOT_IMPL(NULL);
+}
 
-  char *ret;
-  switch (fs->type) {
-  case OS_TYPE_LINUX: ret = safe_strdup (g, "linux"); break;
-  case OS_TYPE_WINDOWS: ret = safe_strdup (g, "windows"); break;
-  case OS_TYPE_UNKNOWN: default: ret = safe_strdup (g, "unknown"); break;
-  }
+char **
+guestfs__inspect_get_roots (guestfs_h *g)
+{
+  NOT_IMPL(NULL);
+}
 
-  return ret;
+char *
+guestfs__inspect_get_type (guestfs_h *g, const char *root)
+{
+  NOT_IMPL(NULL);
 }
 
 char *
 guestfs__inspect_get_arch (guestfs_h *g, const char *root)
 {
-  struct inspect_fs *fs = search_for_root (g, root);
-  if (!fs)
-    return NULL;
-
-  return safe_strdup (g, fs->arch ? : "unknown");
+  NOT_IMPL(NULL);
 }
 
 char *
 guestfs__inspect_get_distro (guestfs_h *g, const char *root)
 {
-  struct inspect_fs *fs = search_for_root (g, root);
-  if (!fs)
-    return NULL;
-
-  char *ret;
-  switch (fs->distro) {
-  case OS_DISTRO_DEBIAN: ret = safe_strdup (g, "debian"); break;
-  case OS_DISTRO_FEDORA: ret = safe_strdup (g, "fedora"); break;
-  case OS_DISTRO_REDHAT_BASED: ret = safe_strdup (g, "redhat-based"); break;
-  case OS_DISTRO_RHEL: ret = safe_strdup (g, "rhel"); break;
-  case OS_DISTRO_WINDOWS: ret = safe_strdup (g, "windows"); break;
-  case OS_DISTRO_UNKNOWN: default: ret = safe_strdup (g, "unknown"); break;
-  }
-
-  return ret;
+  NOT_IMPL(NULL);
 }
 
 int
 guestfs__inspect_get_major_version (guestfs_h *g, const char *root)
 {
-  struct inspect_fs *fs = search_for_root (g, root);
-  if (!fs)
-    return -1;
-
-  return fs->major_version;
+  NOT_IMPL(-1);
 }
 
 int
 guestfs__inspect_get_minor_version (guestfs_h *g, const char *root)
 {
-  struct inspect_fs *fs = search_for_root (g, root);
-  if (!fs)
-    return -1;
-
-  return fs->minor_version;
+  NOT_IMPL(-1);
 }
 
 char *
 guestfs__inspect_get_product_name (guestfs_h *g, const char *root)
 {
-  struct inspect_fs *fs = search_for_root (g, root);
-  if (!fs)
-    return NULL;
+  NOT_IMPL(NULL);
+}
 
-  return safe_strdup (g, fs->product_name ? : "unknown");
+char *
+guestfs__inspect_get_product_variant (guestfs_h *g, const char *root)
+{
+  NOT_IMPL(NULL);
+}
+
+char *
+guestfs__inspect_get_windows_systemroot (guestfs_h *g, const char *root)
+{
+  NOT_IMPL(NULL);
+}
+
+char *
+guestfs__inspect_get_windows_current_control_set (guestfs_h *g,
+                                                  const char *root)
+{
+  NOT_IMPL(NULL);
 }
 
 char **
 guestfs__inspect_get_mountpoints (guestfs_h *g, const char *root)
 {
-  struct inspect_fs *fs = search_for_root (g, root);
-  if (!fs)
-    return NULL;
+  NOT_IMPL(NULL);
+}
 
-  char **ret;
+char **
+guestfs__inspect_get_filesystems (guestfs_h *g, const char *root)
+{
+  NOT_IMPL(NULL);
+}
 
-  /* If no fstab information (Windows) return just the root. */
-  if (fs->nr_fstab == 0) {
-    ret = calloc (3, sizeof (char *));
-    ret[0] = safe_strdup (g, "/");
-    ret[1] = safe_strdup (g, root);
-    ret[2] = NULL;
-    return ret;
-  }
+char **
+guestfs__inspect_get_drive_mappings (guestfs_h *g, const char *root)
+{
+  NOT_IMPL(NULL);
+}
 
-#define CRITERION fs->fstab[i].mountpoint[0] == '/'
-  size_t i, count = 0;
-  for (i = 0; i < fs->nr_fstab; ++i)
-    if (CRITERION)
-      count++;
+char *
+guestfs__inspect_get_package_format (guestfs_h *g, const char *root)
+{
+  NOT_IMPL(NULL);
+}
 
-  /* Hashtables have 2N+1 entries. */
-  ret = calloc (2*count+1, sizeof (char *));
-  if (ret == NULL) {
-    perrorf (g, "calloc");
-    return NULL;
-  }
+char *
+guestfs__inspect_get_package_management (guestfs_h *g, const char *root)
+{
+  NOT_IMPL(NULL);
+}
 
-  count = 0;
-  for (i = 0; i < fs->nr_fstab; ++i)
-    if (CRITERION) {
-      ret[2*count] = safe_strdup (g, fs->fstab[i].mountpoint);
-      ret[2*count+1] = safe_strdup (g, fs->fstab[i].device);
-      count++;
-    }
-#undef CRITERION
+char *
+guestfs__inspect_get_hostname (guestfs_h *g, const char *root)
+{
+  NOT_IMPL(NULL);
+}
 
-  return ret;
+char *
+guestfs__inspect_get_format (guestfs_h *g, const char *root)
+{
+  NOT_IMPL(NULL);
 }
 
-char **
-guestfs__inspect_get_filesystems (guestfs_h *g, const char *root)
+int
+guestfs__inspect_is_live (guestfs_h *g, const char *root)
 {
-  struct inspect_fs *fs = search_for_root (g, root);
-  if (!fs)
-    return NULL;
+  NOT_IMPL(-1);
+}
 
-  char **ret;
+int
+guestfs__inspect_is_netinst (guestfs_h *g, const char *root)
+{
+  NOT_IMPL(-1);
+}
 
-  /* If no fstab information (Windows) return just the root. */
-  if (fs->nr_fstab == 0) {
-    ret = calloc (2, sizeof (char *));
-    ret[0] = safe_strdup (g, root);
-    ret[1] = NULL;
-    return ret;
-  }
+int
+guestfs__inspect_is_multipart (guestfs_h *g, const char *root)
+{
+  NOT_IMPL(-1);
+}
 
-  ret = calloc (fs->nr_fstab + 1, sizeof (char *));
-  if (ret == NULL) {
-    perrorf (g, "calloc");
-    return NULL;
-  }
+#endif /* no PCRE or hivex at compile time */
 
+void
+guestfs___free_inspect_info (guestfs_h *g)
+{
   size_t i;
-  for (i = 0; i < fs->nr_fstab; ++i)
-    ret[i] = safe_strdup (g, fs->fstab[i].device);
+  for (i = 0; i < g->nr_fses; ++i) {
+    free (g->fses[i].device);
+    free (g->fses[i].product_name);
+    free (g->fses[i].product_variant);
+    free (g->fses[i].arch);
+    free (g->fses[i].hostname);
+    free (g->fses[i].windows_systemroot);
+    free (g->fses[i].windows_current_control_set);
+    size_t j;
+    for (j = 0; j < g->fses[i].nr_fstab; ++j) {
+      free (g->fses[i].fstab[j].device);
+      free (g->fses[i].fstab[j].mountpoint);
+    }
+    free (g->fses[i].fstab);
+    if (g->fses[i].drive_mappings)
+      guestfs___free_string_list (g->fses[i].drive_mappings);
+  }
+  free (g->fses);
+  g->nr_fses = 0;
+  g->fses = NULL;
+}
 
-  return ret;
+/* In the Perl code this is a public function. */
+int
+guestfs___feature_available (guestfs_h *g, const char *feature)
+{
+  /* If there's an error we should ignore it, so to do that we have to
+   * temporarily replace the error handler with a null one.
+   */
+  guestfs_error_handler_cb old_error_cb = g->error_cb;
+  g->error_cb = NULL;
+
+  const char *groups[] = { feature, NULL };
+  int r = guestfs_available (g, (char * const *) groups);
+
+  g->error_cb = old_error_cb;
+
+  return r == 0 ? 1 : 0;
 }