Improve logging with macros that consistently output strerror(errno) and

errno, replacing almost all use of strerror() in the main code.

Log a more detailed error message before throwing an exception for some
more system call failures.

Make FileStream store its filename on all platforms, not just Windows.

Wrap some long lines at less than 80 characters to improve readability.

Fix some minor violations of coding standard (white space) and a typo
in a comment.

5 files changed, 26 insertions, 29 deletions

diff --git a/bin/bbackupd/BackupClientContext.cpp b/bin/bbackupd/BackupClientContext.cpp
index 4b4efd90..fd9ff5df 100644
--- a/bin/bbackupd/BackupClientContext.cpp
+++ b/bin/bbackupd/BackupClientContext.cpp
@@ -146,8 +146,8 @@ BackupProtocolClient &BackupClientContext::GetConnection()
 
 			if (!mpExtendedLogFileHandle)
 			{
-				BOX_ERROR("Failed to open extended log "
-					"file: " << strerror(errno));
+				BOX_LOG_SYS_ERROR("Failed to open extended "
+					"log file: " << mExtendedLogFile);
 			}
 			else
 			{
diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp
index 059cda38..1446c7a8 100644
--- a/bin/bbackupd/BackupDaemon.cpp
+++ b/bin/bbackupd/BackupDaemon.cpp
@@ -1812,10 +1812,9 @@ void BackupDaemon::SetupLocations(BackupClientContext &rClientContext, const Con
 				if(::statfs(apLoc->mPath.c_str(), &s) != 0)
 #endif // HAVE_STRUCT_STATVFS_F_MNTONNAME
 				{
-					BOX_WARNING("Failed to stat location "
+					BOX_LOG_SYS_WARNING("Failed to stat location "
 						"path '" << apLoc->mPath <<
-						"' (" << strerror(errno) <<
-						"), skipping location '" <<
+						"', skipping location '" <<
 						apLoc->mName << "'");
 					continue;
 				}
@@ -2189,9 +2188,8 @@ void BackupDaemon::CommitIDMapsAfterSync()
 #endif
 		if(::rename(newmap.c_str(), target.c_str()) != 0)
 		{
-			BOX_ERROR("failed to rename ID map: " << newmap
-				<< " to " << target << ": " 
-				<< strerror(errno));
+			BOX_LOG_SYS_ERROR("Failed to rename ID map: " <<
+				newmap << " to " << target);
 			THROW_EXCEPTION(CommonException, OSFileError)
 		}
 	}
@@ -3055,9 +3053,10 @@ bool BackupDaemon::DeleteStoreObjectInfo() const
 	// Check to see if the file exists
 	if(!FileExists(storeObjectInfoFile.c_str()))
 	{
-		// File doesn't exist -- so can't be deleted. But something isn't quite right, so log a message
-		BOX_WARNING("Store object info file did not exist when it "
-			"was supposed to. (" << storeObjectInfoFile << ")");
+		// File doesn't exist -- so can't be deleted. But something
+		// isn't quite right, so log a message
+		BOX_WARNING("StoreObjectInfoFile did not exist when it "
+			"was supposed to: " << storeObjectInfoFile);
 
 		// Return true to stop things going around in a loop
 		return true;
@@ -3066,8 +3065,8 @@ bool BackupDaemon::DeleteStoreObjectInfo() const
 	// Actually delete it
 	if(::unlink(storeObjectInfoFile.c_str()) != 0)
 	{
-		BOX_ERROR("Failed to delete the old store object info file: "
-			<< storeObjectInfoFile << ": "<< strerror(errno));
+		BOX_LOG_SYS_ERROR("Failed to delete the old "
+			"StoreObjectInfoFile: " << storeObjectInfoFile);
 		return false;
 	}
 
diff --git a/bin/bbackupd/Win32ServiceFunctions.cpp b/bin/bbackupd/Win32ServiceFunctions.cpp
index a7bf6bd9..53be3bc7 100644
--- a/bin/bbackupd/Win32ServiceFunctions.cpp
+++ b/bin/bbackupd/Win32ServiceFunctions.cpp
@@ -207,8 +207,8 @@ int InstallService(const char* pConfigFileName, const std::string& rServiceName)
 
 		if (emu_stat(pConfigFileName, &st) != 0)
 		{
-			BOX_ERROR("Failed to open configuration file '" <<
-				pConfigFileName << "': " << strerror(errno));
+			BOX_LOG_SYS_ERROR("Failed to open configuration file "
+				"'" << pConfigFileName << "'");
 			return 1;
 		}
 
@@ -221,7 +221,7 @@ int InstallService(const char* pConfigFileName, const std::string& rServiceName)
 		}
 	}
 
-	SC_HANDLE scm = OpenSCManager(0,0,SC_MANAGER_CREATE_SERVICE);
+	SC_HANDLE scm = OpenSCManager(0, 0, SC_MANAGER_CREATE_SERVICE);
 
 	if (!scm) 
 	{
diff --git a/bin/bbackupquery/BackupQueries.cpp b/bin/bbackupquery/BackupQueries.cpp
index b6984641..197cd3b7 100644
--- a/bin/bbackupquery/BackupQueries.cpp
+++ b/bin/bbackupquery/BackupQueries.cpp
@@ -810,8 +810,8 @@ void BackupQueries::CommandChangeLocalDir(const std::vector<std::string> &args)
 		}
 		else
 		{
-			BOX_ERROR("Error changing to directory '" <<
-				args[0] << ": " << strerror(errno));
+			BOX_LOG_SYS_ERROR("Failed to change to directory "
+				"'" << args[0] << "'");
 		}
 
 		SetReturnCode(COMMAND_RETURN_ERROR);
@@ -822,8 +822,7 @@ void BackupQueries::CommandChangeLocalDir(const std::vector<std::string> &args)
 	char wd[PATH_MAX];
 	if(::getcwd(wd, PATH_MAX) == 0)
 	{
-		BOX_ERROR("Error getting current directory: " <<
-			strerror(errno));
+		BOX_LOG_SYS_ERROR("Error getting current directory");
 		SetReturnCode(COMMAND_RETURN_ERROR);
 		return;
 	}
@@ -1399,9 +1398,8 @@ void BackupQueries::Compare(int64_t DirID, const std::string &rStoreDir, const s
 		}
 		else
 		{
-			BOX_WARNING("Failed to access local directory '" <<
-				localDirDisplay << ": " << strerror(errno) <<
-				"'.");
+			BOX_LOG_SYS_WARNING("Failed to access local directory "
+				"'" << localDirDisplay << "'");
 			rParams.mUncheckedFiles ++;
 		}
 		return;
@@ -1449,8 +1447,8 @@ void BackupQueries::Compare(int64_t DirID, const std::string &rStoreDir, const s
 	DIR *dirhandle = ::opendir(rLocalDir.c_str());
 	if(dirhandle == 0)
 	{
-		BOX_WARNING("Failed to open local directory '" << 
-			localDirDisplay << "': " << strerror(errno));
+		BOX_LOG_SYS_WARNING("Failed to open local directory '" << 
+			localDirDisplay << "'");
 		rParams.mUncheckedFiles ++;
 		return;
 	}
@@ -1518,8 +1516,8 @@ void BackupQueries::Compare(int64_t DirID, const std::string &rStoreDir, const s
 		// Close directory
 		if(::closedir(dirhandle) != 0)
 		{
-			BOX_ERROR("Failed to close local directory '" <<
-				localDirDisplay << "': " << strerror(errno));
+			BOX_LOG_SYS_ERROR("Failed to close local directory "
+				"'" << localDirDisplay << "'");
 		}
 		dirhandle = 0;
 	
diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp
index 4b97409f..342969c2 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_ERROR("Failed to open log file '" <<
-					optarg << "': " << strerror(errno));
+				BOX_LOG_SYS_ERROR("Failed to open log file "
+					"'" << optarg << "'");
 			}
 			break;