Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 02:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't overwrite terminating \0 char

Browse source 
some code cleanup

svn path=/trunk/; revision=32083
This commit is contained in:
Christoph von Wittich 2008-02-02 10:38:37 +00:00
parent ddf20ad13d
commit 9b8be30ee9
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/shell/cmd/cmd.c
View file

@ -1465,7 +1465,7 @@ ProcessInput (BOOL bFlag)
} }
} }
if (_istcntrl (*ip)) if (*ip != _T('\0') && (_istcntrl (*ip)))
*ip = _T(' '); *ip = _T(' ');
*cp++ = *ip++; *cp++ = *ip++;

5
reactos/base/shell/cmd/misc.c
View file

@ -454,13 +454,12 @@ BOOL FileGetString (HANDLE hFile, LPTSTR lpBuffer, INT nBufferLength)
LPSTR lpString; LPSTR lpString;
CHAR ch; CHAR ch;
DWORD dwRead; DWORD dwRead;
INT len; INT len = 0;
#ifdef _UNICODE #ifdef _UNICODE
lpString = cmd_alloc(nBufferLength); lpString = cmd_alloc(nBufferLength);
#else #else
lpString = lpBuffer; lpString = lpBuffer;
#endif #endif
len = 0;
while ((--nBufferLength > 0) && while ((--nBufferLength > 0) &&
ReadFile(hFile, &ch, 1, &dwRead, NULL) && dwRead) ReadFile(hFile, &ch, 1, &dwRead, NULL) && dwRead)
{ {
@ -482,7 +481,7 @@ BOOL FileGetString (HANDLE hFile, LPTSTR lpBuffer, INT nBufferLength)
lpString[len++] = _T('\0'); lpString[len++] = _T('\0');
#ifdef _UNICODE #ifdef _UNICODE
MultiByteToWideChar(CP_ACP, 0, lpString, len, lpBuffer, len); MultiByteToWideChar(CP_ACP, 0, lpString, -1, lpBuffer, len);
cmd_free(lpString); cmd_free(lpString);
#endif #endif
return TRUE; return TRUE;