Skip to content

W
wine-cw
Commit 07fc82ee authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Fixed check for .bat and .cmd extensions (spotted by Mike McCormack).

parent 6a8ac17c
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
programs/wcmd/wcmdmain.c
View file @ 07fc82ee
...@@ -481,14 +481,17 @@ char filetorun[MAX_PATH]; ...@@ -481,14 +481,17 @@ char filetorun[MAX_PATH];
WCMD_parse (command, quals, param1, param2); /* Quick way to get the filename */ WCMD_parse (command, quals, param1, param2); /* Quick way to get the filename */
if (!(*param1) && !(*param2)) if (!(*param1) && !(*param2))
return; return;
if (strpbrk (param1, "\\:") == NULL) { /* No explicit path given */ if (strpbrk (param1, "/\\:") == NULL) { /* No explicit path given */
if ((strchr (param1, '.') == NULL) || (strstr (param1, ".bat") != NULL)) { char *ext = strrchr( param1, '.' );
if (!ext || !strcasecmp( ext, ".bat"))
{
if (SearchPath (NULL, param1, ".bat", sizeof(filetorun), filetorun, NULL)) { if (SearchPath (NULL, param1, ".bat", sizeof(filetorun), filetorun, NULL)) {
WCMD_batch (filetorun, command, 0); WCMD_batch (filetorun, command, 0);
return; return;
} }
} }
if ((strchr (param1, '.') == NULL) || (strstr (param1, ".cmd") != NULL)) { if (!ext || !strcasecmp( ext, ".cmd"))
{
if (SearchPath (NULL, param1, ".cmd", sizeof(filetorun), filetorun, NULL)) { if (SearchPath (NULL, param1, ".cmd", sizeof(filetorun), filetorun, NULL)) {
WCMD_batch (filetorun, command, 0); WCMD_batch (filetorun, command, 0);
return; return;
...@@ -496,12 +499,15 @@ char filetorun[MAX_PATH]; ...@@ -496,12 +499,15 @@ char filetorun[MAX_PATH];
} }
} }
else { /* Explicit path given */ else { /* Explicit path given */
if ((strstr (param1, ".bat") != NULL) || char *ext = strrchr( param1, '.' );
(strstr (param1, ".cmd") != NULL)) { if (ext && (!strcasecmp( ext, ".bat" ) || !strcasecmp( ext, ".cmd" )))
{
WCMD_batch (param1, command, 0); WCMD_batch (param1, command, 0);
return; return;
} }
if (strchr (param1, '.') == NULL) { if (strpbrk( ext, "/\\:" )) ext = NULL;
if (!ext)
{
strcpy (filetorun, param1); strcpy (filetorun, param1);
strcat (filetorun, ".bat"); strcat (filetorun, ".bat");
h = CreateFile (filetorun, GENERIC_READ, FILE_SHARE_READ, h = CreateFile (filetorun, GENERIC_READ, FILE_SHARE_READ,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment