import version 0.11rc1

This commit has been made by 'bzr import'. I used the upstream tarball
of Version 0.11rc1 for creating it. It has the md5sum:

75608d8bb72dff9a556850ccd0ae8cb9

14 files changed, 106 insertions, 64 deletions

diff --git a/lib/backupstore/BackupStoreAccountDatabase.cpp b/lib/backupstore/BackupStoreAccountDatabase.cpp
index 8e276ba2..59067ad0 100644
--- a/lib/backupstore/BackupStoreAccountDatabase.cpp
+++ b/lib/backupstore/BackupStoreAccountDatabase.cpp
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
diff --git a/lib/backupstore/BackupStoreAccountDatabase.h b/lib/backupstore/BackupStoreAccountDatabase.h
index 212a2838..2a9ab519 100644
--- a/lib/backupstore/BackupStoreAccountDatabase.h
+++ b/lib/backupstore/BackupStoreAccountDatabase.h
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
diff --git a/lib/backupstore/BackupStoreAccounts.cpp b/lib/backupstore/BackupStoreAccounts.cpp
index 1b82a580..135a2835 100644
--- a/lib/backupstore/BackupStoreAccounts.cpp
+++ b/lib/backupstore/BackupStoreAccounts.cpp
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
@@ -179,8 +179,9 @@ void BackupStoreAccounts::GetAccountRoot(int32_t ID, std::string &rRootDirOut, i
 std::string BackupStoreAccounts::MakeAccountRootDir(int32_t ID, int DiscSet) const
 {
 	char accid[64];	// big enough!
-	::sprintf(accid, "%08x/", ID);
-	return std::string(std::string(BOX_RAIDFILE_ROOT_BBSTORED DIRECTORY_SEPARATOR) + accid);
+	::sprintf(accid, "%08x" DIRECTORY_SEPARATOR, ID);
+	return std::string(std::string(BOX_RAIDFILE_ROOT_BBSTORED 
+		DIRECTORY_SEPARATOR) + accid);
 }
 
 
diff --git a/lib/backupstore/BackupStoreAccounts.h b/lib/backupstore/BackupStoreAccounts.h
index dee48148..2ee1198c 100644
--- a/lib/backupstore/BackupStoreAccounts.h
+++ b/lib/backupstore/BackupStoreAccounts.h
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
diff --git a/lib/backupstore/BackupStoreCheck.cpp b/lib/backupstore/BackupStoreCheck.cpp
index af849c40..61895e2f 100644
--- a/lib/backupstore/BackupStoreCheck.cpp
+++ b/lib/backupstore/BackupStoreCheck.cpp
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
@@ -140,7 +140,7 @@ void BackupStoreCheck::Check()
 			// Couldn't lock the account -- just stop now
 			if(!mQuiet)
 			{
-				::printf("Couldn't lock the account -- did not check.\nTry again later after the client has disconnected.\nAlternatively, forcibly kill the server.\n");
+				BOX_ERROR("Failed to lock the account -- did not check.\nTry again later after the client has disconnected.\nAlternatively, forcibly kill the server.");
 			}
 			THROW_EXCEPTION(BackupStoreException, CouldNotLockStoreAccount)
 		}
@@ -148,41 +148,43 @@ void BackupStoreCheck::Check()
 
 	if(!mQuiet && mFixErrors)
 	{
-		::printf("NOTE: Will fix errors encountered during checking.\n");
+		BOX_NOTICE("Will fix errors encountered during checking.");
 	}
 
 	// Phase 1, check objects
 	if(!mQuiet)
 	{
-		::printf("Check store account ID %08x\nPhase 1, check objects...\n", mAccountID);
+		BOX_INFO("Checking store account ID " <<
+			BOX_FORMAT_ACCOUNT(mAccountID) << "...");
+		BOX_INFO("Phase 1, check objects...");
 	}
 	CheckObjects();
 	
 	// Phase 2, check directories
 	if(!mQuiet)
 	{
-		::printf("Phase 2, check directories...\n");
+		BOX_INFO("Phase 2, check directories...");
 	}
 	CheckDirectories();
 	
 	// Phase 3, check root
 	if(!mQuiet)
 	{
-		::printf("Phase 3, check root...\n");
+		BOX_INFO("Phase 3, check root...");
 	}
 	CheckRoot();
 
 	// Phase 4, check unattached objects
 	if(!mQuiet)
 	{
-		::printf("Phase 4, fix unattached objects...\n");
+		BOX_INFO("Phase 4, fix unattached objects...");
 	}
 	CheckUnattachedObjects();
 
 	// Phase 5, fix bad info
 	if(!mQuiet)
 	{
-		::printf("Phase 5, fix unrecovered inconsistencies...\n");
+		BOX_INFO("Phase 5, fix unrecovered inconsistencies...");
 	}
 	FixDirsWithWrongContainerID();
 	FixDirsWithLostDirs();
@@ -190,7 +192,7 @@ void BackupStoreCheck::Check()
 	// Phase 6, regenerate store info
 	if(!mQuiet)
 	{
-		::printf("Phase 6, regenerate store info...\n");
+		BOX_INFO("Phase 6, regenerate store info...");
 	}
 	WriteNewStoreInfo();
 	
@@ -198,29 +200,40 @@ void BackupStoreCheck::Check()
 	
 	if(mNumberErrorsFound > 0)
 	{
-		::printf("%lld errors found\n", mNumberErrorsFound);
+		BOX_WARNING("Finished checking store account ID " <<
+			BOX_FORMAT_ACCOUNT(mAccountID) << ": " <<
+			mNumberErrorsFound << " errors found");
 		if(!mFixErrors)
 		{
-			::printf("NOTE: No changes to the store account have been made.\n");
+			BOX_WARNING("No changes to the store account "
+				"have been made.");
 		}
 		if(!mFixErrors && mNumberErrorsFound > 0)
 		{
-			::printf("Run again with fix option to fix these errors\n");
+			BOX_WARNING("Run again with fix option to "
+				"fix these errors");
 		}
-		if(mNumberErrorsFound > 0)
+		if(mFixErrors && mNumberErrorsFound > 0)
 		{
-			::printf("You should now use bbackupquery on the client machine to examine the store.\n");
+			BOX_WARNING("You should now use bbackupquery "
+				"on the client machine to examine the store.");
 			if(mLostAndFoundDirectoryID != 0)
 			{
-				::printf("A lost+found directory was created in the account root.\n"\
-					"This contains files and directories which could not be matched to existing directories.\n"\
-					"bbackupd will delete this directory in a few days time.\n");
+				BOX_WARNING("A lost+found directory was "
+					"created in the account root.\n"
+					"This contains files and directories "
+					"which could not be matched to "
+					"existing directories.\n"\
+					"bbackupd will delete this directory "
+					"in a few days time.");
 			}
 		}
 	}
 	else
 	{
-		::printf("Store account checked, no errors found.\n");
+		BOX_NOTICE("Finished checking store account ID " <<
+			BOX_FORMAT_ACCOUNT(mAccountID) << ": "
+			"no errors found");
 	}
 }
 
@@ -342,7 +355,10 @@ int64_t BackupStoreCheck::CheckObjectsScanDir(int64_t StartID, int Level, const
 			}
 			else
 			{
-				::printf("Spurious or invalid directory %s/%s found%s -- delete manually\n", rDirName.c_str(), (*i).c_str(), mFixErrors?", deleting":"");
+				BOX_WARNING("Spurious or invalid directory " <<
+					rDirName << DIRECTORY_SEPARATOR << 
+					(*i) << " found, " <<
+					(mFixErrors?"deleting":"delete manually"));
 				++mNumberErrorsFound;
 			}
 		}
@@ -366,14 +382,15 @@ void BackupStoreCheck::CheckObjectsDir(int64_t StartID)
 	std::string dirName;
 	StoreStructure::MakeObjectFilename(StartID, mStoreRoot, mDiscSetNumber, dirName, false /* don't make sure the dir exists */);
 	// Check expectations
-	ASSERT(dirName.size() > 4 && dirName[dirName.size() - 4] == '/');
+	ASSERT(dirName.size() > 4 && 
+		dirName[dirName.size() - 4] == DIRECTORY_SEPARATOR_ASCHAR);
 	// Remove the filename from it
 	dirName.resize(dirName.size() - 4); // four chars for "/o00"
 	
 	// Check directory exists
 	if(!RaidFileRead::DirectoryExists(mDiscSetNumber, dirName))
 	{
-		TRACE1("RaidFile dir %s does not exist\n", dirName.c_str());
+		BOX_WARNING("RaidFile dir " << dirName << " does not exist");
 		return;
 	}
 
@@ -415,7 +432,9 @@ void BackupStoreCheck::CheckObjectsDir(int64_t StartID)
 		if(!fileOK)
 		{
 			// Unexpected or bad file, delete it
-			::printf("Spurious file %s/%s found%s\n", dirName.c_str(), (*i).c_str(), mFixErrors?", deleting":"");
+			BOX_WARNING("Spurious file " << dirName << 
+				DIRECTORY_SEPARATOR << (*i) << " found" <<
+				(mFixErrors?", deleting":""));
 			++mNumberErrorsFound;
 			if(mFixErrors)
 			{
@@ -436,7 +455,9 @@ void BackupStoreCheck::CheckObjectsDir(int64_t StartID)
 			if(!CheckAndAddObject(StartID | i, dirName + leaf))
 			{
 				// File was bad, delete it
-				::printf("Corrupted file %s%s found%s\n", dirName.c_str(), leaf, mFixErrors?", deleting":"");
+				BOX_WARNING("Corrupted file " << dirName <<
+					leaf << " found" <<
+					(mFixErrors?", deleting":""));
 				++mNumberErrorsFound;
 				if(mFixErrors)
 				{
@@ -504,11 +525,10 @@ bool BackupStoreCheck::CheckAndAddObject(int64_t ObjectID, const std::string &rF
 		}
 		
 		// Add to usage counts
-		int64_t s = file->GetDiscUsageInBlocks();
-		mBlocksUsed += s;
+		mBlocksUsed += size;
 		if(!isFile)
 		{
-			mBlocksInDirectories += s;
+			mBlocksInDirectories += size;
 		}
 	}
 	catch(...)
@@ -545,7 +565,7 @@ int64_t BackupStoreCheck::CheckFile(int64_t ObjectID, IOStream &rStream)
 	if(ObjectID == BACKUPSTORE_ROOT_DIRECTORY_ID)
 	{
 		// Get that dodgy thing deleted!
-		::printf("Have file as root directory. This is bad.\n");
+		BOX_ERROR("Have file as root directory. This is bad.");
 		return -1;
 	}
 
@@ -632,7 +652,9 @@ void BackupStoreCheck::CheckDirectories()
 				if(dir.CheckAndFix())
 				{
 					// Wasn't quite right, and has been modified
-					::printf("Directory ID %llx has bad structure\n", pblock->mID[e]);
+					BOX_WARNING("Directory ID " <<
+						BOX_FORMAT_OBJECTID(pblock->mID[e]) <<
+						" has bad structure");
 					++mNumberErrorsFound;
 					isModified = true;
 				}
@@ -658,7 +680,11 @@ void BackupStoreCheck::CheckDirectories()
 							!= ((en->GetFlags() & BackupStoreDirectory::Entry::Flags_Dir) == BackupStoreDirectory::Entry::Flags_Dir))
 						{
 							// Entry is of wrong type
-							::printf("Directory ID %llx references object %llx which has a different type than expected.\n", pblock->mID[e], en->GetObjectID());
+							BOX_WARNING("Directory ID " <<
+								BOX_FORMAT_OBJECTID(pblock->mID[e]) <<
+								" references object " <<
+								BOX_FORMAT_OBJECTID(en->GetObjectID()) <<
+								" which has a different type than expected.");
 							badEntry = true;
 						}
 						else
@@ -666,8 +692,12 @@ void BackupStoreCheck::CheckDirectories()
 							// Check that the entry is not already contained.
 							if(iflags & Flags_IsContained)
 							{
+								BOX_WARNING("Directory ID " <<
+									BOX_FORMAT_OBJECTID(pblock->mID[e]) <<
+									" references object " <<
+									BOX_FORMAT_OBJECTID(en->GetObjectID()) <<
+									" which is already contained.");
 								badEntry = true;
-								::printf("Directory ID %llx references object %llx which is already contained.\n", pblock->mID[e], en->GetObjectID());
 							}
 							else
 							{
@@ -681,13 +711,13 @@ void BackupStoreCheck::CheckDirectories()
 									if(iflags & Flags_IsDir)
 									{
 										// Add to will fix later list
-										::printf("Directory ID %llx has wrong container ID.\n", en->GetObjectID());
+										BOX_WARNING("Directory ID " << BOX_FORMAT_OBJECTID(en->GetObjectID()) << " has wrong container ID.");
 										mDirsWithWrongContainerID.push_back(en->GetObjectID());
 									}
 									else
 									{
 										// This is OK for files, they might move
-										::printf("File ID %llx has different container ID, probably moved\n", en->GetObjectID());
+										BOX_WARNING("File ID " << BOX_FORMAT_OBJECTID(en->GetObjectID()) << " has different container ID, probably moved");
 									}
 									
 									// Fix entry for now
@@ -706,7 +736,7 @@ void BackupStoreCheck::CheckDirectories()
 								// Mark as changed
 								isModified = true;
 								// Tell user
-								::printf("Directory ID %llx has wrong size for object %llx\n", pblock->mID[e], en->GetObjectID());
+								BOX_WARNING("Directory ID " << BOX_FORMAT_OBJECTID(pblock->mID[e]) << " has wrong size for object " << BOX_FORMAT_OBJECTID(en->GetObjectID()));
 							}
 						}
 					}
@@ -722,7 +752,7 @@ void BackupStoreCheck::CheckDirectories()
 						{
 							// Just remove the entry
 							badEntry = true;
-							::printf("Directory ID %llx references object %llx which does not exist.\n", pblock->mID[e], en->GetObjectID());
+							BOX_WARNING("Directory ID " << BOX_FORMAT_OBJECTID(pblock->mID[e]) << " references object " << BOX_FORMAT_OBJECTID(en->GetObjectID()) << " which does not exist.");
 						}
 					}
 					
@@ -765,7 +795,7 @@ void BackupStoreCheck::CheckDirectories()
 				
 				if(isModified && mFixErrors)
 				{	
-					::printf("Fixing directory ID %llx\n", pblock->mID[e]);
+					BOX_WARNING("Fixing directory ID " << BOX_FORMAT_OBJECTID(pblock->mID[e]));
 
 					// Save back to disc
 					RaidFileWrite fixed(mDiscSetNumber, filename);
diff --git a/lib/backupstore/BackupStoreCheck.h b/lib/backupstore/BackupStoreCheck.h
index f176ebad..d7e23c9b 100644
--- a/lib/backupstore/BackupStoreCheck.h
+++ b/lib/backupstore/BackupStoreCheck.h
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
diff --git a/lib/backupstore/BackupStoreCheck2.cpp b/lib/backupstore/BackupStoreCheck2.cpp
index 38e8bf92..e251799f 100644
--- a/lib/backupstore/BackupStoreCheck2.cpp
+++ b/lib/backupstore/BackupStoreCheck2.cpp
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
@@ -85,7 +85,7 @@ void BackupStoreCheck::CheckRoot()
 	}
 	else
 	{
-		::printf("Root directory doesn't exist\n");
+		BOX_WARNING("Root directory doesn't exist");
 		
 		++mNumberErrorsFound;
 		
@@ -156,7 +156,7 @@ void BackupStoreCheck::CheckUnattachedObjects()
 			if((flags & Flags_IsContained) == 0)
 			{
 				// Unattached object...
-				::printf("Object %llx is unattached.\n", pblock->mID[e]);
+				BOX_WARNING("Object " << BOX_FORMAT_OBJECTID(pblock->mID[e]) << " is unattached.");
 				++mNumberErrorsFound;
 
 				// What's to be done?
@@ -185,7 +185,7 @@ void BackupStoreCheck::CheckUnattachedObjects()
 						// Just delete it to be safe.
 						if(diffFromObjectID != 0)
 						{
-							::printf("Object %llx is unattached, and is a patch. Deleting, cannot reliably recover.\n", pblock->mID[e]);
+							BOX_WARNING("Object " << BOX_FORMAT_OBJECTID(pblock->mID[e]) << " is unattached, and is a patch. Deleting, cannot reliably recover.");
 						
 							// Delete this object instead
 							if(mFixErrors)
@@ -267,11 +267,15 @@ bool BackupStoreCheck::TryToRecreateDirectory(int64_t MissingDirectoryID)
 	// Can recreate this! Wooo!
 	if(!mFixErrors)
 	{
-		::printf("Missing directory %llx could be recreated\n", MissingDirectoryID);
+		BOX_WARNING("Missing directory " << 
+			BOX_FORMAT_OBJECTID(MissingDirectoryID) <<
+			" could be recreated.");
 		mDirsAdded.insert(MissingDirectoryID);
 		return true;
 	}
-	::printf("Recreating missing directory %llx\n", MissingDirectoryID);
+
+	BOX_WARNING("Recreating missing directory " << 
+		BOX_FORMAT_OBJECTID(MissingDirectoryID));
 	
 	// Create a blank directory
 	BackupStoreDirectory dir(MissingDirectoryID, missing->second /* containing dir ID */);
@@ -338,7 +342,7 @@ int64_t BackupStoreCheck::GetLostAndFoundDirID()
 		if(!dir.NameInUse(lostAndFound))
 		{
 			// Found a name which can be used
-			::printf("Lost and found dir has name %s\n", name);
+			BOX_WARNING("Lost and found dir has name " << name);
 			break;
 		}
 	}
@@ -562,7 +566,7 @@ void BackupStoreCheck::WriteNewStoreInfo()
 	}
 	catch(...)
 	{
-		::printf("Load of existing store info failed, regenerating.\n");
+		BOX_WARNING("Load of existing store info failed, regenerating.");
 		++mNumberErrorsFound;
 	}
 
@@ -589,7 +593,7 @@ void BackupStoreCheck::WriteNewStoreInfo()
 	}
 	else
 	{
-		::printf("NOTE: Soft limit for account changed to ensure housekeeping doesn't delete files on next run\n");
+		BOX_WARNING("Soft limit for account changed to ensure housekeeping doesn't delete files on next run.");
 	}
 	if(poldInfo.get() != 0 && poldInfo->GetBlocksHardLimit() > minHard)
 	{
@@ -597,7 +601,7 @@ void BackupStoreCheck::WriteNewStoreInfo()
 	}
 	else
 	{
-		::printf("NOTE: Hard limit for account changed to ensure housekeeping doesn't delete files on next run\n");
+		BOX_WARNING("Hard limit for account changed to ensure housekeeping doesn't delete files on next run.");
 	}
 	
 	// Object ID
@@ -624,7 +628,7 @@ void BackupStoreCheck::WriteNewStoreInfo()
 	if(mFixErrors)
 	{
 		info->Save();
-		::printf("New store info file written successfully.\n");
+		BOX_NOTICE("New store info file written successfully.");
 	}
 }
 
@@ -691,7 +695,7 @@ bool BackupStoreDirectory::CheckAndFix()
 			if(dependsOlder != 0 && FindEntryByID(dependsOlder) == 0)
 			{
 				// Has an older version marked, but this doesn't exist. Remove this mark
-				TRACE2("Entry id %llx was marked that %llx depended on it, which doesn't exist, dependency info cleaered\n", (*i)->GetObjectID(), dependsOlder);
+				TRACE2("Entry id %llx was marked that %llx depended on it, which doesn't exist, dependency info cleared\n", (*i)->GetObjectID(), dependsOlder);
 
 				(*i)->SetDependsOlder(0);
 				
diff --git a/lib/backupstore/BackupStoreCheckData.cpp b/lib/backupstore/BackupStoreCheckData.cpp
index 53a33d47..aaff18f6 100644
--- a/lib/backupstore/BackupStoreCheckData.cpp
+++ b/lib/backupstore/BackupStoreCheckData.cpp
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
diff --git a/lib/backupstore/BackupStoreConfigVerify.cpp b/lib/backupstore/BackupStoreConfigVerify.cpp
index 5ecdcbb5..1e41fee4 100644
--- a/lib/backupstore/BackupStoreConfigVerify.cpp
+++ b/lib/backupstore/BackupStoreConfigVerify.cpp
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
@@ -73,7 +73,13 @@ static const ConfigurationVerifyKey verifyrootkeys[] =
 	{"AccountDatabase",	0, ConfigTest_Exists, 0},
 	{"TimeBetweenHousekeeping",	0, ConfigTest_Exists | ConfigTest_IsInt, 0},
 	{"ExtendedLogging",	"no", ConfigTest_IsBool, 0},			// make value "yes" to enable in config file
-	{"RaidFileConf",	BOX_FILE_RAIDFILE_DEFAULT_CONFIG, ConfigTest_LastEntry, 	0}
+
+	#ifdef WIN32
+		{"RaidFileConf", "", ConfigTest_LastEntry, 0}
+	#else
+		{"RaidFileConf", BOX_FILE_RAIDFILE_DEFAULT_CONFIG, ConfigTest_LastEntry, 0}
+	#endif
+
 };
 
 const ConfigurationVerify BackupConfigFileVerify =
diff --git a/lib/backupstore/BackupStoreConfigVerify.h b/lib/backupstore/BackupStoreConfigVerify.h
index fee8ae42..7742cf8d 100644
--- a/lib/backupstore/BackupStoreConfigVerify.h
+++ b/lib/backupstore/BackupStoreConfigVerify.h
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
diff --git a/lib/backupstore/BackupStoreInfo.cpp b/lib/backupstore/BackupStoreInfo.cpp
index 28508b60..bf3d1c35 100644
--- a/lib/backupstore/BackupStoreInfo.cpp
+++ b/lib/backupstore/BackupStoreInfo.cpp
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
@@ -162,7 +162,8 @@ void BackupStoreInfo::CreateNew(int32_t AccountID, const std::string &rRootDir,
 	};
 	
 	// Generate the filename
-	ASSERT(rRootDir[rRootDir.size() - 1] == DIRECTORY_SEPARATOR_ASCHAR);
+	ASSERT(rRootDir[rRootDir.size() - 1] == '/' ||
+		rRootDir[rRootDir.size() - 1] == DIRECTORY_SEPARATOR_ASCHAR);
 	std::string fn(rRootDir + INFO_FILENAME);
 	
 	// Open the file for writing
diff --git a/lib/backupstore/BackupStoreInfo.h b/lib/backupstore/BackupStoreInfo.h
index 0c4241d7..fe34f62f 100644
--- a/lib/backupstore/BackupStoreInfo.h
+++ b/lib/backupstore/BackupStoreInfo.h
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
@@ -56,7 +56,7 @@ class BackupStoreCheck;
 
 // --------------------------------------------------------------------------
 //
-// File
+// Class
 //		Name:    BackupStoreInfo
 //		Purpose: Main backup store information storage
 //		Created: 2003/08/28
diff --git a/lib/backupstore/StoreStructure.cpp b/lib/backupstore/StoreStructure.cpp
index 68876fd6..8ec2d690 100644
--- a/lib/backupstore/StoreStructure.cpp
+++ b/lib/backupstore/StoreStructure.cpp
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
diff --git a/lib/backupstore/StoreStructure.h b/lib/backupstore/StoreStructure.h
index 8c1e871c..b961b598 100644
--- a/lib/backupstore/StoreStructure.h
+++ b/lib/backupstore/StoreStructure.h
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.