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 /bin | |
| 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 'bin')
| -rw-r--r-- | bin/bbackupd/BackupClientDirectoryRecord.cpp | 3 | ||||
| -rw-r--r-- | bin/bbstored/HousekeepStoreAccount.cpp | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/bin/bbackupd/BackupClientDirectoryRecord.cpp index 4ecb81d9..b8d42d47 100644 --- a/bin/bbackupd/BackupClientDirectoryRecord.cpp +++ b/bin/bbackupd/BackupClientDirectoryRecord.cpp @@ -1386,8 +1386,9 @@ bool BackupClientDirectoryRecord::UpdateItems( // aren't actually deleted, as the whole state will be reset anyway. BackupClientDeleteList &rdel(rContext.GetDeleteList()); + BackupStoreFilenameClear clear(en->GetName()); std::string localName = MakeFullPath(rLocalPath, - en->GetName()); + clear.GetClearFilename()); // Delete this entry -- file or directory? if((en->GetFlags() & BackupStoreDirectory::Entry::Flags_File) != 0) diff --git a/bin/bbstored/HousekeepStoreAccount.cpp b/bin/bbstored/HousekeepStoreAccount.cpp index 84765209..dbb9b544 100644 --- a/bin/bbstored/HousekeepStoreAccount.cpp +++ b/bin/bbstored/HousekeepStoreAccount.cpp @@ -349,7 +349,8 @@ bool HousekeepStoreAccount::ScanDirectory(int64_t ObjectID) // Add files to the list of potential deletions // map to count the distance from the mark - std::map<std::pair<BackupStoreFilename, int32_t>, int32_t> markVersionAges; + typedef std::pair<std::string, int32_t> version_t; + std::map<version_t, int32_t> markVersionAges; // map of pair (filename, mark number) -> version age // NOTE: use a reverse iterator to allow the distance from mark stuff to work @@ -367,7 +368,10 @@ bool HousekeepStoreAccount::ScanDirectory(int64_t ObjectID) // Work out ages of this version from the last mark int32_t enVersionAge = 0; - std::map<std::pair<BackupStoreFilename, int32_t>, int32_t>::iterator enVersionAgeI(markVersionAges.find(std::pair<BackupStoreFilename, int32_t>(en->GetName(), en->GetMarkNumber()))); + std::map<version_t, int32_t>::iterator enVersionAgeI( + markVersionAges.find( + version_t(en->GetName().GetEncodedFilename(), + en->GetMarkNumber()))); if(enVersionAgeI != markVersionAges.end()) { enVersionAge = enVersionAgeI->second + 1; @@ -375,7 +379,7 @@ bool HousekeepStoreAccount::ScanDirectory(int64_t ObjectID) } else { - markVersionAges[std::pair<BackupStoreFilename, int32_t>(en->GetName(), en->GetMarkNumber())] = enVersionAge; + markVersionAges[version_t(en->GetName().GetEncodedFilename(), en->GetMarkNumber())] = enVersionAge; } // enVersionAge is now the age of this version. |