summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2007-07-26 22:01:40 +0000
committerChris Wilson <chris+github@qwirx.com>2007-07-26 22:01:40 +0000
commit3fdbfc61a49360884c80318426a8e6719330c2c9 (patch)
tree008d78b0182cde72f49827a1828f464cb4a24df7
parent3e8085ecd57ecf4d7f2c4d7a05dba71e70c9a525 (diff)
Apply remaining parts of Gary's patch, missing from [1658], thanks Gary
(refs #3, merges [1669])
-rw-r--r--bin/bbackupd/BackupDaemon.cpp20
1 files changed, 20 insertions, 0 deletions
diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp
index edb1246a..a772d8de 100644
--- a/bin/bbackupd/BackupDaemon.cpp
+++ b/bin/bbackupd/BackupDaemon.cpp
@@ -2851,6 +2851,26 @@ bool BackupDaemon::DeserializeStoreObjectInfo(int64_t & aClientStoreMarker, box_
//
//
//
+ iCount = 0;
+ anArchive.Read(iCount);
+
+ for(int v = 0; v < iCount; v++)
+ {
+ int64_t anId;
+ anArchive.Read(anId);
+
+ std::string aName;
+ anArchive.Read(aName);
+
+ mUnusedRootDirEntries.push_back(std::pair<int64_t, std::string>(anId, aName));
+ }
+
+ if (iCount > 0)
+ anArchive.Read(mDeleteUnusedRootDirEntriesAfter);
+
+ //
+ //
+ //
aFile.Close();
BOX_INFO("Loaded store object info file version " << iVersion
<< "(" << StoreObjectInfoFile << ")");