Merge branch 'dev' of github.com:vanhauser-thc/AFLplusplus into dev

docs/Changelog.md

@@ -10,6 +10,7 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
 
 
 ### Version ++2.67d (develop)
+  - a few QOL changes for Apple and its outdated gmake
   - afl-fuzz:
     - Fix for auto dictionary entries found during fuzzing to not throw out
       a -x dictionary

llvm_mode/afl-clang-fast.c

@@ -670,11 +670,11 @@ static void edit_params(u32 argc, char **argv, char **envp) {
 
   }
 
-#ifndef __APPLE__
+  #ifndef __APPLE__
   if (!shared_linking)
     cc_params[cc_par_cnt++] =
         alloc_printf("-Wl,--dynamic-list=%s/dynamic_list.txt", obj_path);
-#endif
+  #endif
 
 #endif
 

src/afl-showmap.c

@@ -636,10 +636,10 @@ static void usage(u8 *argv0) {
       "size\n"
       "              the target was compiled for\n"
       "AFL_PRELOAD: LD_PRELOAD / DYLD_INSERT_LIBRARIES settings for target\n"
-      "AFL_QUIET: do not print extra informational output\n"
-      "AFL_FORKSRV_INIT_TMOUT: time the fuzzer waits for the target to come up, initially\n"
-
-      ,argv0, MEM_LIMIT, doc_path);
+      "AFL_FORKSRV_INIT_TMOUT: time spent waiting for forkserver during "
+      "startup (in milliseconds)\n"
+      "AFL_QUIET: do not print extra informational output\n",
+      argv0, MEM_LIMIT, doc_path);
 
   exit(1);
 

src/afl-tmin.c

@@ -846,7 +846,7 @@ static void usage(u8 *argv0) {
       "              the target was compiled for\n"
       "AFL_PRELOAD:  LD_PRELOAD / DYLD_INSERT_LIBRARIES settings for target\n"
       "AFL_TMIN_EXACT: require execution paths to match for crashing inputs\n"
-      "AFL_FORKSRV_INIT_TMOUT: time the fuzzer waits for the target to come up, initially\n"
+      "AFL_FORKSRV_INIT_TMOUT: time spent waiting for forkserver during startup (in milliseconds)\n"
 
       , argv0, EXEC_TIMEOUT, MEM_LIMIT, doc_path);