Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove some hardcode buffer value. The dymatic buffer does not work yet, until all CMDLINE_LENGTH are remove.

Browse source 
svn path=/trunk/; revision=17631
This commit is contained in:
Magnus Olsen 2005-09-04 11:18:39 +00:00
parent 6561d0f414
commit a1b00983ed
4 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/subsys/system/cmd/bugs.txt
View file

@ -11,5 +11,12 @@ o command.com ignores control-c and control-break, which makes it difficult
o "alias v = dir" doesn't work because of the spaces. o "alias v = dir" doesn't work because of the spaces.
o Dymatic commandline buffer need to be implement, current set to 8192bytes
o Batchfile read row size need to be implement as dymatic not set to 2000bytes
**** Please report bugs to ekohl@rz-online.de! **** **** Please report bugs to ekohl@rz-online.de! ****

5
reactos/subsys/system/cmd/cmd.c
View file

@ -1037,12 +1037,13 @@ static INT
ProcessInput (BOOL bFlag) ProcessInput (BOOL bFlag)
{ {
TCHAR commandline[CMDLINE_LENGTH]; TCHAR commandline[CMDLINE_LENGTH];
TCHAR readline[CMDLINE_LENGTH]; TCHAR *readline = NULL;
LPTSTR tp = NULL; LPTSTR tp = NULL;
LPTSTR ip; LPTSTR ip;
LPTSTR cp; LPTSTR cp;
BOOL bEchoThisLine; BOOL bEchoThisLine;
readline = malloc(CMDLINE_LENGTH * sizeof(TCHAR));
do do
{ {
@ -1052,7 +1053,7 @@ ProcessInput (BOOL bFlag)
if (bFlag) if (bFlag)
return 0; return 0;
ReadCommand (readline, CMDLINE_LENGTH); readline = ReadCommand (readline, CMDLINE_LENGTH);
ip = readline; ip = readline;
bEchoThisLine = FALSE; bEchoThisLine = FALSE;
} }

2
reactos/subsys/system/cmd/cmd.h
View file

@ -106,7 +106,7 @@ extern HANDLE CMD_ModuleHandle;
/* Prototypes for CMDINPUT.C */ /* Prototypes for CMDINPUT.C */
VOID ReadCommand (LPTSTR, INT); TCHAR * ReadCommand (LPTSTR, INT);
/* Prototypes for CMDTABLE.C */ /* Prototypes for CMDTABLE.C */

17
reactos/subsys/system/cmd/cmdinput.c
View file

@ -124,7 +124,7 @@ ClearCommandLine (LPTSTR str, INT maxlen, SHORT orgx, SHORT orgy)
/* read in a command line */ /* read in a command line */
VOID ReadCommand (LPTSTR str, INT maxlen) TCHAR * ReadCommand (LPTSTR str, INT maxlen)
{ {
SHORT orgx; /* origin x/y */ SHORT orgx; /* origin x/y */
SHORT orgy; SHORT orgy;
@ -508,10 +508,15 @@ VOID ReadCommand (LPTSTR str, INT maxlen)
default: default:
#ifdef _UNICODE #ifdef _UNICODE
ch = ir.Event.KeyEvent.uChar.UnicodeChar; ch = ir.Event.KeyEvent.uChar.UnicodeChar;
if ((ch >= 32 && ch <= 255) && (charcount != (maxlen - 2))) charcount ++;
str = realloc(str, charcount);
if ((ch >= 32 && ch <= 255))
#else #else
ch = ir.Event.KeyEvent.uChar.AsciiChar; ch = ir.Event.KeyEvent.uChar.AsciiChar;
if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2))) str = realloc(str, 2 + current * sizeof(TCHAR));
if ((UCHAR)ch >= 32 )
#endif /* _UNICODE */ #endif /* _UNICODE */
{ {
/* insert character into string... */ /* insert character into string... */
@ -520,6 +525,8 @@ VOID ReadCommand (LPTSTR str, INT maxlen)
/* If this character insertion will cause screen scrolling, /* If this character insertion will cause screen scrolling,
* adjust the saved origin of the command prompt. */ * adjust the saved origin of the command prompt. */
tempscreen = _tcslen(str + current) + curx; tempscreen = _tcslen(str + current) + curx;
str = realloc(str, tempscreen * sizeof(TCHAR));
if ((tempscreen % maxx) == (maxx - 1) && if ((tempscreen % maxx) == (maxx - 1) &&
(tempscreen / maxx) + cury == (maxy - 1)) (tempscreen / maxx) + cury == (maxy - 1))
{ {
@ -527,6 +534,8 @@ VOID ReadCommand (LPTSTR str, INT maxlen)
cury--; cury--;
} }
for (count = charcount; count > current; count--) for (count = charcount; count > current; count--)
str[count] = str[count - 1]; str[count] = str[count - 1];
str[current++] = ch; str[current++] = ch;
@ -570,4 +579,6 @@ VOID ReadCommand (LPTSTR str, INT maxlen)
while (ir.Event.KeyEvent.wVirtualKeyCode != VK_RETURN); while (ir.Event.KeyEvent.wVirtualKeyCode != VK_RETURN);
SetCursorType (bInsert, TRUE); SetCursorType (bInsert, TRUE);
return str;
} }