Changeset 989 for box/trunk/bin/bbstored/BackupCommands.cpp

Timestamp:

12/10/2006 22:35:39 (6 years ago)

Author:

chris

Message:

• Use the same code for file names and file closing on other platforms

that's needed on Win32

File:

• box/trunk/bin/bbstored/BackupCommands.cpp (modified) (3 diffs)

box/trunk/bin/bbstored/BackupCommands.cpp

@@ -11 +11 @@
 
 #include <syslog.h>
+#include <sstream>
 
 #include "autogen_BackupProtocolServer.h"
@@ -328 +329 @@
                         
                         // Choose a temporary filename for the result of the combination
-                        std::string tempFn(RaidFileController::DiscSetPathToFileSystemPath(rContext.GetStoreDiscSet(), rContext.GetStoreRoot() + ".recombinetemp",
-                                p + 16 /* rotate which disc it's on */));
+                        std::ostringstream fs(rContext.GetStoreRoot());
+                        fs << ".recombinetemp.";
+                        fs << p;
+                        std::string tempFn(fs.str());
+                        tempFn = RaidFileController::DiscSetPathToFileSystemPath(rContext.GetStoreDiscSet(), tempFn, p + 16);
                         
                         // Open the temporary file
@@ -360 +364 @@
                         
                         // Then shuffle round for the next go
+                        if (from.get()) from->Close();
                         from = combined;
                 }