From ef3d1642c083a9c69eb48c6ab8ecc9be43dfbcfc Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 29 Mar 2009 13:51:24 +0000 Subject: Change type of BackupStoreFilename not to derive from std::string, so it can't accidentally be used as one. Fix use of encrypted filename in deleted file message, thanks to Kenny Millington for reporting. --- lib/backupstore/BackupStoreCheck2.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/backupstore') diff --git a/lib/backupstore/BackupStoreCheck2.cpp b/lib/backupstore/BackupStoreCheck2.cpp index 9615516c..bcb5c5e9 100644 --- a/lib/backupstore/BackupStoreCheck2.cpp +++ b/lib/backupstore/BackupStoreCheck2.cpp @@ -750,7 +750,7 @@ bool BackupStoreDirectory::CheckAndFix() // Records of things seen std::set idsEncountered; - std::set filenamesEncountered; + std::set filenamesEncountered; do { @@ -792,7 +792,7 @@ bool BackupStoreDirectory::CheckAndFix() // Check to see if the name has already been encountered -- if not, then it // needs to have the old version flag set - if(filenamesEncountered.find((*i)->GetName()) != filenamesEncountered.end()) + if(filenamesEncountered.find((*i)->GetName().GetEncodedFilename()) != filenamesEncountered.end()) { // Seen before -- check old version flag set if(((*i)->GetFlags() & Entry::Flags_OldVersion) != Entry::Flags_OldVersion @@ -818,7 +818,7 @@ bool BackupStoreDirectory::CheckAndFix() } // Remember filename - filenamesEncountered.insert((*i)->GetName()); + filenamesEncountered.insert((*i)->GetName().GetEncodedFilename()); } } } -- cgit v1.2.3