fuse: Return EXIT_FAILURE if fuse_main fails.

[libguestfs.git] / src / inspect_apps.c

diff --git a/src/inspect_apps.c b/src/inspect_apps.c
index 83c5e5e..18f2ae3 100644 (file)
--- a/src/inspect_apps.c
+++ b/src/inspect_apps.c
@@ -29,9 +29,7 @@
 #include <errno.h>
 #include <endian.h>
 
-#ifdef HAVE_PCRE
 #include <pcre.h>
-#endif
 
 #ifdef HAVE_HIVEX
 #include <hivex.h>
@@ -46,7 +44,7 @@
 #include "guestfs-internal-actions.h"
 #include "guestfs_protocol.h"
 
-#if defined(HAVE_PCRE) && defined(HAVE_HIVEX)
+#if defined(HAVE_HIVEX)
 
 #ifdef DB_DUMP
 static struct guestfs_application_list *list_applications_rpm (guestfs_h *g, struct inspect_fs *fs);
@@ -74,6 +72,7 @@ guestfs__inspect_list_applications (guestfs_h *g, const char *root)
   if (fs->format == OS_FORMAT_INSTALLED) {
     switch (fs->type) {
     case OS_TYPE_LINUX:
+    case OS_TYPE_HURD:
       switch (fs->package_format) {
       case OS_PACKAGE_FORMAT_RPM:
 #ifdef DB_DUMP
@@ -92,6 +91,7 @@ guestfs__inspect_list_applications (guestfs_h *g, const char *root)
       case OS_PACKAGE_FORMAT_PACMAN:
       case OS_PACKAGE_FORMAT_EBUILD:
       case OS_PACKAGE_FORMAT_PISI:
+      case OS_PACKAGE_FORMAT_PKGSRC:
       case OS_PACKAGE_FORMAT_UNKNOWN:
       default:
         /* nothing - keep GCC happy */;
@@ -105,6 +105,7 @@ guestfs__inspect_list_applications (guestfs_h *g, const char *root)
       break;
 
     case OS_TYPE_FREEBSD:
+    case OS_TYPE_NETBSD:
     case OS_TYPE_UNKNOWN:
     default:
       /* nothing - keep GCC happy */;
@@ -601,12 +602,12 @@ sort_applications (struct guestfs_application_list *apps)
            compare_applications);
 }
 
-#else /* no PCRE or hivex at compile time */
+#else /* no 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")); \
+  error (g, _("inspection API not available since this version of libguestfs was compiled without the hivex library")); \
   return r
 
 struct guestfs_application_list *
@@ -615,4 +616,4 @@ guestfs__inspect_list_applications (guestfs_h *g, const char *root)
   NOT_IMPL(NULL);
 }
 
-#endif /* no PCRE or hivex at compile time */
+#endif /* no hivex at compile time */