fuzz_{base64,doh}: curl lib includes for standalone harnesses

This patch adds `-I` flag to compilation flags for
standalone harnesses in Makefile.am.
Variable CURLDIR is used to determine include path.
This patch sets CURLDIR envvar in ossfuzz.sh, but name is taken
from mainline.sh.
That makes dependencies work with oss-fuzz.
It should also make it work with mainline.sh

Author: Advenam Tacet

Makefile.am

@@ -139,15 +139,15 @@ curl_fuzzer_fnmatch_CXXFLAGS = $(COMMON_FLAGS)
 curl_fuzzer_fnmatch_LDADD = $(COMMON_LDADD)
 
 curl_fuzzer_altsvc_SOURCES = fuzz_altsvc.cc
-curl_fuzzer_altsvc_CXXFLAGS = $(COMMON_FLAGS)
+curl_fuzzer_altsvc_CXXFLAGS = $(COMMON_FLAGS) -I$(CURLDIR)
 curl_fuzzer_altsvc_LDADD = $(COMMON_LDADD)
 
 curl_fuzzer_base64_SOURCES = fuzz_base64.cc
-curl_fuzzer_base64_CXXFLAGS = $(COMMON_FLAGS)
+curl_fuzzer_base64_CXXFLAGS = $(COMMON_FLAGS) -I$(CURLDIR)
 curl_fuzzer_base64_LDADD = $(COMMON_LDADD)
 
 curl_fuzzer_doh_SOURCES = fuzz_doh.cc
-curl_fuzzer_doh_CXXFLAGS = $(COMMON_FLAGS)
+curl_fuzzer_doh_CXXFLAGS = $(COMMON_FLAGS) -I$(CURLDIR)
 curl_fuzzer_doh_LDADD = $(COMMON_LDADD)
 
 # Create the seed corpora zip files.

fuzz_base64.cc

@@ -28,10 +28,10 @@ extern "C"
   #include <unistd.h>
   #include <inttypes.h>
   #include <curl/curl.h>
-  #include "curl/lib/curl_base64.h"
-  #include "curl/lib/curl_printf.h"
-  #include "curl/lib/curl_memory.h"
-  #include "curl/lib/memdebug.h"
+  #include <lib/curl_base64.h>
+  #include <lib/curl_printf.h>
+  #include <lib/curl_memory.h>
+  #include <lib/memdebug.h>
   #include <assert.h>
 }
 

fuzz_doh.cc

@@ -31,7 +31,7 @@ extern "C"
   #include <assert.h>
   #define WARN_UNUSED_RESULT /* hack */
   #define DEBUGBUILD
-  #include "curl/lib/dynbuf.h"
+  #include <lib/dynbuf.h>
 
   typedef enum {
     DOH_OK,

mainline.sh

@@ -6,7 +6,7 @@ set -ex
 export BUILD_ROOT=$PWD
 SCRIPTDIR=${BUILD_ROOT}/scripts
 
-CURLDIR=/tmp/curl
+export CURLDIR=/tmp/curl
 OPENSSLDIR=/tmp/openssl
 NGHTTPDIR=/tmp/nghttp2
 INSTALLDIR=/tmp/curl_install

ossfuzz.sh

@@ -23,6 +23,7 @@
 
 # Save off the current folder as the build root.
 export BUILD_ROOT=$PWD
+export CURLDIR=/src/curl
 SCRIPTDIR=${BUILD_ROOT}/scripts
 
 . ${SCRIPTDIR}/fuzz_targets
@@ -60,7 +61,7 @@ fi
 ${SCRIPTDIR}/handle_x.sh nghttp2 ${NGHTTPDIR} ${INSTALLDIR} || exit 1
 
 # Compile curl
-${SCRIPTDIR}/install_curl.sh /src/curl ${INSTALLDIR}
+${SCRIPTDIR}/install_curl.sh $CURLDIR ${INSTALLDIR}
 
 # Build the fuzzers.
 ${SCRIPTDIR}/compile_fuzzer.sh ${INSTALLDIR}