lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-05-23 07:40:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[CMD] Improve how the command prompt displays when one presses Ctrl-C/break after having pressed ENTER, or after a command has been run.

Browse Source
This commit is contained in:
Hermès Bélusca-Maïto
2018-04-29 00:57:16 +02:00
parent a3b36f8d3e
commit 03c233bcd0
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
base/shell/cmd/cmd.c
View File

@@ -1418,16 +1418,14 @@ ReadLine(TCHAR *commandline, BOOL bMore)
return FALSE;
}
if (CheckCtrlBreak(BREAK_INPUT))
{
if (readline[0] == _T('\0'))
ConOutChar(_T('\n'));
if (CheckCtrlBreak(BREAK_INPUT))
return FALSE;
}
if (readline[0] == _T('\0'))
{
return FALSE;
}
ip = readline;
}

10
base/shell/cmd/cmdinput.c
View File

@@ -453,8 +453,14 @@ BOOL ReadCommand(LPTSTR str, INT maxlen)
if ((ir.Event.KeyEvent.dwControlKeyState &
(RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED)))
{
/* A CTRL-C. Don't clear the the command line,
* but return an empty string in str. */
/* Ignore the Ctrl-C key event if it has already been handled */
if (!bCtrlBreak)
break;
/*
* A Ctrl-C. Do not clear the command line,
* but return an empty string in str.
*/
str[0] = _T('\0');
curx = orgx;
cury = orgy;