about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAndrea Fioraldi <andreafioraldi@gmail.com>2019-12-19 14:35:26 +0100
committerAndrea Fioraldi <andreafioraldi@gmail.com>2019-12-19 14:35:26 +0100
commit5e53d337dbfb15aef37a9f3243594d75fc4ffc25 (patch)
treef7716a3a6d1a945345ae004f17ad5c8457861716 /src
parent6226e384512bad86977377b2cece2b5bc0286aa3 (diff)
downloadafl++-5e53d337dbfb15aef37a9f3243594d75fc4ffc25.tar.gz
split havoc/custom line in status screen
Diffstat (limited to 'src')
-rw-r--r--src/afl-fuzz-stats.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/afl-fuzz-stats.c b/src/afl-fuzz-stats.c
index db2d7dc2..485e2aaa 100644
--- a/src/afl-fuzz-stats.c
+++ b/src/afl-fuzz-stats.c
@@ -576,15 +576,12 @@ void show_stats(void) {
                 "  imported : " cRST "%-10s" bSTG       bV "\n",
        tmp, sync_id ? DI(queued_imported) : (u8*)"n/a");
 
-  sprintf(tmp, "%s/%s, %s/%s, %s/%s, %s/%s, %s/%s",
+  sprintf(tmp, "%s/%s, %s/%s, %s/%s",
           DI(stage_finds[STAGE_HAVOC]), DI(stage_cycles[STAGE_HAVOC]),
           DI(stage_finds[STAGE_SPLICE]), DI(stage_cycles[STAGE_SPLICE]),
-          DI(stage_finds[STAGE_PYTHON]), DI(stage_cycles[STAGE_PYTHON]),
-          DI(stage_finds[STAGE_RADAMSA]), DI(stage_cycles[STAGE_RADAMSA]),
-          DI(stage_finds[STAGE_CUSTOM_MUTATOR]),
-          DI(stage_cycles[STAGE_CUSTOM_MUTATOR]));
+          DI(stage_finds[STAGE_RADAMSA]), DI(stage_cycles[STAGE_RADAMSA]));
 
-  SAYF(bV bSTOP "havoc/custom : " cRST "%-36s " bSTG bV bSTOP, tmp);
+  SAYF(bV bSTOP "   havoc/rad : " cRST "%-36s " bSTG bV bSTOP, tmp);
 
   if (t_bytes)
     sprintf(tmp, "%0.02f%%", stab_ratio);
@@ -599,6 +596,14 @@ void show_stats(void) {
                   : cRST),
        tmp);
 
+  sprintf(tmp, "%s/%s, %s/%s",
+          DI(stage_finds[STAGE_PYTHON]), DI(stage_cycles[STAGE_PYTHON]),
+          DI(stage_finds[STAGE_CUSTOM_MUTATOR]),
+          DI(stage_cycles[STAGE_CUSTOM_MUTATOR]));
+
+  SAYF(bV bSTOP "   py/custom : " cRST "%-36s " bSTG bVR bH20 bH2 bH bRB
+                  "\n", tmp);
+
   if (!bytes_trim_out) {
 
     sprintf(tmp, "n/a, ");
@@ -634,14 +639,12 @@ void show_stats(void) {
 
     sprintf(tmp, "%s/%s", DI(stage_finds[STAGE_CUSTOM_MUTATOR]),
             DI(stage_cycles[STAGE_CUSTOM_MUTATOR]));
-    SAYF(bV bSTOP " custom mut. : " cRST "%-36s " bSTG bVR bH20 bH2 bH bRB
-                  "\n" bLB bH30 bH20 bH2 bH bRB bSTOP cRST RESET_G1,
+    SAYF(bV bSTOP " custom mut. : " cRST "%-36s " bSTG bV RESET_G1,
          tmp);
 
   } else {
 
-    SAYF(bV bSTOP "        trim : " cRST "%-36s " bSTG bVR bH20 bH2 bH bRB
-                  "\n" bLB bH30 bH20 bH2 bRB bSTOP cRST RESET_G1,
+    SAYF(bV bSTOP "        trim : " cRST "%-36s " bSTG bV RESET_G1,
          tmp);
 
   }
@@ -688,6 +691,9 @@ void show_stats(void) {
   } else
 
     SAYF("\r");
+  
+  /* Last line */
+  SAYF(SET_G1 "\n" bSTG bLB bH30 bH20 bH2 bRB bSTOP cRST RESET_G1);
 
   /* Hallelujah! */