Stop the footer from printing twice. fixes 1084.

svn path=/trunk/; revision=20050
This commit is contained in:
Brandon Turner 2005-12-11 05:34:11 +00:00
parent ff142af4a5
commit 937a0515a6

View file

@ -1138,46 +1138,33 @@ PrintSummary(LPTSTR szPath,
/* Print recursive specific results */ /* Print recursive specific results */
/* Take this code offline to fix /S does not print duoble info */ /* Take this code offline to fix /S does not print duoble info */
if (lpFlags->bRecursive) if (lpFlags->bRecursive)
{ {
ConvertULargeInteger(u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); ConvertULargeInteger(u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator);
LoadString(CMD_ModuleHandle, STRING_DIR_HELP5, szMsg, RC_STRING_MAX_SIZE);
if(lpFlags->bPause)
ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer);
else
ConOutPrintf(szMsg,ulFiles, szBuffer);
}
else
{
LoadString(CMD_ModuleHandle, STRING_DIR_HELP5, szMsg, RC_STRING_MAX_SIZE); /* Print File Summary */
if(lpFlags->bPause) /* Condition to print summary is:
ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer); If we are not in bare format and if we have results! */
else if (ulFiles > 0)
ConOutPrintf(szMsg,ulFiles, szBuffer); {
ConvertULargeInteger(u64Bytes, szBuffer, 20, lpFlags->bTSeperator);
if (ulFiles > 0) LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE);
{ if(lpFlags->bPause)
ConvertULargeInteger(u64Bytes, szBuffer, 20, lpFlags->bTSeperator); ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer);
LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE); else
if(lpFlags->bPause) ConOutPrintf(szMsg,ulFiles, szBuffer);
ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer);
else
ConOutPrintf(szMsg,ulFiles, szBuffer);
} }
}
else
{
/* Print File Summary */
/* Condition to print summary is:
If we are not in bare format and if we have results! */
if (ulFiles > 0)
{
ConvertULargeInteger(u64Bytes, szBuffer, 20, lpFlags->bTSeperator);
LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE);
if(lpFlags->bPause)
ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer);
else
ConOutPrintf(szMsg,ulFiles, szBuffer);
} }
}
/* Print total directories and freespace */ /* Print total directories and freespace */
szRoot[0] = szPath[0]; szRoot[0] = szPath[0];
GetUserDiskFreeSpace(szRoot, &uliFree); GetUserDiskFreeSpace(szRoot, &uliFree);