From 84ff87124d3c24dc0da873e7dd5c0b68ffaba3fe Mon Sep 17 00:00:00 2001
From: Stuart Mcalpine <s.r.mcalpine@durham.ac.uk>
Date: Fri, 26 Jul 2019 17:29:08 +0100
Subject: [PATCH] Even when Snapshots: invoke_stf is chosen (perform
 VELOCIraptor automatically at the snapshot output times), do not use the
 snapshot basename and instead use the stf basename (StructureFinding:
 basename).

This saves the group files to their own folder as is the behaviour when
performing VELOCIraptor using StructureFinding: output_list.
---
 src/velociraptor_interface.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/velociraptor_interface.c b/src/velociraptor_interface.c
index 47c107d047..07fceb409f 100644
--- a/src/velociraptor_interface.c
+++ b/src/velociraptor_interface.c
@@ -518,14 +518,8 @@ void velociraptor_invoke(struct engine *e, const int linked_with_snap) {
   char outputFileName[PARSER_MAX_LINE_SIZE + 128];
 
   /* What should the filename be? */
-  if (linked_with_snap) {
-    snprintf(outputFileName, PARSER_MAX_LINE_SIZE + 128,
-             "stf_%s_%04i.VELOCIraptor", e->snapshot_base_name,
-             e->snapshot_output_count);
-  } else {
-    snprintf(outputFileName, PARSER_MAX_LINE_SIZE + 128, "%s_%04i.VELOCIraptor",
-             e->stf_base_name, e->stf_output_count);
-  }
+  snprintf(outputFileName, PARSER_MAX_LINE_SIZE + 128, "%s_%04i.VELOCIraptor",
+           e->stf_base_name, e->stf_output_count);
 
   /* What is the snapshot number? */
   int snapnum;
-- 
GitLab