From 2d1042d4792eea2166e13eff7d3a20df2432515c Mon Sep 17 00:00:00 2001 From: Conor O'Gorman Date: Wed, 1 Jan 2014 16:07:25 +0000 Subject: [PATCH] fix #235, erroric console output, status message overwrite using alternative message style otherwise ncurses/terminal codes for cursor position would seem necessary (cherry picked from commit 2d1a63291092d26b35ad047fc6d7d6721f8b840c) --- src/Utils.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/Utils.cpp b/src/Utils.cpp index 5ecc0aa5..00205c92 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -306,7 +306,7 @@ void CUtils::PrintMessage(const CString& sMessage, bool bStrong) { void CUtils::PrintAction(const CString& sMessage) { if (CDebug::StdoutIsTTY()) - fprintf(stdout, "\033[1m\033[34m[\033[32m \033[34m]\033[39m\033[22m %s... ", sMessage.c_str()); + fprintf(stdout, "\033[1m\033[34m[ .. \033[34m]\033[39m\033[22m %s...\n", sMessage.c_str()); else fprintf(stdout, "%s... ", sMessage.c_str()); fflush(stdout); @@ -314,21 +314,12 @@ void CUtils::PrintAction(const CString& sMessage) { void CUtils::PrintStatus(bool bSuccess, const CString& sMessage) { if (CDebug::StdoutIsTTY()) { - if (!sMessage.empty()) { - if (bSuccess) { - fprintf(stdout, "%s", sMessage.c_str()); - } else { - fprintf(stdout, "\033[1m\033[34m[\033[31m %s \033[34m]" - "\033[39m\033[22m", sMessage.c_str()); - } - } - - fprintf(stdout, "\r"); - if (bSuccess) { - fprintf(stdout, "\033[1m\033[34m[\033[32m ok \033[34m]\033[39m\033[22m\n"); + fprintf(stdout, "\033[1m\033[34m[\033[32m ok \033[34m]\033[39m\033[22m"); + fprintf(stdout, " %s\n", sMessage.empty() ? "ok" : sMessage.c_str()); } else { - fprintf(stdout, "\033[1m\033[34m[\033[31m !! \033[34m]\033[39m\033[22m\n"); + fprintf(stdout, "\033[1m\033[34m[\033[31m !! \033[34m]\033[39m\033[22m"); + fprintf(stdout, "\033[1m\033[31m %s\n", sMessage.empty() ? "failed" : sMessage.c_str()); } } else { if (bSuccess) {