X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Finspect.c;h=a4f0f987813fe7294ddd2851fb401228318d6b51;hb=f3eea44f97340f747e46b0df6931a04b53abaf01;hp=b4acf1778df3df8cada53a8adfaf7c7907525ddf;hpb=3f1e3223c491aa057d02c1da418ed896d09fff7c;p=libguestfs.git

diff --git a/src/inspect.c b/src/inspect.c
index b4acf17..a4f0f98 100644
--- a/src/inspect.c
+++ b/src/inspect.c
@@ -229,7 +229,7 @@ static int check_windows_root (guestfs_h *g, struct inspect_fs *fs);
 static int check_windows_arch (guestfs_h *g, struct inspect_fs *fs);
 static int check_windows_software_registry (guestfs_h *g, struct inspect_fs *fs);
 static int check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs);
-static char *resolve_windows_path_silently (guestfs_h *g, const char *);
+static char *case_sensitive_path_silently (guestfs_h *g, const char *);
 static int is_file_nocase (guestfs_h *g, const char *);
 static int is_dir_nocase (guestfs_h *g, const char *);
 static int extend_fses (guestfs_h *g);
@@ -645,6 +645,15 @@ check_linux_root (guestfs_h *g, struct inspect_fs *fs)
     if (parse_major_minor (g, fs) == -1)
       return -1;
   }
+  else if (guestfs_exists (g, "/etc/slackware-version") > 0) {
+    fs->distro = OS_DISTRO_SLACKWARE;
+
+    if (parse_release_file (g, fs, "/etc/slackware-version") == -1)
+      return -1;
+
+    if (parse_major_minor (g, fs) == -1)
+      return -1;
+  }
 
  skip_release_checks:;
 
@@ -1413,7 +1422,7 @@ check_windows_root (guestfs_h *g, struct inspect_fs *fs)
   for (i = 0;
        systemroot == NULL && i < sizeof systemroots / sizeof systemroots[0];
        ++i) {
-    systemroot = resolve_windows_path_silently (g, systemroots[i]);
+    systemroot = case_sensitive_path_silently (g, systemroots[i]);
   }
 
   if (!systemroot) {
@@ -1450,7 +1459,7 @@ check_windows_arch (guestfs_h *g, struct inspect_fs *fs)
   char cmd_exe[len];
   snprintf (cmd_exe, len, "%s/system32/cmd.exe", fs->windows_systemroot);
 
-  char *cmd_exe_path = resolve_windows_path_silently (g, cmd_exe);
+  char *cmd_exe_path = case_sensitive_path_silently (g, cmd_exe);
   if (!cmd_exe_path)
     return 0;
 
@@ -1477,7 +1486,7 @@ check_windows_software_registry (guestfs_h *g, struct inspect_fs *fs)
   snprintf (software, len, "%s/system32/config/software",
             fs->windows_systemroot);
 
-  char *software_path = resolve_windows_path_silently (g, software);
+  char *software_path = case_sensitive_path_silently (g, software);
   if (!software_path)
     /* If the software hive doesn't exist, just accept that we cannot
      * find product_name etc.
@@ -1594,7 +1603,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs)
   snprintf (system, len, "%s/system32/config/system",
             fs->windows_systemroot);
 
-  char *system_path = resolve_windows_path_silently (g, system);
+  char *system_path = case_sensitive_path_silently (g, system);
   if (!system_path)
     /* If the system hive doesn't exist, just accept that we cannot
      * find hostname etc.
@@ -1669,7 +1678,7 @@ check_windows_system_registry (guestfs_h *g, struct inspect_fs *fs)
 }
 
 static char *
-resolve_windows_path_silently (guestfs_h *g, const char *path)
+case_sensitive_path_silently (guestfs_h *g, const char *path)
 {
   guestfs_error_handler_cb old_error_cb = g->error_cb;
   g->error_cb = NULL;
@@ -1684,7 +1693,7 @@ is_file_nocase (guestfs_h *g, const char *path)
   char *p;
   int r;
 
-  p = resolve_windows_path_silently (g, path);
+  p = case_sensitive_path_silently (g, path);
   if (!p)
     return 0;
   r = guestfs_is_file (g, p);
@@ -1698,7 +1707,7 @@ is_dir_nocase (guestfs_h *g, const char *path)
   char *p;
   int r;
 
-  p = resolve_windows_path_silently (g, path);
+  p = case_sensitive_path_silently (g, path);
   if (!p)
     return 0;
   r = guestfs_is_dir (g, p);
@@ -1784,6 +1793,7 @@ check_package_format (guestfs_h *g, struct inspect_fs *fs)
     fs->package_format = OS_PACKAGE_FORMAT_PISI;
     break;
 
+  case OS_DISTRO_SLACKWARE:
   case OS_DISTRO_WINDOWS:
   case OS_DISTRO_UNKNOWN:
   default:
@@ -1828,6 +1838,7 @@ check_package_management (guestfs_h *g, struct inspect_fs *fs)
     fs->package_management = OS_PACKAGE_MANAGEMENT_URPMI;
     break;
 
+  case OS_DISTRO_SLACKWARE:
   case OS_DISTRO_WINDOWS:
   case OS_DISTRO_UNKNOWN:
   default:
@@ -1935,6 +1946,7 @@ guestfs__inspect_get_distro (guestfs_h *g, const char *root)
   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_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;
@@ -2448,66 +2460,95 @@ list_applications_deb (guestfs_h *g, struct inspect_fs *fs)
   return ret;
 }
 
-/* XXX We already download the SOFTWARE hive when doing general
- * inspection.  We could avoid this second download of the same file
- * by caching these entries in the handle.
- */
+static void list_applications_windows_from_path (guestfs_h *g, hive_h *h, struct guestfs_application_list *apps, const char **path, size_t path_len);
+
 static struct guestfs_application_list *
 list_applications_windows (guestfs_h *g, struct inspect_fs *fs)
 {
   TMP_TEMPLATE_ON_STACK (software_local);
 
+  /* XXX We already download the SOFTWARE hive when doing general
+   * inspection.  We could avoid this second download of the same file
+   * by caching these entries in the handle.
+   */
   size_t len = strlen (fs->windows_systemroot) + 64;
   char software[len];
   snprintf (software, len, "%s/system32/config/software",
             fs->windows_systemroot);
 
-  char *software_path = resolve_windows_path_silently (g, software);
+  char *software_path = case_sensitive_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;
 
-  struct guestfs_application_list *apps = NULL, *ret = NULL;
+  struct guestfs_application_list *ret = NULL;
   hive_h *h = NULL;
-  hive_node_h *children = NULL;
 
   if (download_to_tmp (g, software_path, software_local,
                        MAX_REGISTRY_SIZE) == -1)
     goto out;
 
+  free (software_path);
+  software_path = NULL;
+
   h = hivex_open (software_local, g->verbose ? HIVEX_OPEN_VERBOSE : 0);
   if (h == NULL) {
     perrorf (g, "hivex_open");
     goto out;
   }
 
-  hive_node_h node = hivex_root (h);
+  /* Allocate apps list. */
+  ret = safe_malloc (g, sizeof *ret);
+  ret->len = 0;
+  ret->val = NULL;
+
+  /* Ordinary native applications. */
   const char *hivepath[] =
     { "Microsoft", "Windows", "CurrentVersion", "Uninstall" };
+  list_applications_windows_from_path (g, h, ret, hivepath,
+                                       sizeof hivepath / sizeof hivepath[0]);
+
+  /* 32-bit emulated Windows apps running on the WOW64 emulator.
+   * http://support.microsoft.com/kb/896459 (RHBZ#692545).
+   */
+  const char *hivepath2[] =
+    { "WOW6432node", "Microsoft", "Windows", "CurrentVersion", "Uninstall" };
+  list_applications_windows_from_path (g, h, ret, hivepath2,
+                                       sizeof hivepath2 / sizeof hivepath2[0]);
+
+ out:
+  if (h) hivex_close (h);
+  free (software_path);
+
+  /* Delete the temporary file. */
+  unlink (software_local);
+#undef software_local_len
+
+  return ret;
+}
+
+static void
+list_applications_windows_from_path (guestfs_h *g, hive_h *h,
+                                     struct guestfs_application_list *apps,
+                                     const char **path, size_t path_len)
+{
+  hive_node_h *children = NULL;
+  hive_node_h node;
   size_t i;
-  for (i = 0;
-       node != 0 && i < sizeof hivepath / sizeof hivepath[0];
-       ++i) {
-    node = hivex_node_get_child (h, node, hivepath[i]);
-  }
 
-  if (node == 0) {
-    perrorf (g, "hivex: cannot locate HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall");
-    goto out;
-  }
+  node = hivex_root (h);
 
-  children = hivex_node_children (h, node);
-  if (children == NULL) {
-    perrorf (g, "hivex_node_children");
-    goto out;
-  }
+  for (i = 0; node != 0 && i < path_len; ++i)
+    node = hivex_node_get_child (h, node, path[i]);
 
-  /* Allocate 'apps' list. */
-  apps = safe_malloc (g, sizeof *apps);
-  apps->len = 0;
-  apps->val = NULL;
+  if (node == 0)
+    return;
+
+  children = hivex_node_children (h, node);
+  if (children == NULL)
+    return;
 
   /* Consider any child node that has a DisplayName key.
    * See also:
@@ -2527,10 +2568,8 @@ list_applications_windows (guestfs_h *g, struct inspect_fs *fs)
      * display name is not language-independent, so it cannot be used.
      */
     name = hivex_node_name (h, children[i]);
-    if (name == NULL) {
-      perrorf (g, "hivex_node_get_name");
-      goto out;
-    }
+    if (name == NULL)
+      continue;
 
     value = hivex_node_get_value (h, children[i], "DisplayName");
     if (value) {
@@ -2571,20 +2610,7 @@ list_applications_windows (guestfs_h *g, struct inspect_fs *fs)
     free (comments);
   }
 
-  ret = apps;
-
- out:
-  if (ret == NULL && apps != NULL)
-    guestfs_free_application_list (apps);
-  if (h) hivex_close (h);
   free (children);
-  free (software_path);
-
-  /* Free up the temporary file. */
-  unlink (software_local);
-#undef software_local_len
-
-  return ret;
 }
 
 static void