From dc648e20834b359c835349b696ca1ffa86e5b3b2 Mon Sep 17 00:00:00 2001 From: Hartmut Birr Date: Sat, 30 Jul 2005 18:51:43 +0000 Subject: [PATCH] Use FileGetString instead of ReadFile, because ReadFile doesn't return a null terminated string. svn path=/trunk/; revision=16897 --- reactos/subsys/system/cmd/type.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/reactos/subsys/system/cmd/type.c b/reactos/subsys/system/cmd/type.c index 83f67999997..877bf4478ae 100644 --- a/reactos/subsys/system/cmd/type.c +++ b/reactos/subsys/system/cmd/type.c @@ -37,7 +37,6 @@ INT cmd_type (LPTSTR cmd, LPTSTR param) TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR buff[256]; HANDLE hFile, hConsoleOut; - DWORD dwRead; BOOL bRet; INT argc,i; LPTSTR *argv; @@ -105,21 +104,20 @@ INT cmd_type (LPTSTR cmd, LPTSTR param) do { - bRet = ReadFile(hFile,buff,sizeof(buff),&dwRead,NULL); - + bRet = FileGetString (hFile, buff, sizeof(buff) / sizeof(TCHAR)); if(bPaging) { - if(dwRead>0 && bRet) + if(bRet) ConOutPrintfPaging(bFirstTime, buff); } else { - if(dwRead>0 && bRet) + if(bRet) ConOutPrintf(buff); } bFirstTime = FALSE; - } while(dwRead>0 && bRet); + } while(bRet); CloseHandle(hFile); } -- 2.17.1