[Box Backup-dev] COMMIT r431 - box/chris/win32/vc2005-compile-fixes/bin/bbackupquery

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-02-12 00:17:28 +0000 (Sun, 12 Feb 2006)
New Revision: 431

Modified:
   box/chris/win32/vc2005-compile-fixes/bin/bbackupquery/BackupQueries.cpp
Log:
* BackupQueries.cpp
- Fixed some remaining issues with using the wrong path separator on Win32


Modified: box/chris/win32/vc2005-compile-fixes/bin/bbackupquery/BackupQueries.cpp
===================================================================
--- box/chris/win32/vc2005-compile-fixes/bin/bbackupquery/BackupQueries.cpp	2006-02-11 23:54:36 UTC (rev 430)
+++ box/chris/win32/vc2005-compile-fixes/bin/bbackupquery/BackupQueries.cpp	2006-02-12 00:17:28 UTC (rev 431)
@@ -1121,7 +1121,7 @@
 		}
 				
 		// Then get it compared
-		Compare(std::string(DIRECTORY_SEPARATOR) + rLocation, 
+		Compare(std::string("/") + rLocation, 
 			loc.GetKeyValue("Path"), rParams);
 	}
 	catch(...)
@@ -1378,7 +1378,8 @@
 			if(local == localFiles.end())
 			{
 				// Not found -- report
-				printf("Local file '%s/%s' does not exist, "
+				printf("Local file '%s" DIRECTORY_SEPARATOR 
+					"%s' does not exist, "
 					"but store file '%s/%s' does.\n",
 					localName.c_str(), i->first.c_str(), 
 					storeName.c_str(), i->first.c_str());
@@ -1447,7 +1448,10 @@
 								true /* ignore attr mod time */,
 								fileOnServerStream->IsSymLink() /* ignore modification time if it's a symlink */))
 						{
-							printf("Local file '%s/%s' has different attributes to store file '%s/%s'.\n",
+							printf("Local file '%s"
+								DIRECTORY_SEPARATOR
+								"%s' has different attributes "
+								"to store file '%s/%s'.\n",
 								localName.c_str(), i->first.c_str(), storeName.c_str(), i->first.c_str());						
 							rParams.mDifferences ++;
 							if(modifiedAfterLastSync)
@@ -1512,7 +1516,10 @@
 					// Report if not equal.
 					if(!equal)
 					{
-						printf("Local file '%s/%s' has different contents to store file '%s/%s'.\n",
+						printf("Local file '%s"
+							DIRECTORY_SEPARATOR
+							"%s' has different contents "
+							"to store file '%s/%s'.\n",
 							localName.c_str(), i->first.c_str(), storeName.c_str(), i->first.c_str());
 						rParams.mDifferences ++;
 						if(modifiedAfterLastSync)
@@ -1553,8 +1560,9 @@
 			if(rParams.mpExcludeFiles == 0 || 
 				!(rParams.mpExcludeFiles->IsExcluded(localFileName)))
 			{
-				printf("Local file '%s/%s' exists, but "
-					"store file '%s/%s' does not exist.\n",
+				printf("Local file '%s" DIRECTORY_SEPARATOR
+					"%s' exists, but store file '%s/%s' "
+					"does not exist.\n",
 					localName.c_str(), (*i).c_str(), 
 					storeName.c_str(), (*i).c_str());
 				rParams.mDifferences ++;
@@ -1590,8 +1598,10 @@
 			if(local == localDirs.end())
 			{
 				// Not found -- report
-				printf("Local directory '%s/%s' does not exist, "
-					"but store directory '%s/%s' does.\n",
+				printf("Local directory '%s" 
+					DIRECTORY_SEPARATOR "%s' "
+					"does not exist, but store directory "
+					"'%s/%s' does.\n",
 					localName.c_str(), i->first.c_str(), 
 					storeName.c_str(), i->first.c_str());
 				rParams.mDifferences ++;