ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wcmd: CALL should search the current PATH.

This commit is contained in:
Rein Klazes 2006-02-06 14:11:40 +01:00 committed by Alexandre Julliard
parent e66e227dbe
commit 8c540ba674
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/wcmd/batch.c
View File

@ -69,7 +69,7 @@ BATCH_CONTEXT *prev_context;
h = CreateFile (string, GENERIC_READ, FILE_SHARE_READ, h = CreateFile (string, GENERIC_READ, FILE_SHARE_READ,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (h != INVALID_HANDLE_VALUE) { if (h != INVALID_HANDLE_VALUE) {
WCMD_run_program (command); WCMD_run_program (command, 0);
} else { } else {
SetLastError (ERROR_FILE_NOT_FOUND); SetLastError (ERROR_FILE_NOT_FOUND);
WCMD_print_error (); WCMD_print_error ();

2
programs/wcmd/wcmd.h
View File

@ -53,7 +53,7 @@ void WCMD_process_command (char *command);
int WCMD_read_console (char *string, int str_len); int WCMD_read_console (char *string, int str_len);
void WCMD_remove_dir (void); void WCMD_remove_dir (void);
void WCMD_rename (void); void WCMD_rename (void);
void WCMD_run_program (char *command); void WCMD_run_program (char *command, int called);
void WCMD_setlocal (const char *command); void WCMD_setlocal (const char *command);
void WCMD_setshow_attrib (void); void WCMD_setshow_attrib (void);
void WCMD_setshow_date (void); void WCMD_setshow_date (void);

17
programs/wcmd/wcmdmain.c
View File

@ -359,7 +359,7 @@ void WCMD_process_command (char *command)
WCMD_setshow_attrib (); WCMD_setshow_attrib ();
break; break;
case WCMD_CALL: case WCMD_CALL:
WCMD_batch (param1, p, 1); WCMD_run_program (p, 1);
break; break;
case WCMD_CD: case WCMD_CD:
case WCMD_CHDIR: case WCMD_CHDIR:
@ -462,7 +462,7 @@ void WCMD_process_command (char *command)
case WCMD_EXIT: case WCMD_EXIT:
ExitProcess (0); ExitProcess (0);
default: default:
WCMD_run_program (whichcmd); WCMD_run_program (whichcmd, 0);
} }
HeapFree( GetProcessHeap(), 0, cmd ); HeapFree( GetProcessHeap(), 0, cmd );
if (old_stdin != INVALID_HANDLE_VALUE) { if (old_stdin != INVALID_HANDLE_VALUE) {
@ -532,11 +532,14 @@ static void init_msvcrt_io_block(STARTUPINFO* st)
* *
* Execute a command line as an external program. If no extension given then * Execute a command line as an external program. If no extension given then
* precedence is given to .BAT files. Must allow recursion. * precedence is given to .BAT files. Must allow recursion.
*
* called is 1 if the program was invoked with a CALL command - removed
* from command -. It is only used for batch programs.
* *
* FIXME: Case sensitivity in suffixes! * FIXME: Case sensitivity in suffixes!
*/ */
void WCMD_run_program (char *command) { void WCMD_run_program (char *command, int called) {
STARTUPINFO st; STARTUPINFO st;
PROCESS_INFORMATION pe; PROCESS_INFORMATION pe;
@ -555,14 +558,14 @@ char filetorun[MAX_PATH];
if (!ext || !strcasecmp( ext, ".bat")) 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, called);
return; return;
} }
} }
if (!ext || !strcasecmp( ext, ".cmd")) 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, called);
return; return;
} }
} }
@ -571,7 +574,7 @@ char filetorun[MAX_PATH];
char *ext = strrchr( param1, '.' ); char *ext = strrchr( param1, '.' );
if (ext && (!strcasecmp( ext, ".bat" ) || !strcasecmp( ext, ".cmd" ))) if (ext && (!strcasecmp( ext, ".bat" ) || !strcasecmp( ext, ".cmd" )))
{ {
WCMD_batch (param1, command, 0); WCMD_batch (param1, command, called);
return; return;
} }
@ -584,7 +587,7 @@ char filetorun[MAX_PATH];
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (h != INVALID_HANDLE_VALUE) { if (h != INVALID_HANDLE_VALUE) {
CloseHandle (h); CloseHandle (h);
WCMD_batch (param1, command, 0); WCMD_batch (param1, command, called);
return; return;
} }
} }