cmd.exe: GOTO throws away any preloaded multi part/line command.

This commit is contained in:
Jason Edmeades 2007-06-15 20:59:22 +01:00 committed by Alexandre Julliard
parent 8f12d8bde3
commit 929a92f3c4
4 changed files with 7 additions and 4 deletions

View File

@ -97,7 +97,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN
/* If processing a call :label, 'goto' the label in question */
if (startLabel) {
strcpyW(param1, startLabel);
WCMD_goto();
WCMD_goto(NULL);
}
/*

View File

@ -686,10 +686,13 @@ void WCMD_give_help (WCHAR *command) {
* FIXME: DOS is supposed to allow labels with spaces - we don't.
*/
void WCMD_goto (void) {
void WCMD_goto (CMD_LIST **cmdList) {
WCHAR string[MAX_PATH];
/* Do not process any more parts of a processed multipart or multilines command */
*cmdList = NULL;
if (param1[0] == 0x00) {
WCMD_output (WCMD_LoadMessage(WCMD_NOARG));
return;

View File

@ -53,7 +53,7 @@ void WCMD_enter_paged_mode(const WCHAR *);
void WCMD_exit (void);
void WCMD_for (WCHAR *, CMD_LIST **cmdList);
void WCMD_give_help (WCHAR *command);
void WCMD_goto (void);
void WCMD_goto (CMD_LIST **cmdList);
void WCMD_if (WCHAR *, CMD_LIST **cmdList);
void WCMD_leave_paged_mode(void);
void WCMD_more (WCHAR *);

View File

@ -712,7 +712,7 @@ void WCMD_process_command (WCHAR *command, CMD_LIST **cmdList)
WCMD_for (p, cmdList);
break;
case WCMD_GOTO:
WCMD_goto ();
WCMD_goto (cmdList);
break;
case WCMD_HELP:
WCMD_give_help (p);