iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-08 06:14:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #235, erroric console output, status message overwrite

Browse Source 
using alternative message style
otherwise ncurses/terminal codes for cursor position would seem necessary

(cherry picked from commit 2d1a632910)
This commit is contained in:
Conor O'Gorman
2014-01-01 16:07:25 +00:00
committed by Alexey Sokolov
parent ee438955bc
commit 2d1042d479
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Utils.cpp
+5 -14
View File
@@ -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) {