--- trunk/reactos/subsys/system/cmd/dir.c 2005-12-11 04:55:19 UTC (rev 20049)
+++ trunk/reactos/subsys/system/cmd/dir.c 2005-12-11 05:34:11 UTC (rev 20050)
@@ -1138,46 +1138,33 @@
/* Print recursive specific results */
/* Take this code offline to fix /S does not print duoble info */
- if (lpFlags->bRecursive)
- {
- ConvertULargeInteger(u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator);
+ if (lpFlags->bRecursive)
+ {
+ 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);
- if(lpFlags->bPause)
- ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer);
- else
- ConOutPrintf(szMsg,ulFiles, szBuffer);
-
- 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 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);
- }
-
- }
- 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 */
szRoot[0] = szPath[0];
GetUserDiskFreeSpace(szRoot, &uliFree);