[Box Backup-dev] COMMIT r818 - box/chris/merge/bin/bbstored

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-08-30 15:02:30 +0100 (Wed, 30 Aug 2006)
New Revision: 818

Modified:
   box/chris/merge/bin/bbstored/BackupCommands.cpp
Log:
* bin/bbstored/BackupCommands.cpp
- Revert to trunk


Modified: box/chris/merge/bin/bbstored/BackupCommands.cpp
===================================================================
--- box/chris/merge/bin/bbstored/BackupCommands.cpp	2006-08-30 13:47:35 UTC (rev 817)
+++ box/chris/merge/bin/bbstored/BackupCommands.cpp	2006-08-30 14:02:30 UTC (rev 818)
@@ -9,13 +9,8 @@
 
 #include "Box.h"
 
-#ifdef HAVE_SYSLOG_H
 #include <syslog.h>
-#endif
 
-#include <set>
-#include <sstream>
-
 #include "autogen_BackupProtocolServer.h"
 #include "BackupConstants.h"
 #include "BackupContext.h"
@@ -332,15 +327,8 @@
 			std::auto_ptr<IOStream> diff2(rContext.OpenObject(patchID));
 			
 			// Choose a temporary filename for the result of the combination
-#ifdef WIN32
-			std::ostringstream fs(rContext.GetStoreRoot());
-			fs << ".recombinetemp.";
-			fs << p;
-			std::string tempFn(fs.str());
-			tempFn = RaidFileController::DiscSetPathToFileSystemPath(rContext.GetStoreDiscSet(), tempFn, p + 16);
-#else
-			std::string tempFn(RaidFileController::DiscSetPathToFileSystemPath(rContext.GetStoreDiscSet(), rContext.GetStoreRoot() + ".recombinetemp", p + 16 /* rotate which disc it's on */));
-#endif
+			std::string tempFn(RaidFileController::DiscSetPathToFileSystemPath(rContext.GetStoreDiscSet(), rContext.GetStoreRoot() + ".recombinetemp",
+				p + 16 /* rotate which disc it's on */));
 			
 			// Open the temporary file
 			std::auto_ptr<IOStream> combined;
@@ -348,23 +336,14 @@
 			{
 				{
 					// Write nastily to allow this to work with gcc 2.x
-#ifdef WIN32
-					combined.reset(new FileStream(
-						tempFn.c_str(), 
-						O_RDWR | O_CREAT | O_EXCL | 
-						O_BINARY | O_TRUNC));
-#else
 					std::auto_ptr<IOStream> t(new FileStream(tempFn.c_str(), O_RDWR | O_CREAT | O_EXCL));
 					combined = t;
-#endif
 				}
-#ifndef WIN32
 				// Unlink immediately as it's a temporary file
 				if(::unlink(tempFn.c_str()) != 0)
 				{
 					THROW_EXCEPTION(CommonException, OSFileError);
 				}
-#endif
 			}
 			catch(...)
 			{
@@ -380,9 +359,6 @@
 			combined->Seek(0, IOStream::SeekType_Absolute);
 			
 			// Then shuffle round for the next go
-#ifdef WIN32
-			if (from.get()) from->Close();
-#endif
 			from = combined;
 		}
 		
@@ -420,9 +396,8 @@
 			stream = t;
 		}
 
-		// Object will be deleted when the stream is deleted, 
-		// so can release the object auto_ptr here to avoid 
-		// premature deletion
+		// Object will be deleted when the stream is deleted, so can release the object auto_ptr here to
+		// avoid premature deletiong
 		object.release();
 	}