ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +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
Download Patch File Download Diff File Expand all files Collapse all files
reactos/base/shell/cmd/cmd.c
+1 -1
View File
@@ -1465,7 +1465,7 @@ ProcessInput (BOOL bFlag)
}
}
if (_istcntrl (*ip))
if (*ip != _T('\0') && (_istcntrl (*ip)))
*ip = _T(' ');
*cp++ = *ip++;
reactos/base/shell/cmd/misc.c
+2 -3
View File
@@ -454,13 +454,12 @@ BOOL FileGetString (HANDLE hFile, LPTSTR lpBuffer, INT nBufferLength)
LPSTR lpString;
CHAR ch;
DWORD dwRead;
INT len;
INT len = 0;
#ifdef _UNICODE
lpString = cmd_alloc(nBufferLength);
#else
lpString = lpBuffer;
#endif
len = 0;
while ((--nBufferLength > 0) &&
ReadFile(hFile, &ch, 1, &dwRead, NULL) && dwRead)
{
@@ -482,7 +481,7 @@ BOOL FileGetString (HANDLE hFile, LPTSTR lpBuffer, INT nBufferLength)
lpString[len++] = _T('\0');
#ifdef _UNICODE
MultiByteToWideChar(CP_ACP, 0, lpString, len, lpBuffer, len);
MultiByteToWideChar(CP_ACP, 0, lpString, -1, lpBuffer, len);
cmd_free(lpString);
#endif
return TRUE;