*
* 01-Sep-1999 (Eric Kohl)
* Started.
+ *
+ * 28-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
+ * Remove all hardcode string to En.rc
*/
-#include "precomp.h"
+#include <precomp.h>
+#include "resource.h"
#ifdef INCLUDE_CMD_FREE
static VOID
PrintDiskInfo (LPTSTR szDisk)
{
+ TCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR szRootPath[4] = _T("A:\\");
TCHAR szDrive[2] = _T("A");
TCHAR szVolume[64];
if (_tcslen (szDisk) < 2 || szDisk[1] != _T(':'))
{
- ConErrPrintf (_T("Invalid drive %s\n"), szDisk);
+ LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+ ConErrPrintf(szMsg);
return;
}
if (!GetVolumeInformation (szRootPath, szVolume, 64, &dwSerial,
NULL, NULL, NULL, 0))
{
- ConErrPrintf (_T("Invalid drive %s:\n"), 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'))
- _tcscpy (szVolume, _T("unlabeled"));
+ {
+
+ LoadString(CMD_ModuleHandle, STRING_FREE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
+ _tcscpy (szVolume, szMsg);
+ }
_stprintf (szSerial,
_T("%04X-%04X"),
if (!GetDiskFreeSpace (szRootPath, &dwSecPerCl,
&dwBytPerSec, &dwFreeCl, &dwTotCl))
{
- ConErrPrintf (_T("Invalid drive %s:\n"), szDrive);
+ LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
+ ConErrPrintf (_T("%s %s:\n"), szMsg, szDrive);
return;
}
uliSize.QuadPart = dwSecPerCl * dwBytPerSec * dwFreeCl;
ConvertULargeInteger (uliSize, szFree, 40);
- ConOutPrintf (_T("\n"
- " Volume in drive %s is %-11s Serial number is %s\n"
- " %16s bytes total disk space\n"
- " %16s bytes used\n"
- " %16s bytes free\n"),
- 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);
}
if (!_tcsncmp (param, _T("/?"), 2))
{
- ConOutPuts (_T("Displays drive information.\n"
- "\n"
- "FREE [drive: ...]"));
+ ConOutResPaging(TRUE,STRING_FREE_HELP2);
return 0;
}