From 036cf09360b232bd2d996427aee170eb3bd52b93 Mon Sep 17 00:00:00 2001
From: Daniel Chesters <daniel.chesters@gmail.com>
Date: Thu, 22 Nov 2018 21:14:02 +0100
Subject: [PATCH] Ensure use the system find and findstr command instead
 find/findstr from path. Fix #1959

---
 vendor/bin/alias.cmd    | 8 ++++----
 vendor/bin/cexec.cmd    | 2 +-
 vendor/init.bat         | 2 +-
 vendor/lib/lib_base.cmd | 8 ++++----
 vendor/lib/lib_path.cmd | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/vendor/bin/alias.cmd b/vendor/bin/alias.cmd
index 50e22e7..1a1739d 100644
--- a/vendor/bin/alias.cmd
+++ b/vendor/bin/alias.cmd
@@ -40,7 +40,7 @@ goto parseargument
   ) else if "%currentarg%" neq "" (
     if "%~2" equ "" (
       :: Show the specified alias
-      doskey /macros | findstr /b %currentarg%= && exit /b
+      doskey /macros | %WINDIR%\System32\findstr /b %currentarg%= && exit /b
       echo insufficient parameters.
       goto :p_help
     ) else (
@@ -85,7 +85,7 @@ if not ["%_temp%"] == ["%alias_name%"] (
 )
 
 :: replace already defined alias
-findstr /b /v /i "%alias_name%=" "%ALIASES%" >> "%ALIASES%.tmp"
+%WINDIR%\System32\findstr /b /v /i "%alias_name%=" "%ALIASES%" >> "%ALIASES%.tmp"
 echo %alias_name%=%alias_value% >> "%ALIASES%.tmp" && type "%ALIASES%.tmp" > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
 doskey /macrofile="%ALIASES%"
 endlocal
@@ -93,7 +93,7 @@ exit /b
 
 :p_del
 set del_alias=%~1
-findstr /b /v /i "%del_alias%=" "%ALIASES%" >> "%ALIASES%.tmp"
+%WINDIR%\System32\findstr /b /v /i "%del_alias%=" "%ALIASES%" >> "%ALIASES%.tmp"
 type "%ALIASES%".tmp > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
 doskey %del_alias%=
 doskey /macrofile="%ALIASES%"
@@ -105,7 +105,7 @@ echo Aliases reloaded
 exit /b
 
 :p_show
-doskey /macros|findstr /v /r "^;=" | sort
+doskey /macros|%WINDIR%\System32\findstr /v /r "^;=" | sort
 exit /b
 
 :p_help
diff --git a/vendor/bin/cexec.cmd b/vendor/bin/cexec.cmd
index 3193f4f..02ecba5 100644
--- a/vendor/bin/cexec.cmd
+++ b/vendor/bin/cexec.cmd
@@ -52,7 +52,7 @@ set "feFlagName=%feFlagName% "
 :: echo %feCommand%
 :: echo %feParam%
 :: echo.
-echo %CMDER_USER_FLAGS% | find /i "%feFlagName%">nul
+echo %CMDER_USER_FLAGS% | %WINDIR%\System32\find /i "%feFlagName%">nul
 if "%ERRORLEVEL%" == "0" (
   if "%feNOT%" == "false" (
     endlocal && call %feCommand% %feParam%
diff --git a/vendor/init.bat b/vendor/init.bat
index 8a4d71a..519b580 100644
--- a/vendor/init.bat
+++ b/vendor/init.bat
@@ -300,7 +300,7 @@ if "%CMDER_ALIASES%" == "1" (
       echo Creating initial user_aliases store in "%user_aliases%"...
       copy "%CMDER_ROOT%\vendor\user_aliases.cmd.example" "%user_aliases%"
   ) else (
-      type "%user_aliases%" | findstr /i ";= Add aliases below here" >nul
+      type "%user_aliases%" | %WINDIR%\System32\findstr /i ";= Add aliases below here" >nul
       if "!errorlevel!" == "1" (
           echo Creating initial user_aliases store in "%user_aliases%"...
           if defined CMDER_USER_CONFIG (
diff --git a/vendor/lib/lib_base.cmd b/vendor/lib/lib_base.cmd
index 8577637..705cca2 100644
--- a/vendor/lib/lib_base.cmd
+++ b/vendor/lib/lib_base.cmd
@@ -27,7 +27,7 @@ exit /b
 :::       file <in> full path to file containing lib_routines to display
 :::.
 :::-------------------------------------------------------------------------------
-    for /f "tokens=* delims=:" %%a in ('type "%~1" ^| findstr /i /r "^:::"') do (
+    for /f "tokens=* delims=:" %%a in ('type "%~1" ^| %WINDIR%\System32\findstr /i /r "^:::"') do (
         rem echo a="%%a"
 
         if "%%a"=="." (
@@ -61,9 +61,9 @@ exit /b
 :::       file <in> full path to file containing lib_routines to display
 :::.
 :::-------------------------------------------------------------------------------
-    echo %comspec% | find /i "\cmd.exe" > nul && set "CMDER_SHELL=cmd"
-    echo %comspec% | find /i "\tcc.exe" > nul && set "CMDER_SHELL=tcc"
-    echo %comspec% | find /i "\tccle" > nul && set "CMDER_SHELL=tccle"
+    echo %comspec% | %WINDIR%\System32\find /i "\cmd.exe" > nul && set "CMDER_SHELL=cmd"
+    echo %comspec% | %WINDIR%\System32\find /i "\tcc.exe" > nul && set "CMDER_SHELL=tcc"
+    echo %comspec% | %WINDIR%\System32\find /i "\tccle" > nul && set "CMDER_SHELL=tccle"
 
     set CMDER_CLINK=1
     if "%CMDER_SHELL%" equ "tcc" set CMDER_CLINK=0
diff --git a/vendor/lib/lib_path.cmd b/vendor/lib/lib_path.cmd
index b1a6d2d..6e31560 100644
--- a/vendor/lib/lib_path.cmd
+++ b/vendor/lib/lib_path.cmd
@@ -68,14 +68,14 @@ exit /b
 
     if "%CMDER_CONFIGURED%" == "1" (
       %lib_console% debug_output  :enhance_path "Env Var - find_query=%find_query%"
-      echo "%path%"|findstr >nul /I /R ";%find_query%\"$"
+      echo "%path%"|%WINDIR%\System32\findstr >nul /I /R ";%find_query%\"$"
       if "!ERRORLEVEL!" == "0" set found=1
     )
     %lib_console% debug_output  :enhance_path "Env Var 1 - found=!found!"
 
     if "!found!" == "0" (
         if "%CMDER_CONFIGURED%" == "1" (
-            echo "%path%"|findstr >nul /i /r ";%find_query%;"
+            echo "%path%"|%WINDIR%\System32\findstr >nul /i /r ";%find_query%;"
             if "!ERRORLEVEL!" == "0" set found=1
         )
         %lib_console% debug_output  :enhance_path "Env Var 2 - found=!found!"