Michael Stefaniuc : cmd: Don't treat all command lines with '/?' as builtin commands.

Alexandre Julliard julliard at winehq.org
Tue Jun 22 10:49:32 CDT 2010


Module: wine
Branch: master
Commit: 71e647fe5188c8ab7f5e4df6cbb0f04f23ff46c0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=71e647fe5188c8ab7f5e4df6cbb0f04f23ff46c0

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Tue Jun 22 00:44:15 2010 +0200

cmd: Don't treat all command lines with '/?' as builtin commands.

---

 programs/cmd/wcmdmain.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index b86801c..b50512e 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -1405,15 +1405,14 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects,
     }
     for (i=0; i<=WCMD_EXIT; i++) {
       if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT,
-        whichcmd, count, inbuilt[i], -1) == 2) break;
+        whichcmd, count, inbuilt[i], -1) == CSTR_EQUAL) break;
     }
     p = WCMD_strtrim_leading_spaces (&whichcmd[count]);
     WCMD_parse (p, quals, param1, param2);
     WINE_TRACE("param1: %s, param2: %s\n", wine_dbgstr_w(param1), wine_dbgstr_w(param2));
 
-    if((p[0] == '/') && (p[1] == '?')) {
-
-      /*this is a help request for a program*/
+    if (i <= WCMD_EXIT && (p[0] == '/') && (p[1] == '?')) {
+      /* this is a help request for a builtin program */
       i = WCMD_HELP;
       memcpy(p, whichcmd, count * sizeof(WCHAR));
       p[count] = '\0';




More information about the wine-cvs mailing list