aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2020-08-31 18:32:01 +0200
committervan Hauser <vh@thc.org>2020-08-31 18:32:01 +0200
commite4de4e350009584f5cdb8cf4c47a79fff9358cad (patch)
treef3b40e8e95321e9424152e0a025b0a5cf26e0616
parentbea76b346ce278896d0b4a6f3b1d42e5c1c786c3 (diff)
downloadafl++-e4de4e350009584f5cdb8cf4c47a79fff9358cad.tar.gz
update gitignore
-rw-r--r--.gitignore1
-rw-r--r--docs/Changelog.md1
-rw-r--r--llvm_mode/afl-clang-fast.c4
-rw-r--r--src/afl-showmap.c8
-rw-r--r--src/afl-tmin.c2
5 files changed, 9 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 4307fc4c..9c169c49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ afl-cmin.8
afl-cmin.bash.8
afl-fuzz.8
afl-gcc.8
+afl-g++.8
afl-gcc-fast.8
afl-g++-fast.8
afl-gotcpu.8
diff --git a/docs/Changelog.md b/docs/Changelog.md
index cb6e14b8..3966464e 100644
--- a/docs/Changelog.md
+++ b/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
diff --git a/llvm_mode/afl-clang-fast.c b/llvm_mode/afl-clang-fast.c
index 281d6b4b..ccdbca9d 100644
--- a/llvm_mode/afl-clang-fast.c
+++ b/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
diff --git a/src/afl-showmap.c b/src/afl-showmap.c
index ae33cc48..f4a7c336 100644
--- a/src/afl-showmap.c
+++ b/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);
diff --git a/src/afl-tmin.c b/src/afl-tmin.c
index f231cde9..e1d08054 100644
--- a/src/afl-tmin.c
+++ b/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);