hongguzz.h: move saveUnique to io struct

4 files changed, 7 insertions, 7 deletions

diff --git a/cmdline.c b/cmdline.c
index 6baec095..de466e84 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -141,10 +141,10 @@ bool cmdlineParse(int argc, char* argv[], honggfuzz_t* hfuzz) {
                 .fileExtn = "fuzz",
                 .workDir = ".",
                 .covDir = NULL,
+                .saveUnique = true,
             },
         .nullifyStdio = true,
         .fuzzStdin = false,
-        .saveUnique = true,
         .useScreen = true,
         .useVerifier = false,
         .timeStart = time(NULL),
@@ -366,7 +366,7 @@ bool cmdlineParse(int argc, char* argv[], honggfuzz_t* hfuzz) {
                 hfuzz->fuzzStdin = true;
                 break;
             case 'u':
-                hfuzz->saveUnique = false;
+                hfuzz->io.saveUnique = false;
                 break;
             case 'l':
                 logfile = optarg;
@@ -598,7 +598,7 @@ bool cmdlineParse(int argc, char* argv[], honggfuzz_t* hfuzz) {
         "ASLimit: 0x%" PRIx64 "(MiB), RSSLimit: 0x%" PRIx64 ", DATALimit: 0x%" PRIx64
         ", fuzzExe: '%s', fuzzedPid: %d, monitorSIGABRT: '%s'",
         (int)getpid(), hfuzz->io.inputDir, cmdlineYesNo(hfuzz->nullifyStdio),
-        cmdlineYesNo(hfuzz->fuzzStdin), cmdlineYesNo(hfuzz->saveUnique), hfuzz->mutationsPerRun,
+        cmdlineYesNo(hfuzz->fuzzStdin), cmdlineYesNo(hfuzz->io.saveUnique), hfuzz->mutationsPerRun,
         hfuzz->externalCommand == NULL ? "NULL" : hfuzz->externalCommand, (int)hfuzz->runEndTime,
         hfuzz->tmOut, hfuzz->mutationsMax, hfuzz->threads.threadsMax, hfuzz->io.fileExtn,
         hfuzz->asLimit, hfuzz->rssLimit, hfuzz->dataLimit, hfuzz->cmdline[0], hfuzz->linux.pid,
diff --git a/honggfuzz.h b/honggfuzz.h
index 42108d09..a46bbf66 100644
--- a/honggfuzz.h
+++ b/honggfuzz.h
@@ -172,7 +172,6 @@ typedef struct {
     char cmdline_txt[61];
     bool nullifyStdio;
     bool fuzzStdin;
-    bool saveUnique;
     bool useScreen;
     bool useVerifier;
     time_t timeStart;
@@ -184,6 +183,7 @@ typedef struct {
         bool fileCntDone;
         char* workDir;
         char* covDir;
+        bool saveUnique;
     } io;
     unsigned mutationsPerRun;
     char* externalCommand;
diff --git a/linux/trace.c b/linux/trace.c
index cea1c536..e09209fb 100644
--- a/linux/trace.c
+++ b/linux/trace.c
@@ -649,7 +649,7 @@ static void arch_traceSaveData(run_t* run, pid_t pid) {
     REG_TYPE pc = 0;
 
     /* Local copy since flag is overridden for some crashes */
-    bool saveUnique = run->global->saveUnique;
+    bool saveUnique = run->global->io.saveUnique;
 
     char instr[_HF_INSTR_SZ] = "\x00";
     siginfo_t si;
@@ -1030,7 +1030,7 @@ static void arch_traceExitSaveData(run_t* run, pid_t pid) {
             run->origFileName);
     } else {
         /* Keep the crashes file name format identical */
-        if (run->backtrace != 0ULL && run->global->saveUnique) {
+        if (run->backtrace != 0ULL && run->global->io.saveUnique) {
             snprintf(run->crashFileName, sizeof(run->crashFileName),
                 "%s/%s.PC.%" REG_PM ".STACK.%" PRIx64 ".CODE.%s.ADDR.%p.INSTR.%s.%s",
                 run->global->io.workDir, "SAN", pc, run->backtrace, op, crashAddr, "[UNKNOWN]",
diff --git a/mac/arch.c b/mac/arch.c
index 7e534aa9..179e24a0 100644
--- a/mac/arch.c
+++ b/mac/arch.c
@@ -253,7 +253,7 @@ static bool arch_analyzeSignal(run_t* run, int status) {
     if (run->global->mutationsPerRun == 0U && run->global->useVerifier) {
         snprintf(run->crashFileName, sizeof(run->crashFileName), "%s/%s", run->global->io.workDir,
             run->origFileName);
-    } else if (run->global->saveUnique) {
+    } else if (run->global->io.saveUnique) {
         snprintf(run->crashFileName, sizeof(run->crashFileName),
             "%s/%s.%s.PC.%.16llx.STACK.%.16llx.ADDR.%.16llx.%s", run->global->io.workDir,
             arch_sigs[termsig].descr, exception_to_string(run->exception), run->pc, run->backtrace,