From 3661f3624acc46590d5504fda4f8714255fb2c8e Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Fri, 4 Apr 2008 21:59:29 +0000
Subject: Tailorization Import of the upstream sources from  Repository:
 http://localhost:8000/        Kind: hg    Revision:
 7807b7768163f1c2537756abe5416063989cebb1

Original author: tailor@rocio.int.aidworld.org
Date: 2008-03-16 19:44:36+00:00
---
 bin/bbackupquery/BackupQueries.cpp | 41 +++++++++++++++++++++++++-------------
 bin/bbackupquery/bbackupquery.cpp  |  8 +++-----
 2 files changed, 30 insertions(+), 19 deletions(-)

(limited to 'bin/bbackupquery')

diff --git a/bin/bbackupquery/BackupQueries.cpp b/bin/bbackupquery/BackupQueries.cpp
index 0faa4770..b6984641 100644
--- a/bin/bbackupquery/BackupQueries.cpp
+++ b/bin/bbackupquery/BackupQueries.cpp
@@ -27,8 +27,6 @@
 
 #include <set>
 #include <limits>
-#include <iostream>
-#include <ostream>
 
 #include "BackupQueries.h"
 #include "Utils.h"
@@ -812,8 +810,8 @@ void BackupQueries::CommandChangeLocalDir(const std::vector<std::string> &args)
 		}
 		else
 		{
-			BOX_LOG_SYS_ERROR("Failed to change to directory "
-				"'" << args[0] << "'");
+			BOX_ERROR("Error changing to directory '" <<
+				args[0] << ": " << strerror(errno));
 		}
 
 		SetReturnCode(COMMAND_RETURN_ERROR);
@@ -824,7 +822,8 @@ void BackupQueries::CommandChangeLocalDir(const std::vector<std::string> &args)
 	char wd[PATH_MAX];
 	if(::getcwd(wd, PATH_MAX) == 0)
 	{
-		BOX_LOG_SYS_ERROR("Error getting current directory");
+		BOX_ERROR("Error getting current directory: " <<
+			strerror(errno));
 		SetReturnCode(COMMAND_RETURN_ERROR);
 		return;
 	}
@@ -1400,8 +1399,9 @@ void BackupQueries::Compare(int64_t DirID, const std::string &rStoreDir, const s
 		}
 		else
 		{
-			BOX_LOG_SYS_WARNING("Failed to access local directory "
-				"'" << localDirDisplay << "'");
+			BOX_WARNING("Failed to access local directory '" <<
+				localDirDisplay << ": " << strerror(errno) <<
+				"'.");
 			rParams.mUncheckedFiles ++;
 		}
 		return;
@@ -1449,8 +1449,8 @@ void BackupQueries::Compare(int64_t DirID, const std::string &rStoreDir, const s
 	DIR *dirhandle = ::opendir(rLocalDir.c_str());
 	if(dirhandle == 0)
 	{
-		BOX_LOG_SYS_WARNING("Failed to open local directory '" << 
-			localDirDisplay << "'");
+		BOX_WARNING("Failed to open local directory '" << 
+			localDirDisplay << "': " << strerror(errno));
 		rParams.mUncheckedFiles ++;
 		return;
 	}
@@ -1518,8 +1518,8 @@ void BackupQueries::Compare(int64_t DirID, const std::string &rStoreDir, const s
 		// Close directory
 		if(::closedir(dirhandle) != 0)
 		{
-			BOX_LOG_SYS_ERROR("Failed to close local directory "
-				"'" << localDirDisplay << "'");
+			BOX_ERROR("Failed to close local directory '" <<
+				localDirDisplay << "': " << strerror(errno));
 		}
 		dirhandle = 0;
 	
@@ -2158,9 +2158,22 @@ void BackupQueries::CommandUsage()
 // --------------------------------------------------------------------------
 void BackupQueries::CommandUsageDisplayEntry(const char *Name, int64_t Size, int64_t HardLimit, int32_t BlockSize)
 {
-	std::cout << FormatUsageLineStart(Name) <<
-		FormatUsageBar(Size, Size * BlockSize, HardLimit * BlockSize) <<
-		std::endl;
+	// Calculate size in Mb
+	double mb = (((double)Size) * ((double)BlockSize)) / ((double)(1024*1024));
+	int64_t percent = (Size * 100) / HardLimit;
+
+	// Bar graph
+	char bar[41];
+	unsigned int b = (int)((Size * (sizeof(bar)-1)) / HardLimit);
+	if(b > sizeof(bar)-1) {b = sizeof(bar)-1;}
+	for(unsigned int l = 0; l < b; l++)
+	{
+		bar[l] = '*';
+	}
+	bar[b] = '\0';
+
+	// Print the entryj
+	::printf("%14s %10.1fMb %3d%% %s\n", Name, mb, (int32_t)percent, bar);
 }
 
 
diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp
index b38821c1..4b97409f 100644
--- a/bin/bbackupquery/bbackupquery.cpp
+++ b/bin/bbackupquery/bbackupquery.cpp
@@ -174,8 +174,8 @@ int main(int argc, const char *argv[])
 			logFile = ::fopen(optarg, "w");
 			if(logFile == 0)
 			{
-				BOX_LOG_SYS_ERROR("Failed to open log file "
-					"'" << optarg << "'");
+				BOX_ERROR("Failed to open log file '" <<
+					optarg << "': " << strerror(errno));
 			}
 			break;
 
@@ -260,9 +260,7 @@ int main(int argc, const char *argv[])
 	// 2. Connect to server
 	if(!quiet) BOX_INFO("Connecting to store...");
 	SocketStreamTLS socket;
-	socket.Open(tlsContext, Socket::TypeINET,
-		conf.GetKeyValue("StoreHostname").c_str(),
-		conf.GetKeyValueInt("StorePort"));
+	socket.Open(tlsContext, Socket::TypeINET, conf.GetKeyValue("StoreHostname").c_str(), BOX_PORT_BBSTORED);
 	
 	// 3. Make a protocol, and handshake
 	if(!quiet) BOX_INFO("Handshake with store...");
-- 
cgit v1.2.3