From 937a0515a6a6b2d2d77c3a237f0b4addb7754357 Mon Sep 17 00:00:00 2001 From: Brandon Turner Date: Sun, 11 Dec 2005 05:34:11 +0000 Subject: [PATCH] Stop the footer from printing twice. fixes 1084. svn path=/trunk/; revision=20050 --- reactos/subsys/system/cmd/dir.c | 61 +++++++++++++-------------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/reactos/subsys/system/cmd/dir.c b/reactos/subsys/system/cmd/dir.c index 72398111f60..e8b0d76be9e 100644 --- a/reactos/subsys/system/cmd/dir.c +++ b/reactos/subsys/system/cmd/dir.c @@ -1138,46 +1138,33 @@ PrintSummary(LPTSTR szPath, /* 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);