diff options
author | Chris Wilson <chris+github@qwirx.com> | 2009-03-29 13:51:24 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2009-03-29 13:51:24 +0000 |
commit | ef3d1642c083a9c69eb48c6ab8ecc9be43dfbcfc (patch) | |
tree | 832e4994de4e02343616b5cd4454a3bb85f61b3b /lib/backupstore | |
parent | 2b51c2d2a265957abf6b2aee9901f9bd51d07ba6 (diff) |
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.
Diffstat (limited to 'lib/backupstore')
-rw-r--r-- | lib/backupstore/BackupStoreCheck2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<int64_t> idsEncountered; - std::set<BackupStoreFilename> filenamesEncountered; + std::set<std::string> 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()); } } } |