Require PCRE library.

[libguestfs.git] / src / inspect_fs.c

diff --git a/src/inspect_fs.c b/src/inspect_fs.c
index 15d6f96..3fa5c98 100644 (file)
--- a/src/inspect_fs.c
+++ b/src/inspect_fs.c
@@ -29,9 +29,7 @@
 #include <errno.h>
 #include <endian.h>
 
 #include <errno.h>
 #include <endian.h>
 

-#ifdef HAVE_PCRE

 #include <pcre.h>
 #include <pcre.h>

-#endif

 
 #ifdef HAVE_HIVEX
 #include <hivex.h>
 
 #ifdef HAVE_HIVEX
 #include <hivex.h>


@@ -46,7 +44,7 @@
 #include "guestfs-internal-actions.h"
 #include "guestfs_protocol.h"
 
 #include "guestfs-internal-actions.h"
 #include "guestfs_protocol.h"
 

-#if defined(HAVE_PCRE) && defined(HAVE_HIVEX)
+#if defined(HAVE_HIVEX)

 
 /* Compile all the regular expressions once when the shared library is
  * loaded.  PCRE is thread safe so we're supposedly OK here if
 
 /* Compile all the regular expressions once when the shared library is
  * loaded.  PCRE is thread safe so we're supposedly OK here if


@@ -223,9 +221,9 @@ check_filesystem (guestfs_h *g, const char *device,
    * would *not* be Windows root disks.  (RHBZ#674130)
    */
   else if (is_file_nocase (g, "/AUTOEXEC.BAT") > 0 ||
    * would *not* be Windows root disks.  (RHBZ#674130)
    */
   else if (is_file_nocase (g, "/AUTOEXEC.BAT") > 0 ||

-           is_dir_nocase (g, "/WINDOWS") > 0 ||
-           is_dir_nocase (g, "/WIN32") > 0 ||
-           is_dir_nocase (g, "/WINNT") > 0 ||
+           is_dir_nocase (g, "/WINDOWS/SYSTEM32") > 0 ||
+           is_dir_nocase (g, "/WIN32/SYSTEM32") > 0 ||
+           is_dir_nocase (g, "/WINNT/SYSTEM32") > 0 ||

            is_file_nocase (g, "/boot.ini") > 0 ||
            is_file_nocase (g, "/ntldr") > 0) {
     fs->is_root = 1;
            is_file_nocase (g, "/boot.ini") > 0 ||
            is_file_nocase (g, "/ntldr") > 0) {
     fs->is_root = 1;


@@ -376,6 +374,8 @@ check_package_format (guestfs_h *g, struct inspect_fs *fs)
   case OS_DISTRO_REDHAT_BASED:
   case OS_DISTRO_RHEL:
   case OS_DISTRO_MANDRIVA:
   case OS_DISTRO_REDHAT_BASED:
   case OS_DISTRO_RHEL:
   case OS_DISTRO_MANDRIVA:

+  case OS_DISTRO_CENTOS:
+  case OS_DISTRO_SCIENTIFIC_LINUX:

     fs->package_format = OS_PACKAGE_FORMAT_RPM;
     break;
 
     fs->package_format = OS_PACKAGE_FORMAT_RPM;
     break;
 


@@ -415,6 +415,8 @@ check_package_management (guestfs_h *g, struct inspect_fs *fs)
 
   case OS_DISTRO_REDHAT_BASED:
   case OS_DISTRO_RHEL:
 
   case OS_DISTRO_REDHAT_BASED:
   case OS_DISTRO_RHEL:

+  case OS_DISTRO_CENTOS:
+  case OS_DISTRO_SCIENTIFIC_LINUX:

     if (fs->major_version >= 5)
       fs->package_management = OS_PACKAGE_MANAGEMENT_YUM;
     else
     if (fs->major_version >= 5)
       fs->package_management = OS_PACKAGE_MANAGEMENT_YUM;
     else


@@ -534,4 +536,4 @@ guestfs___first_egrep_of_file (guestfs_h *g, const char *filename,
   return 1;
 }
 
   return 1;
 }
 

-#endif /* defined(HAVE_PCRE) && defined(HAVE_HIVEX) */
+#endif /* defined(HAVE_HIVEX) */