Use FileGetString instead of ReadFile, because ReadFile doesn't return a null termina...

[reactos.git] / reactos / subsys / system / cmd / free.c

diff --git a/reactos/subsys/system/cmd/free.c b/reactos/subsys/system/cmd/free.c
index be1b379..2eba7d1 100644 (file)
--- a/reactos/subsys/system/cmd/free.c
+++ b/reactos/subsys/system/cmd/free.c
@@ -8,10 +8,10 @@
  *        Started.
  *
  *    28-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
- *        Remove all hardcode string to En.rc  
+ *        Remove all hardcode string to En.rc
  */
 
-#include "precomp.h"
+#include <precomp.h>
 #include "resource.h"
 
 #ifdef INCLUDE_CMD_FREE
@@ -58,6 +58,7 @@ ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len)
 static VOID
 PrintDiskInfo (LPTSTR szDisk)
 {
+       TCHAR szMsg[RC_STRING_MAX_SIZE];
        TCHAR szRootPath[4] = _T("A:\\");
        TCHAR szDrive[2] = _T("A");
        TCHAR szVolume[64];
@@ -71,14 +72,11 @@ PrintDiskInfo (LPTSTR szDisk)
        DWORD dwBytPerSec;
        DWORD dwFreeCl;
        DWORD dwTotCl;
-       TCHAR szMsg[RC_STRING_MAX_SIZE];
 
        if (_tcslen (szDisk) < 2 || szDisk[1] != _T(':'))
        {
-               
-               LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));    
-               ConErrPrintf (szMsg);   
-               
+               LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+               ConErrPrintf(szMsg);
                return;
        }
 
@@ -88,16 +86,16 @@ PrintDiskInfo (LPTSTR szDisk)
        if (!GetVolumeInformation (szRootPath, szVolume, 64, &dwSerial,
                                   NULL, NULL, NULL, 0))
        {
-               LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));    
-               ConErrPrintf (_T("%s %s:\n"),szMsg, szDrive);
+               LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+               ConErrPrintf(_T("%s %s:\n"), szMsg, szDrive);
                return;
        }
 
        if (szVolume[0] == _T('\0'))
        {
-               
-               LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR));    
-               _tcscpy (szVolume,  szMsg);
+
+               LoadString(CMD_ModuleHandle, STRING_FREE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
+               _tcscpy (szVolume, szMsg);
        }
 
        _stprintf (szSerial,
@@ -108,8 +106,8 @@ PrintDiskInfo (LPTSTR szDisk)
        if (!GetDiskFreeSpace (szRootPath, &dwSecPerCl,
                               &dwBytPerSec, &dwFreeCl, &dwTotCl))
        {
-               LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));    
-               ConErrPrintf (_T("%s %s:\n"),szMsg, szDrive);           
+               LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+               ConErrPrintf (_T("%s %s:\n"), szMsg, szDrive);
                return;
        }
 
@@ -122,9 +120,9 @@ PrintDiskInfo (LPTSTR szDisk)
        uliSize.QuadPart = dwSecPerCl * dwBytPerSec * dwFreeCl;
        ConvertULargeInteger (uliSize, szFree, 40);
 
-       
-       LoadString( GetModuleHandle(NULL), STRING_FREE_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));    
-       ConOutPrintf (szMsg,szDrive, szVolume, szSerial,szTotal, szUsed, szFree);
+
+       LoadString(CMD_ModuleHandle, STRING_FREE_HELP1, szMsg, RC_STRING_MAX_SIZE);
+       ConOutPrintf(szMsg, szDrive, szVolume, szSerial, szTotal, szUsed, szFree);
 }
 
 
@@ -134,13 +132,10 @@ INT CommandFree (LPTSTR cmd, LPTSTR param)
        TCHAR  szDefPath[MAX_PATH];
        INT argc, i;
        LPTSTR *arg;
-       TCHAR szMsg[RC_STRING_MAX_SIZE];
 
        if (!_tcsncmp (param, _T("/?"), 2))
        {
-               LoadString( GetModuleHandle(NULL), STRING_FREE_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));    
-               ConOutPuts (szMsg);
-
+               ConOutResPaging(TRUE,STRING_FREE_HELP2);
                return 0;
        }