Pino Toscano
2018-Feb-15 17:15 UTC
[Libguestfs] [PATCH] daemon: tsk: handle new enum values in sleuthkit 4.5
Resort to a version check for them, as they do not exist in older
versions.
---
daemon/tsk.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/daemon/tsk.c b/daemon/tsk.c
index af803d749..ad10d74fe 100644
--- a/daemon/tsk.c
+++ b/daemon/tsk.c
@@ -241,6 +241,9 @@ file_type (TSK_FS_FILE *fsfile)
case TSK_FS_NAME_TYPE_SHAD: return 'h';
case TSK_FS_NAME_TYPE_WHT: return 'w';
case TSK_FS_NAME_TYPE_VIRT: return 'u'; /* Temp files created by
TSK */
+#if TSK_VERSION_NUM >= 0x040500ff
+ case TSK_FS_NAME_TYPE_VIRT_DIR: return 'u'; /* Temp files created
by TSK */
+#endif
}
else if (fsfile->meta != NULL &&
fsfile->meta->type < TSK_FS_META_TYPE_STR_MAX)
@@ -256,6 +259,9 @@ file_type (TSK_FS_FILE *fsfile)
case TSK_FS_META_TYPE_SOCK: return 's';
case TSK_FS_META_TYPE_WHT: return 'w';
case TSK_FS_META_TYPE_VIRT: return 'u'; /* Temp files created by
TSK */
+#if TSK_VERSION_NUM >= 0x040500ff
+ case TSK_FS_META_TYPE_VIRT_DIR: return 'u'; /* Temp files created
by TSK */
+#endif
}
return 'u';
--
2.14.3
Richard W.M. Jones
2018-Feb-20 09:51 UTC
Re: [Libguestfs] [PATCH] daemon: tsk: handle new enum values in sleuthkit 4.5
On Thu, Feb 15, 2018 at 06:15:00PM +0100, Pino Toscano wrote:> Resort to a version check for them, as they do not exist in older > versions. > --- > daemon/tsk.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/daemon/tsk.c b/daemon/tsk.c > index af803d749..ad10d74fe 100644 > --- a/daemon/tsk.c > +++ b/daemon/tsk.c > @@ -241,6 +241,9 @@ file_type (TSK_FS_FILE *fsfile) > case TSK_FS_NAME_TYPE_SHAD: return 'h'; > case TSK_FS_NAME_TYPE_WHT: return 'w'; > case TSK_FS_NAME_TYPE_VIRT: return 'u'; /* Temp files created by TSK */ > +#if TSK_VERSION_NUM >= 0x040500ff > + case TSK_FS_NAME_TYPE_VIRT_DIR: return 'u'; /* Temp files created by TSK */ > +#endif > } > else if (fsfile->meta != NULL && > fsfile->meta->type < TSK_FS_META_TYPE_STR_MAX) > @@ -256,6 +259,9 @@ file_type (TSK_FS_FILE *fsfile) > case TSK_FS_META_TYPE_SOCK: return 's'; > case TSK_FS_META_TYPE_WHT: return 'w'; > case TSK_FS_META_TYPE_VIRT: return 'u'; /* Temp files created by TSK */ > +#if TSK_VERSION_NUM >= 0x040500ff > + case TSK_FS_META_TYPE_VIRT_DIR: return 'u'; /* Temp files created by TSK */ > +#endif > } >ACK Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW