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

1 files changed, 10 insertions, 1 deletions

diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c
index c7f8ccad..548f029b 100644
--- a/src/afl-fuzz.c
+++ b/src/afl-fuzz.c
@@ -186,6 +186,7 @@ static void usage(u8* argv0, int more_help) {
       //"AFL_DEFER_FORKSRV: not supported anymore -> no effect, just a warning\n"
       "AFL_EXIT_WHEN_DONE: exit when all inputs are run and no new finds are found\n"
       "AFL_BENCH_UNTIL_CRASH: exit soon when the first crashing input has been found\n"
+      "AFL_AUTORESUME: resume fuzzing if directory specified by -o already exists\n"
       "\n"
     );
   else
@@ -649,7 +650,7 @@ int main(int argc, char** argv, char** envp) {
     usage(argv[0], show_help);
 
   OKF("afl++ is maintained by Marc \"van Hauser\" Heuse, Heiko \"hexcoder\" "
-      "Eißfeldt and Andrea Fioraldi");
+      "Eißfeldt, Andrea Fioraldi and Dominik Maier");
   OKF("afl++ is open source, get it at "
       "https://github.com/vanhauser-thc/AFLplusplus");
   OKF("Power schedules from github.com/mboehme/aflfast");
@@ -750,6 +751,14 @@ int main(int argc, char** argv, char** envp) {
   if (get_afl_env("AFL_SHUFFLE_QUEUE")) shuffle_queue = 1;
   if (get_afl_env("AFL_FAST_CAL")) fast_cal = 1;
 
+  if (get_afl_env("AFL_AUTORESUME")) {
+    
+    autoresume = 1;
+    if (in_place_resume) 
+      SAYF("AFL_AUTORESUME has no effect for '-i -'");
+
+  }
+
   if (get_afl_env("AFL_HANG_TMOUT")) {
 
     hang_tmout = atoi(getenv("AFL_HANG_TMOUT"));