[PATCH 3/3] cmd: Fix calling executable file failure, when filename with inbuilt keyword.

[Haidong Yu]

From: Haidong Yu

Signed-off-by: Haidong Yu 
---
 programs/cmd/wcmdmain.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 1867c5afb92..8fa2c82a279 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -1302,6 +1302,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects,
                                 STD_OUTPUT_HANDLE,
                                 STD_ERROR_HANDLE};
     BOOL prev_echo_mode, piped = FALSE;
+    BOOL called = FALSE;

WINE_TRACE("command on entry:%s (%p)\n",
                wine_dbgstr_w(command), cmdList);
@@ -1327,8 +1328,17 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects,
     }
     for (i=0; i<=WCMD_EXIT; i++) {
       if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT,
-        whichcmd, count, inbuilt[i], -1) == CSTR_EQUAL) break;
+        whichcmd, count, inbuilt[i], -1) == CSTR_EQUAL) {
+        called = TRUE;
+        break;
+      }
+    }
+
+    while (!retrycall && (IsCharAlphaNumericW(whichcmd[count]) || wcschr(L".+_", whichcmd[count]))) {
+      count++;
+      i = WCMD_EXIT + 1;
     }
+
     cmd_index = i;
     parms_start = WCMD_skip_leading_spaces (&whichcmd[count]);

@@ -1646,7 +1656,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects,
         /* else: drop through */
       default:
         prev_echo_mode = echo_mode;
-        WCMD_run_program (whichcmd, FALSE);
+        WCMD_run_program (whichcmd, called);
         echo_mode = prev_echo_mode;
     }
     free(cmd);