about summary refs log tree commit diff
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2020-10-12 04:48:02 +0200
committervan Hauser <vh@thc.org>2020-10-12 04:48:02 +0200
commit15099f7f5a129dd3679df646ed2b50a3196188f1 (patch)
treea96fabb9ae07a570b0a62ca0277c8cccbecd5d7a
parentaef0cd5877e0e4d3450610d48c4f6188a114d2b3 (diff)
downloadafl++-15099f7f5a129dd3679df646ed2b50a3196188f1.tar.gz
fix afl-cc.8 generation
-rw-r--r--GNUmakefile.gcc_plugin1
-rw-r--r--GNUmakefile.llvm5
-rw-r--r--src/afl-fuzz.c5
3 files changed, 6 insertions, 5 deletions
diff --git a/GNUmakefile.gcc_plugin b/GNUmakefile.gcc_plugin
index e3108511..d139387a 100644
--- a/GNUmakefile.gcc_plugin
+++ b/GNUmakefile.gcc_plugin
@@ -146,7 +146,6 @@ all_done: test_build
 
 .NOTPARALLEL: clean
 
-vpath  % ..
 %.8: %
 	@echo .TH $* 8 `date "+%Y-%m-%d"` "afl++" > ./$@
 	@echo .SH NAME >> ./$@
diff --git a/GNUmakefile.llvm b/GNUmakefile.llvm
index e0dc793e..1f67ea7f 100644
--- a/GNUmakefile.llvm
+++ b/GNUmakefile.llvm
@@ -472,12 +472,11 @@ install: all
 	set -e; install -m 644 ./dynamic_list.txt $${DESTDIR}$(HELPER_PATH)
 	install -m 644 instrumentation/README.*.md $${DESTDIR}$(DOC_PATH)/
 
-vpath  % ..
 %.8: %
 	@echo .TH $* 8 $(BUILD_DATE) "afl++" > ./$@
 	@echo .SH NAME >> ./$@
-	@printf "%s" ".B $* \- " >> ../$@
-	@./$* -h 2>&1 | head -n 1 | sed -e "s/$$(printf '\e')[^m]*m//g" >> ../$@
+	@printf "%s" ".B $* \- " >> ./$@
+	@./$* -h 2>&1 | head -n 1 | sed -e "s/$$(printf '\e')[^m]*m//g" >> ./$@
 	@echo .B $* >> ./$@
 	@echo >> ./$@
 	@echo .SH SYNOPSIS >> ./$@
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c
index e58d3d34..6498eb30 100644
--- a/src/afl-fuzz.c
+++ b/src/afl-fuzz.c
@@ -1179,9 +1179,12 @@ int main(int argc, char **argv_orig, char **envp) {
 
   if (extras_dir_cnt) {
 
-    for (i = 0; i < extras_dir_cnt; i++)
+    for (i = 0; i < extras_dir_cnt; i++) {
+
       load_extras(afl, extras_dir[i]);
 
+    }
+
     dedup_extras(afl);
     OKF("Loaded a total of %u extras.", afl->extras_cnt);