Merge pull request #3146 from eduar-hte/seclang-scanner-nounistd

Update to seclang-scanner changes introduced by Windows support

.gitignore

@@ -11,13 +11,18 @@ build/ltoptions.m4
 build/ltsugar.m4
 build/ltversion.m4
 build/lt~obsolete.m4
+build/win32/build
+build/win32/CMakeUserPresets.json
 compile
 config.guess
 config.log
 config.status
 config.sub
+config.h.in~
 configure
+configure~
 depcomp
+modsecurity.pc
 .deps
 .libs
 .dirstamp

README.md

@@ -71,8 +71,7 @@ Details on distribution specific builds can be found in our Wiki:
 
 ### Windows
 
-Windows build is not ready yet.
-
+Windows build information can be found [here](build/win32/README.md).
 
 ## Dependencies
 

build/win32/docker/Dockerfile

@@ -56,7 +56,7 @@ WORKDIR C:\
 RUN cmd.exe /C md %SRC_DIR%
 
 # libModSecurity
-WORKDIR C:\src
+WORKDIR ${SCR_DIR}
 
 ARG MOD_SECURITY_TAG=v3/master
 RUN git clone -c advice.detachedHead=false --depth 1 --branch %MOD_SECURITY_TAG% https://github.com/owasp-modsecurity/ModSecurity.git

src/parser/seclang-scanner.cc

@@ -4900,13 +4900,14 @@ static std::stack<int> YY_PREVIOUS_STATE;
 // The location of the current token.
 #line 4902 "seclang-scanner.cc"
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
 
 #line 494 "seclang-scanner.ll"
   // Code run each time a pattern is matched.
   # define YY_USER_ACTION  driver.loc.back()->columns (yyleng);
 
-#line 4909 "seclang-scanner.cc"
 #line 4910 "seclang-scanner.cc"
+#line 4911 "seclang-scanner.cc"
 
 #define INITIAL 0
 #define EXPECTING_ACTION_PREDICATE_VARIABLE 1
@@ -4952,11 +4953,7 @@ static std::stack<int> YY_PREVIOUS_STATE;
  * The user has a chance to override it with an option.
  */
 /* %if-c-only */
-#ifndef WIN32
 #include <unistd.h>
-#else
-#include <io.h>
-#endif
 /* %endif */
 /* %if-c++-only */
 /* %endif */
@@ -5232,7 +5229,7 @@ YY_DECL
   // Code run each time yylex is called.
   driver.loc.back()->step();
 
-#line 5232 "seclang-scanner.cc"
+#line 5233 "seclang-scanner.cc"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -8338,7 +8335,7 @@ YY_RULE_SETUP
 #line 1340 "seclang-scanner.ll"
 ECHO;
 	YY_BREAK
-#line 8338 "seclang-scanner.cc"
+#line 8339 "seclang-scanner.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -8960,7 +8957,7 @@ static void yy_load_buffer_state  (void)
 
 /* %if-c-only */
 
-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+        b->yy_is_interactive = 0;
 
 /* %endif */
 /* %if-c++-only */

src/parser/seclang-scanner.ll

@@ -73,7 +73,7 @@ static std::stack<int> YY_PREVIOUS_STATE;
 
 // The location of the current token.
 %}
-%option noyywrap nounput batch debug noinput
+%option noyywrap nounput batch debug noinput nounistd never-interactive