From 86416022164ba7224fb6c367114e66c395a277b0 Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Tue, 18 Oct 2016 15:14:15 -0400
Subject: [PATCH] added virtual machine formats to list of types. Fixed
compiler error on gcc
---
tsk/auto/tsk_case_db.h | 2 +-
tsk/img/img_types.c | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/tsk/auto/tsk_case_db.h b/tsk/auto/tsk_case_db.h
index 5dcd5e39f..f9c333fe0 100644
--- a/tsk/auto/tsk_case_db.h
+++ b/tsk/auto/tsk_case_db.h
@@ -68,7 +68,7 @@ class TskAutoDb:public TskAuto {
* Sets whether or not the file systems for an image should be added when
* the image is added to the case database. The default value is true.
*/
- void TskAutoDb::setAddFileSystems(bool addFileSytems);
+ void setAddFileSystems(bool addFileSytems);
/**
* Skip processing of orphans on FAT filesystems.
diff --git a/tsk/img/img_types.c b/tsk/img/img_types.c
index 9037c1eed..9897299dd 100644
--- a/tsk/img/img_types.c
+++ b/tsk/img/img_types.c
@@ -20,7 +20,7 @@
*/
typedef struct {
char *name;
- uint8_t code;
+ uint16_t code;
char *comment;
} IMG_TYPES;
@@ -39,6 +39,12 @@ static IMG_TYPES img_open_table[] = {
#endif
#if HAVE_LIBEWF
{"ewf", TSK_IMG_TYPE_EWF_EWF, "Expert Witness Format (EnCase)"},
+#endif
+#if HAVE_LIBVMDK
+ {"vmdk", TSK_IMG_TYPE_VMDK_VMDK, "Virtual Machine Disk (VmWare, Virtual Box)"},
+#endif
+#if HAVE_LIBVHDI
+ {"vhd", TSK_IMG_TYPE_VHD_VHD, "Virtual Hard Drive (Microsoft)"},
#endif
{0},
};
--
GitLab