[Box Backup-dev] COMMIT r213 - in box/trunk: . bin/bbackupctl bin/bbackupd bin/bbackupd/win32 bin/bbackupquery bin/bbstoreaccounts docs/backup infrastructure infrastructure/m4 lib lib/backupclient lib/common lib/server lib/win32 test test/basicserver test/win32
boxbackup-dev@fluffy.co.uk
boxbackup-dev@fluffy.co.uk
Mon, 12 Dec 2005 20:50:14 +0000 (GMT)
Author: martin
Date: 2005-12-12 20:50:00 +0000 (Mon, 12 Dec 2005)
New Revision: 213
Added:
box/trunk/VERSION.txt
box/trunk/bbackupctl.vcproj
box/trunk/bbackupd.vcproj
box/trunk/bin/bbackupd/Win32BackupService.cpp
box/trunk/bin/bbackupd/Win32BackupService.h
box/trunk/bin/bbackupd/Win32ServiceFunctions.cpp
box/trunk/bin/bbackupd/Win32ServiceFunctions.h
box/trunk/bin/bbackupd/win32/
box/trunk/bin/bbackupd/win32/ReadMe.txt
box/trunk/bin/bbackupd/win32/bbackupd.conf
box/trunk/bin/bbackupd/win32/installer.iss
box/trunk/boxbackup.sln
box/trunk/boxbackup.suo
box/trunk/boxquery.vcproj
box/trunk/common.vcproj
box/trunk/config.guess
box/trunk/config.sub
box/trunk/docs/backup/Win32_Clients.txt
box/trunk/docs/backup/win32_build_on_cygwin_using_mingw.txt
box/trunk/docs/backup/win32_build_on_linux_using_mingw.txt
box/trunk/lib/win32/
box/trunk/lib/win32/WinNamedPipeStream.cpp
box/trunk/lib/win32/WinNamedPipeStream.h
box/trunk/lib/win32/emu.cpp
box/trunk/lib/win32/emu.h
box/trunk/test/win32/
box/trunk/test/win32/testlibwin32.cpp
box/trunk/win32.bat
box/trunk/win32test.vcproj
Removed:
box/trunk/bin/bbackupd/win32/ReadMe.txt
box/trunk/bin/bbackupd/win32/bbackupd.conf
box/trunk/bin/bbackupd/win32/installer.iss
box/trunk/lib/win32/WinNamedPipeStream.cpp
box/trunk/lib/win32/WinNamedPipeStream.h
box/trunk/lib/win32/emu.cpp
box/trunk/lib/win32/emu.h
box/trunk/test/win32/testlibwin32.cpp
Modified:
box/trunk/bin/bbackupctl/bbackupctl.cpp
box/trunk/bin/bbackupd/BackupClientContext.cpp
box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp
box/trunk/bin/bbackupd/BackupClientInodeToIDMap.cpp
box/trunk/bin/bbackupd/BackupClientInodeToIDMap.h
box/trunk/bin/bbackupd/BackupDaemon.cpp
box/trunk/bin/bbackupd/BackupDaemon.h
box/trunk/bin/bbackupd/bbackupd.cpp
box/trunk/bin/bbackupquery/BackupQueries.cpp
box/trunk/bin/bbackupquery/bbackupquery.cpp
box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp
box/trunk/configure.ac
box/trunk/infrastructure/BoxPlatform.pm.in
box/trunk/infrastructure/m4/ax_check_mount_point.m4
box/trunk/infrastructure/m4/ax_check_ssl.m4
box/trunk/infrastructure/makebuildenv.pl
box/trunk/infrastructure/makeparcels.pl
box/trunk/lib/backupclient/BackupClientFileAttributes.cpp
box/trunk/lib/backupclient/BackupClientFileAttributes.h
box/trunk/lib/backupclient/BackupStoreFile.cpp
box/trunk/lib/backupclient/BackupStoreFileDiff.cpp
box/trunk/lib/backupclient/BackupStoreObjectDump.cpp
box/trunk/lib/common/BoxPlatform.h
box/trunk/lib/common/BoxPortsAndFiles.h
box/trunk/lib/common/BoxTime.h
box/trunk/lib/common/BoxTimeToText.cpp
box/trunk/lib/common/BoxTimeToUnix.h
box/trunk/lib/common/CommonException.txt
box/trunk/lib/common/DebugPrintf.cpp
box/trunk/lib/common/FileStream.cpp
box/trunk/lib/common/FileStream.h
box/trunk/lib/common/IOStream.cpp
box/trunk/lib/common/NamedLock.cpp
box/trunk/lib/common/TemporaryDirectory.h
box/trunk/lib/common/UnixUser.cpp
box/trunk/lib/common/WaitForEvent.h
box/trunk/lib/server/Daemon.cpp
box/trunk/lib/server/LocalProcessStream.cpp
box/trunk/lib/server/SSLLib.cpp
box/trunk/lib/server/ServerStream.h
box/trunk/lib/server/Socket.cpp
box/trunk/lib/server/Socket.h
box/trunk/lib/server/SocketListen.h
box/trunk/lib/server/SocketStream.cpp
box/trunk/lib/server/SocketStream.h
box/trunk/lib/server/SocketStreamTLS.cpp
box/trunk/lib/server/makeprotocol.pl
box/trunk/modules.txt
box/trunk/parcels.txt
box/trunk/test/basicserver/testbasicserver.cpp
Log:
Marged chris/win32/merge/07-win32-fixes at r210 to trunk
Copied: box/trunk/VERSION.txt (from rev 210, box/chris/win32/merge/07-win32-fixes/VERSION.txt)
Copied: box/trunk/bbackupctl.vcproj (from rev 210, box/chris/win32/merge/07-win32-fixes/bbackupctl.vcproj)
Copied: box/trunk/bbackupd.vcproj (from rev 210, box/chris/win32/merge/07-win32-fixes/bbackupd.vcproj)
Modified: box/trunk/bin/bbackupctl/bbackupctl.cpp
===================================================================
--- box/trunk/bin/bbackupctl/bbackupctl.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/bin/bbackupctl/bbackupctl.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -19,6 +19,10 @@
#include "SocketStream.h"
#include "IOStreamGetLine.h"
+#ifdef WIN32
+ #include "WinNamedPipeStream.h"
+#endif
+
#include "MemLeakFindOn.h"
void PrintUsageAndExit()
@@ -26,7 +30,8 @@
printf("Usage: bbackupctl [-q] [-c config_file] <command>\n"
"Commands are:\n"
" sync -- start a syncronisation run now\n"
- " force-sync -- force the start of a syncronisation run, even if SyncAllowScript says no\n"
+ " force-sync -- force the start of a syncronisation run, "
+ "even if SyncAllowScript says no\n"
" reload -- reload daemon configuration\n"
" terminate -- terminate daemon now\n"
" wait-for-sync -- wait until the next sync starts, then exit\n"
@@ -38,8 +43,13 @@
{
int returnCode = 0;
- MAINHELPER_SETUP_MEMORY_LEAK_EXIT_REPORT("bbackupctl.memleaks", "bbackupctl")
+#if defined WIN32 && ! defined NDEBUG
+ ::openlog("Box Backup (bbackupctl)", 0, 0);
+#endif
+ MAINHELPER_SETUP_MEMORY_LEAK_EXIT_REPORT("bbackupctl.memleaks",
+ "bbackupctl")
+
MAINHELPER_START
// Filename for configuraiton file?
@@ -99,20 +109,35 @@
}
// Connect to socket
+
+#ifndef WIN32
SocketStream connection;
+#else /* WIN32 */
+ WinNamedPipeStream connection;
+#endif /* ! WIN32 */
+
try
{
+#ifdef WIN32
+ connection.Connect(BOX_NAMED_PIPE_NAME);
+#else
connection.Open(Socket::TypeUNIX, conf.GetKeyValue("CommandSocket").c_str());
+#endif
}
catch(...)
{
- printf("Failed to connect to daemon control socket.\n" \
- "Possible causes:\n" \
- " * Daemon not running\n" \
- " * Daemon busy syncing with store server\n" \
- " * Another bbackupctl process is communicating with the daemon\n" \
+ printf("Failed to connect to daemon control socket.\n"
+ "Possible causes:\n"
+ " * Daemon not running\n"
+ " * Daemon busy syncing with store server\n"
+ " * Another bbackupctl process is communicating with the daemon\n"
" * Daemon is waiting to recover from an error\n"
);
+
+#if defined WIN32 && ! defined NDEBUG
+ syslog(LOG_ERR,"Failed to connect to the command socket");
+#endif
+
return 1;
}
@@ -123,14 +148,29 @@
std::string configSummary;
if(!getLine.GetLine(configSummary))
{
+#if defined WIN32 && ! defined NDEBUG
+ syslog(LOG_ERR, "Failed to receive configuration summary "
+ "from daemon");
+#else
printf("Failed to receive configuration summary from daemon\n");
+#endif
+
return 1;
}
// Was the connection rejected by the server?
if(getLine.IsEOF())
{
- printf("Server rejected the connection. Are you running bbackupctl as the same user as the daemon?\n");
+#if defined WIN32 && ! defined NDEBUG
+ syslog(LOG_ERR, "Server rejected the connection. "
+ "Are you running bbackupctl as the same user "
+ "as the daemon?");
+#else
+ printf("Server rejected the connection. "
+ "Are you running bbackupctl as the same user "
+ "as the daemon?\n");
+#endif
+
return 1;
}
@@ -212,6 +252,10 @@
}
MAINHELPER_END
+
+#if defined WIN32 && ! defined NDEBUG
+ closelog();
+#endif
return returnCode;
}
Modified: box/trunk/bin/bbackupd/BackupClientContext.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupClientContext.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/bin/bbackupd/BackupClientContext.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -9,7 +9,9 @@
#include "Box.h"
+#ifndef WIN32
#include <syslog.h>
+#endif
#include "BoxPortsAndFiles.h"
#include "BoxTime.h"
Modified: box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -133,7 +133,8 @@
{
// The directory has probably been deleted, so just ignore this error.
// In a future scan, this deletion will be noticed, deleted from server, and this object deleted.
- TRACE1("Stat failed for '%s' (directory)\n", rLocalPath.c_str());
+ TRACE1("Stat failed for '%s' (directory)\n",
+ rLocalPath.c_str());
return;
}
// Store inode number in map so directories are tracked in case they're renamed
@@ -202,11 +203,18 @@
}
// Stat file to get info
- filename = rLocalPath + DIRECTORY_SEPARATOR + en->d_name;
+ filename = rLocalPath + DIRECTORY_SEPARATOR +
+ en->d_name;
+
if(::lstat(filename.c_str(), &st) != 0)
{
- TRACE1("Stat failed for '%s' (contents)\n", filename.c_str());
- THROW_EXCEPTION(CommonException, OSFileError)
+ // Report the error (logs and
+ // eventual email to administrator)
+ SetErrorWhenReadingFilesystemObject(
+ rParams, filename.c_str());
+
+ // Ignore this entry for now.
+ continue;
}
int type = st.st_mode & S_IFMT;
@@ -506,7 +514,7 @@
box_time_t modTime = 0;
uint64_t attributesHash = 0;
int64_t fileSize = 0;
- ino_t inodeNum = 0;
+ InodeRefType inodeNum = 0;
bool hasMultipleHardLinks = true;
// BLOCK
{
@@ -865,7 +873,7 @@
// Get attributes
box_time_t attrModTime = 0;
- ino_t inodeNum = 0;
+ InodeRefType inodeNum = 0;
BackupClientFileAttributes attr;
attr.ReadAttributes(dirname.c_str(), true /* directories have zero mod times */,
0 /* not interested in mod time */, &attrModTime, 0 /* not file size */,
@@ -1109,8 +1117,12 @@
std::auto_ptr<IOStream> upload(BackupStoreFile::EncodeFile(rFilename.c_str(), mObjectID, rStoreFilename));
// Send to store
- std::auto_ptr<BackupProtocolClientSuccess> stored(connection.QueryStoreFile(mObjectID, ModificationTime,
- AttributesHash, 0 /* no diff from file ID */, rStoreFilename, *upload));
+ std::auto_ptr<BackupProtocolClientSuccess> stored(
+ connection.QueryStoreFile(
+ mObjectID, ModificationTime,
+ AttributesHash,
+ 0 /* no diff from file ID */,
+ rStoreFilename, *upload));
// Get object ID from the result
objID = stored->GetObjectID();
@@ -1130,7 +1142,7 @@
rParams.mrDaemon.NotifySysadmin(BackupDaemon::NotifyEvent_StoreFull);
}
}
-
+
// Send the error on it's way
throw;
}
Modified: box/trunk/bin/bbackupd/BackupClientInodeToIDMap.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupClientInodeToIDMap.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/bin/bbackupd/BackupClientInodeToIDMap.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -65,7 +65,11 @@
#ifndef BACKIPCLIENTINODETOIDMAP_IN_MEMORY_IMPLEMENTATION
if(dbp != 0)
{
+#ifdef BERKELY_V4
+ dbp->close(0);
+#else
dbp->close(dbp);
+#endif
}
#endif
}
@@ -90,7 +94,14 @@
ASSERT(!mEmpty);
// Open the database file
+#ifdef BERKELY_V4
+ dbp = new Db(0,0);
+ dbp->set_pagesize(1024); /* Page size: 1K. */
+ dbp->set_cachesize(0, 32 * 1024, 0);
+ dbp->open(NULL, Filename, NULL, DB_HASH, DB_CREATE, 0664);
+#else
dbp = dbopen(Filename, (CreateNew?O_CREAT:0) | (ReadOnly?O_RDONLY:O_RDWR), S_IRUSR | S_IWUSR | S_IRGRP, TABLE_DATABASE_TYPE, NULL);
+#endif
if(dbp == NULL)
{
THROW_EXCEPTION(BackupStoreException, BerkelyDBFailure);
@@ -135,7 +146,11 @@
#ifndef BACKIPCLIENTINODETOIDMAP_IN_MEMORY_IMPLEMENTATION
if(dbp != 0)
{
+#ifdef BERKELY_V4
+ if(dbp->close(0) != 0)
+#else
if(dbp->close(dbp) != 0)
+#endif
{
THROW_EXCEPTION(BackupStoreException, BerkelyDBFailure);
}
@@ -172,6 +187,15 @@
IDBRecord rec;
rec.mObjectID = ObjectID;
rec.mInDirectory = InDirectory;
+
+#ifdef BERKELY_V4
+ Dbt key(&InodeRef, sizeof(InodeRef));
+ Dbt data(&rec, sizeof(rec));
+
+ if (dbp->put(0, &key, &data, 0) != 0) {
+ THROW_EXCEPTION(BackupStoreException, BerkelyDBFailure);
+ }
+#else
DBT key;
key.data = &InodeRef;
@@ -187,6 +211,7 @@
THROW_EXCEPTION(BackupStoreException, BerkelyDBFailure);
}
#endif
+#endif
}
// --------------------------------------------------------------------------
@@ -225,6 +250,11 @@
THROW_EXCEPTION(BackupStoreException, InodeMapNotOpen);
}
+#ifdef BERKELY_V4
+ Dbt key(&InodeRef, sizeof(InodeRef));
+ Dbt data(0, 0);
+ switch(dbp->get(NULL, &key, &data, 0))
+#else
DBT key;
key.data = &InodeRef;
key.size = sizeof(InodeRef);
@@ -234,6 +264,8 @@
data.size = 0;
switch(dbp->get(dbp, &key, &data, 0))
+#endif
+
{
case 1: // key not in file
return false;
@@ -248,6 +280,21 @@
}
// Check for sensible return
+#ifdef BERKELY_V4
+ if(key.get_data() == 0 || data.get_size() != sizeof(IDBRecord))
+ {
+ // Assert in debug version
+ ASSERT(key.get_data() == 0 || data.get_size() != sizeof(IDBRecord));
+
+ // Invalid entries mean it wasn't found
+ return false;
+ }
+
+ // Data alignment isn't guaranteed to be on a suitable boundary
+ IDBRecord rec;
+
+ ::memcpy(&rec, data.get_data(), sizeof(rec));
+#else
if(key.data == 0 || data.size != sizeof(IDBRecord))
{
// Assert in debug version
@@ -257,9 +304,11 @@
return false;
}
- // Data alignment isn't guarentted to be on a suitable bounday
+ // Data alignment isn't guaranteed to be on a suitable boundary
IDBRecord rec;
+
::memcpy(&rec, data.data, sizeof(rec));
+#endif
// Return data
rObjectIDOut = rec.mObjectID;
Modified: box/trunk/bin/bbackupd/BackupClientInodeToIDMap.h
===================================================================
--- box/trunk/bin/bbackupd/BackupClientInodeToIDMap.h 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/bin/bbackupd/BackupClientInodeToIDMap.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -20,12 +20,14 @@
#define BACKIPCLIENTINODETOIDMAP_IN_MEMORY_IMPLEMENTATION
#endif
-typedef ino_t InodeRefType;
-
// avoid having to include the DB files when not necessary
#ifndef BACKIPCLIENTINODETOIDMAP_IMPLEMENTATION
+#ifdef BERKELY_V4
+ class Db;
+#else
class DB;
#endif
+#endif
// --------------------------------------------------------------------------
//
@@ -58,8 +60,12 @@
#else
bool mReadOnly;
bool mEmpty;
+#ifdef BERKELY_V4
+ Db *dbp; // c++ style implimentation
+#else
DB *dbp; // C style interface, use notation from documentation
-#endif
+#endif // BERKELY_V4
+#endif // BACKIPCLIENTINODETOIDMAP_IN_MEMORY_IMPLEMENTATION
};
#endif // BACKUPCLIENTINODETOIDMAP__H
Modified: box/trunk/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/bin/bbackupd/BackupDaemon.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -9,26 +9,31 @@
#include "Box.h"
+#include <stdio.h>
#include <unistd.h>
-#include <syslog.h>
-#include <sys/param.h>
-#include <signal.h>
+
+#ifndef WIN32
+ #include <signal.h>
+ #include <syslog.h>
+ #include <sys/param.h>
+ #include <sys/wait.h>
+#endif
#ifdef HAVE_SYS_MOUNT_H
- #include <sys/mount.h>
+ #include <sys/mount.h>
#endif
#ifdef HAVE_MNTENT_H
- #include <mntent.h>
-#endif
+ #include <mntent.h>
+#endif
#ifdef HAVE_SYS_MNTTAB_H
#include <cstdio>
#include <sys/mnttab.h>
#endif
-#include <sys/wait.h>
#include "Configuration.h"
#include "IOStream.h"
#include "MemBlockStream.h"
#include "CommonException.h"
+#include "BoxPortsAndFiles.h"
#include "SSLLib.h"
#include "TLSContext.h"
@@ -160,8 +165,9 @@
//
// Function
// Name: BackupDaemon::SetupInInitialProcess()
-// Purpose: Platforms with non-checkable credientals on local sockets only.
-// Prints a warning if the command socket is used.
+// Purpose: Platforms with non-checkable credentials on
+// local sockets only.
+// Prints a warning if the command socket is used.
// Created: 25/2/04
//
// --------------------------------------------------------------------------
@@ -206,7 +212,134 @@
mIDMapMounts.clear();
}
+#ifdef WIN32
+// --------------------------------------------------------------------------
+//
+// Function
+// Name: HelperThread()
+// Purpose: Background thread function, called by Windows,
+// calls the BackupDaemon's RunHelperThread method
+// to listen for and act on control communications
+// Created: 18/2/04
+//
+// --------------------------------------------------------------------------
+unsigned int WINAPI HelperThread( LPVOID lpParam )
+{
+ printf( "Parameter = %lu.\n", *(DWORD*)lpParam );
+ ((BackupDaemon *)lpParam)->RunHelperThread();
+ return 0;
+}
+
+void BackupDaemon::RunHelperThread(void)
+{
+ mpCommandSocketInfo = new CommandSocketInfo;
+ this->mReceivedCommandConn = false;
+
+ while ( !IsTerminateWanted() )
+ {
+ try
+ {
+ mpCommandSocketInfo->mListeningSocket.Accept(
+ BOX_NAMED_PIPE_NAME);
+
+ // This next section comes from Ben's original function
+ // Log
+ ::syslog(LOG_INFO, "Connection from command socket");
+
+ // Send a header line summarising the configuration
+ // and current state
+ const Configuration &conf(GetConfiguration());
+ char summary[256];
+ size_t summarySize = sprintf(summary,
+ "bbackupd: %d %d %d %d\nstate %d\n",
+ conf.GetKeyValueBool("AutomaticBackup"),
+ conf.GetKeyValueInt("UpdateStoreInterval"),
+ conf.GetKeyValueInt("MinimumFileAge"),
+ conf.GetKeyValueInt("MaxUploadWait"),
+ mState);
+
+ mpCommandSocketInfo->mListeningSocket.Write(summary, summarySize);
+ mpCommandSocketInfo->mListeningSocket.Write("ping\n", 5);
+
+ IOStreamGetLine readLine(mpCommandSocketInfo->mListeningSocket);
+ std::string command;
+
+ while (mpCommandSocketInfo->mListeningSocket.IsConnected() &&
+ readLine.GetLine(command) )
+ {
+ TRACE1("Receiving command '%s' over "
+ "command socket\n", command.c_str());
+
+ bool sendOK = false;
+ bool sendResponse = true;
+ bool disconnect = false;
+
+ // Command to process!
+ if(command == "quit" || command == "")
+ {
+ // Close the socket.
+ disconnect = true;
+ sendResponse = false;
+ }
+ else if(command == "sync")
+ {
+ // Sync now!
+ this->mDoSyncFlagOut = true;
+ this->mSyncIsForcedOut = false;
+ sendOK = true;
+ }
+ else if(command == "force-sync")
+ {
+ // Sync now (forced -- overrides any SyncAllowScript)
+ this->mDoSyncFlagOut = true;
+ this->mSyncIsForcedOut = true;
+ sendOK = true;
+ }
+ else if(command == "reload")
+ {
+ // Reload the configuration
+ SetReloadConfigWanted();
+ sendOK = true;
+ }
+ else if(command == "terminate")
+ {
+ // Terminate the daemon cleanly
+ SetTerminateWanted();
+ sendOK = true;
+ }
+
+ // Send a response back?
+ if (sendResponse)
+ {
+ const char* response = sendOK ? "ok\n" : "error\n";
+ mpCommandSocketInfo->mListeningSocket.Write(
+ response, strlen(response));
+ }
+
+ if (disconnect)
+ {
+ break;
+ }
+
+ this->mReceivedCommandConn = true;
+ }
+
+ mpCommandSocketInfo->mListeningSocket.Close();
+ }
+ catch (BoxException &e)
+ {
+ ::syslog(LOG_ERR, "Communication error with "
+ "control client: %s", e.what());
+ }
+ catch (...)
+ {
+ ::syslog(LOG_ERR, "Communication error with control client");
+ }
+ }
+}
+#endif
+
// --------------------------------------------------------------------------
//
// Function
@@ -217,6 +350,25 @@
// --------------------------------------------------------------------------
void BackupDaemon::Run()
{
+#ifdef WIN32
+
+ // Create a thread to handle the named pipe
+ HANDLE hThread;
+ unsigned int dwThreadId;
+
+ hThread = (HANDLE) _beginthreadex(
+ NULL, // default security attributes
+ 0, // use default stack size
+ HelperThread, // thread function
+ this, // argument to thread function
+ 0, // use default creation flags
+ &dwThreadId); // returns the thread identifier
+
+ // init our own timer for file diff timeouts
+ InitTimer();
+
+#else // ! WIN32
+
// Ignore SIGPIPE (so that if a command connection is broken, the daemon doesn't terminate)
::signal(SIGPIPE, SIG_IGN);
@@ -230,6 +382,8 @@
::unlink(socketName);
mpCommandSocketInfo->mListeningSocket.Listen(Socket::TypeUNIX, socketName);
}
+
+#endif // WIN32
// Handle things nicely on exceptions
try
@@ -253,6 +407,11 @@
delete mpCommandSocketInfo;
mpCommandSocketInfo = 0;
}
+
+#ifdef WIN32
+ // clean up windows specific stuff.
+ FiniTimer();
+#endif
}
// --------------------------------------------------------------------------
@@ -303,9 +462,9 @@
// When the last sync started (only updated if the store was not full when the sync ended)
box_time_t lastSyncTime = 0;
+
+ // --------------------------------------------------------------------------------------------
- // --------------------------------------------------------------------------------------------
-
// And what's the current client store marker?
int64_t clientStoreMarker = BackupClientContext::ClientStoreMarker_NotKnown; // haven't contacted the store yet
@@ -409,6 +568,8 @@
// Do sync
bool errorOccurred = false;
int errorCode = 0, errorSubCode = 0;
+ const char* errorString = "unknown";
+
try
{
// Set state and log start
@@ -512,6 +673,7 @@
catch(BoxException &e)
{
errorOccurred = true;
+ errorString = e.what();
errorCode = e.GetType();
errorSubCode = e.GetSubType();
}
@@ -555,8 +717,13 @@
{
// Not restart/terminate, pause and retry
SetState(State_Error);
- ::syslog(LOG_ERR, "Exception caught (%d/%d), reset state and waiting to retry...", errorCode, errorSubCode);
- ::sleep(100);
+ ::syslog(LOG_ERR,
+ "Exception caught (%s %d/%d), "
+ "reset state and waiting "
+ "to retry...",
+ errorString, errorCode,
+ errorSubCode);
+ ::sleep(10);
}
}
@@ -665,6 +832,29 @@
// --------------------------------------------------------------------------
void BackupDaemon::WaitOnCommandSocket(box_time_t RequiredDelay, bool &DoSyncFlagOut, bool &SyncIsForcedOut)
{
+#ifdef WIN32
+ // Really could use some interprocess protection, mutex etc
+ // any side effect should be too bad???? :)
+ DWORD timeout = BoxTimeToMilliSeconds(RequiredDelay);
+
+ while ( this->mReceivedCommandConn == false )
+ {
+ Sleep(1);
+
+ if ( timeout == 0 )
+ {
+ DoSyncFlagOut = false;
+ SyncIsForcedOut = false;
+ return;
+ }
+ timeout--;
+ }
+ this->mReceivedCommandConn = false;
+ DoSyncFlagOut = this->mDoSyncFlagOut;
+ SyncIsForcedOut = this->mSyncIsForcedOut;
+
+ return;
+#else // ! WIN32
ASSERT(mpCommandSocketInfo != 0);
if(mpCommandSocketInfo == 0) {::sleep(1); return;} // failure case isn't too bad
@@ -713,9 +903,9 @@
}
}
}
-#endif
+#endif // PLATFORM_CANNOT_FIND_PEER_UID_OF_UNIX_SOCKET
- // Is this an acceptible connection?
+ // Is this an acceptable connection?
if(!uidOK)
{
// Dump the connection
@@ -833,6 +1023,7 @@
CloseCommandConnection();
}
}
+#endif // WIN32
}
@@ -849,13 +1040,17 @@
try
{
TRACE0("Closing command connection\n");
-
+
+#ifdef WIN32
+ mpCommandSocketInfo->mListeningSocket.Close();
+#else
if(mpCommandSocketInfo->mpGetLine)
{
delete mpCommandSocketInfo->mpGetLine;
mpCommandSocketInfo->mpGetLine = 0;
}
mpCommandSocketInfo->mpConnectedSocket.reset();
+#endif
}
catch(...)
{
@@ -875,15 +1070,27 @@
// --------------------------------------------------------------------------
void BackupDaemon::SendSyncStartOrFinish(bool SendStart)
{
-
// The bbackupctl program can't rely on a state change, because it may never
// change if the server doesn't need to be contacted.
- if(mpCommandSocketInfo != 0 && mpCommandSocketInfo->mpConnectedSocket.get() != 0)
+ if (mpCommandSocketInfo != NULL &&
+#ifdef WIN32
+ mpCommandSocketInfo->mListeningSocket.IsConnected()
+#else
+ mpCommandSocketInfo->mpConnectedSocket.get() != 0
+#endif
+ )
{
+ const char* message = SendStart ? "start-sync\n" : "finish-sync\n";
try
{
- mpCommandSocketInfo->mpConnectedSocket->Write(SendStart?"start-sync\n":"finish-sync\n", SendStart?11:12);
+#ifdef WIN32
+ mpCommandSocketInfo->mListeningSocket.Write(message,
+ strlen(message));
+#else
+ mpCommandSocketInfo->mpConnectedSocket->Write(message,
+ strlen(message));
+#endif
}
catch(...)
{
@@ -958,6 +1165,7 @@
std::map<std::string, int> mounts;
int numIDMaps = 0;
+#ifdef HAVE_MOUNTS
#ifndef HAVE_STRUCT_STATFS_F_MNTONNAME
// Linux and others can't tell you where a directory is mounted. So we
// have to read the mount entries from /etc/mtab! Bizarre that the OS
@@ -996,7 +1204,7 @@
::endmntent(mountPointsFile);
throw;
}
-#else
+#else // ! HAVE_STRUCT_MNTENT_MNT_DIR
// Open mounts file
mountPointsFile = ::fopen("/etc/mnttab", "r");
if(mountPointsFile == 0)
@@ -1023,7 +1231,7 @@
::fclose(mountPointsFile);
throw;
}
-#endif
+#endif // HAVE_STRUCT_MNTENT_MNT_DIR
// Check sorting and that things are as we expect
ASSERT(mountPoints.size() > 0);
#ifndef NDEBUG
@@ -1033,6 +1241,7 @@
}
#endif // n NDEBUG
#endif // n HAVE_STRUCT_STATFS_F_MNTONNAME
+#endif // HAVE_MOUNTS
// Then... go through each of the entries in the configuration,
// making sure there's a directory created for it.
@@ -1054,7 +1263,9 @@
// Do a fsstat on the pathname to find out which mount it's on
{
-#ifdef HAVE_STRUCT_STATFS_F_MNTONNAME
+
+#if defined HAVE_STRUCT_STATFS_F_MNTONNAME || defined WIN32
+
// BSD style statfs -- includes mount point, which is nice.
struct statfs s;
if(::statfs(ploc->mPath.c_str(), &s) != 0)
@@ -1064,7 +1275,9 @@
// Where the filesystem is mounted
std::string mountName(s.f_mntonname);
-#else
+
+#else // !HAVE_STRUCT_STATFS_F_MNTONNAME && !WIN32
+
// Warn in logs if the directory isn't absolute
if(ploc->mPath[0] != '/')
{
@@ -1090,6 +1303,7 @@
}
TRACE2("mount point chosen for %s is %s\n", ploc->mPath.c_str(), mountName.c_str());
}
+
#endif
// Got it?
@@ -1376,6 +1590,10 @@
std::string newmap(target + ".n");
// Try to rename
+#ifdef WIN32
+ // win32 rename doesn't overwrite existing files
+ ::remove(target.c_str());
+#endif
if(::rename(newmap.c_str(), target.c_str()) != 0)
{
THROW_EXCEPTION(CommonException, OSFileError)
@@ -1457,14 +1675,33 @@
// Set process title
const static char *stateText[] = {"idle", "connected", "error -- waiting for retry", "over limit on server -- not backing up"};
SetProcessTitle(stateText[State]);
-
+
// If there's a command socket connected, then inform it -- disconnecting from the
// command socket if there's an error
+
+ char newState[64];
+ char newStateSize = sprintf(newState, "state %d\n", State);
+
+#ifdef WIN32
+ #warning FIX ME: race condition
+ // what happens if the socket is closed by the other thread before
+ // we can write to it? Null pointer deref at best.
+ if (mpCommandSocketInfo &&
+ mpCommandSocketInfo->mListeningSocket.IsConnected())
+ {
+ try
+ {
+ mpCommandSocketInfo->mListeningSocket.Write(newState, newStateSize);
+ }
+ catch(...)
+ {
+ CloseCommandConnection();
+ }
+ }
+#else
if(mpCommandSocketInfo != 0 && mpCommandSocketInfo->mpConnectedSocket.get() != 0)
{
// Something connected to the command socket, tell it about the new state
- char newState[64];
- char newStateSize = sprintf(newState, "state %d\n", State);
try
{
mpCommandSocketInfo->mpConnectedSocket->Write(newState, newStateSize);
@@ -1474,6 +1711,7 @@
CloseCommandConnection();
}
}
+#endif
}
@@ -1658,4 +1896,3 @@
mpGetLine = 0;
}
}
-
Modified: box/trunk/bin/bbackupd/BackupDaemon.h
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.h 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/bin/bbackupd/BackupDaemon.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -19,6 +19,7 @@
#include "Socket.h"
#include "SocketListen.h"
#include "SocketStream.h"
+#include "WinNamedPipeStream.h"
class BackupClientDirectoryRecord;
class BackupClientContext;
@@ -146,8 +147,12 @@
CommandSocketInfo(const CommandSocketInfo &); // no copying
CommandSocketInfo &operator=(const CommandSocketInfo &);
public:
+#ifdef WIN32
+ WinNamedPipeStream mListeningSocket;
+#else
SocketListen<SocketStream, 1 /* listen backlog */> mListeningSocket;
std::auto_ptr<SocketStream> mpConnectedSocket;
+#endif
IOStreamGetLine *mpGetLine;
};
@@ -160,7 +165,14 @@
// Unused entries in the root directory wait a while before being deleted
box_time_t mDeleteUnusedRootDirEntriesAfter; // time to delete them
std::vector<std::pair<int64_t,std::string> > mUnusedRootDirEntries;
+
+#ifdef WIN32
+ public:
+ void RunHelperThread(void);
+
+ private:
+ bool mDoSyncFlagOut, mSyncIsForcedOut, mReceivedCommandConn;
+#endif
};
#endif // BACKUPDAEMON__H
-
Copied: box/trunk/bin/bbackupd/Win32BackupService.cpp (from rev 210, box/chris/win32/merge/07-win32-fixes/bin/bbackupd/Win32BackupService.cpp)
Copied: box/trunk/bin/bbackupd/Win32BackupService.h (from rev 210, box/chris/win32/merge/07-win32-fixes/bin/bbackupd/Win32BackupService.h)
Copied: box/trunk/bin/bbackupd/Win32ServiceFunctions.cpp (from rev 210, box/chris/win32/merge/07-win32-fixes/bin/bbackupd/Win32ServiceFunctions.cpp)
Copied: box/trunk/bin/bbackupd/Win32ServiceFunctions.h (from rev 210, box/chris/win32/merge/07-win32-fixes/bin/bbackupd/Win32ServiceFunctions.h)
Modified: box/trunk/bin/bbackupd/bbackupd.cpp
===================================================================
--- box/trunk/bin/bbackupd/bbackupd.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/bin/bbackupd/bbackupd.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -11,16 +11,84 @@
#include "BackupDaemon.h"
#include "MainHelper.h"
#include "BoxPortsAndFiles.h"
+#include "BackupStoreException.h"
#include "MemLeakFindOn.h"
+#ifdef WIN32
+ #include "Win32ServiceFunctions.h"
+ #include "Win32BackupService.h"
+
+ extern Win32BackupService gDaemonService;
+#endif
+
int main(int argc, const char *argv[])
{
MAINHELPER_START
+#ifdef WIN32
+
+ ::openlog("Box Backup (bbackupd)", 0, 0);
+
+ if(argc == 2 &&
+ (::strcmp(argv[1], "--help") == 0 ||
+ ::strcmp(argv[1], "-h") == 0))
+ {
+ printf("-h help, -i install service, -r remove service,\n"
+ "-c <config file> start daemon now");
+ return 2;
+ }
+ if(argc == 2 && ::strcmp(argv[1], "-r") == 0)
+ {
+ RemoveService();
+ return 0;
+ }
+ if(argc == 2 && ::strcmp(argv[1], "-i") == 0)
+ {
+ InstallService();
+ return 0;
+ }
+
+ // Under win32 we must initialise the Winsock library
+ // before using sockets
+
+ WSADATA info;
+
+ if (WSAStartup(MAKELONG(1, 1), &info) == SOCKET_ERROR)
+ {
+ // box backup will not run without sockets
+ ::syslog(LOG_ERR, "Failed to initialise Windows Sockets");
+ THROW_EXCEPTION(BackupStoreException, Internal)
+ }
+
+ EnableBackupRights();
+
+ int ExitCode = 0;
+
+ if (argc == 2 && ::strcmp(argv[1], "--service") == 0)
+ {
+ syslog(LOG_INFO,"Starting Box Backup Service");
+ OurService();
+ }
+ else
+ {
+ ExitCode = gDaemonService.Main(
+ BOX_FILE_BBACKUPD_DEFAULT_CONFIG, argc, argv);
+ }
+
+ // Clean up our sockets
+ WSACleanup();
+
+ ::closelog();
+
+ return ExitCode;
+
+#else // !WIN32
+
BackupDaemon daemon;
return daemon.Main(BOX_FILE_BBACKUPD_DEFAULT_CONFIG, argc, argv);
-
+
+#endif // WIN32
+
MAINHELPER_END
}
-
Copied: box/trunk/bin/bbackupd/win32 (from rev 210, box/chris/win32/merge/07-win32-fixes/bin/bbackupd/win32)
Deleted: box/trunk/bin/bbackupd/win32/ReadMe.txt
===================================================================
--- box/chris/win32/merge/07-win32-fixes/bin/bbackupd/win32/ReadMe.txt 2005-12-12 02:03:39 UTC (rev 210)
+++ box/trunk/bin/bbackupd/win32/ReadMe.txt 2005-12-12 20:50:00 UTC (rev 213)
@@ -1,24 +0,0 @@
-Upgrade instructions
-
-Version 0.09g to 0.09h
-
-This version included patches to the server as well. The server for this
-upgrade can be found at http://home.earthlink.net/~gniemcew/ but hopefully
-will be merged into the core in the next release.
-
-New values in the bbackupd.conf can now be added:
-
-StoreObjectInfoFile = C:\Program Files\Box Backup\bbackupd\bbackupd.dat
-
-This stores the state when a backup daemon is shutdown.
-
-KeepAliveTime = 250
-
-This is imperative if MaximumDiffingTime is larger than 300, this stops the ssl
-layer timing out when a diff is performed. It is wise to set MaximumDiffingTime
-long enough for the largest file you may have. If you do not wish to upgrade your
-server then make KeepAliveTime greater than MaximumDiffingTime.
-
-Have fun
-
-Nick
Copied: box/trunk/bin/bbackupd/win32/ReadMe.txt (from rev 210, box/chris/win32/merge/07-win32-fixes/bin/bbackupd/win32/ReadMe.txt)
Deleted: box/trunk/bin/bbackupd/win32/bbackupd.conf
===================================================================
--- box/chris/win32/merge/07-win32-fixes/bin/bbackupd/win32/bbackupd.conf 2005-12-12 02:03:39 UTC (rev 210)
+++ box/trunk/bin/bbackupd/win32/bbackupd.conf 2005-12-12 20:50:00 UTC (rev 213)
@@ -1,143 +0,0 @@
-
-StoreHostname = yourhost
-AccountNumber = 0x1
-KeysFile = C:\Program Files\Box Backup\1-FileEncKeys.raw
-
-CertificateFile = C:\Program Files\Box Backup\1-cert.pem
-PrivateKeyFile = C:\Program Files\Box Backup\1-key.pem
-TrustedCAsFile = C:\Program Files\Box Backup\serverCA.pem
-
-DataDirectory = C:\Program Files\Box Backup\bbackupd
-
-# If you do not install it in the default location - also do not forget to
-# change the pid file location (below)
-
-
-# This script is run whenever bbackupd encounters a problem which requires
-# the system administrator to assist:
-# 1) The store is full, and no more data can be uploaded.
-# 2) Some files or directories were not readable.
-# The default script emails the system administrator.
-
-# NotifyScript = NotifySysadmin.sh
-
-
-# A scan of the local discs will be made once an hour (approximately).
-# To avoid cycles of load on the server, this time is randomly adjusted by a small
-# percentage as the daemon runs.
-
-UpdateStoreInterval = 3600
-
-
-# A file must have been modified at least 6 hours ago before it will be uploaded.
-
-MinimumFileAge = 21600
-
-
-# If a file is modified repeated, it won't be uploaded immediately in case it's modified again.
-# However, it should be uploaded eventually. This is how long we should wait after first noticing
-# a change. (1 day)
-
-MaxUploadWait = 86400
-
-
-# Files above this size (in bytes) are tracked, and if they are renamed they will simply be
-# renamed on the server, rather than being uploaded again. (64k - 1)
-
-FileTrackingSizeThreshold = 65535
-
-
-# The daemon does "changes only" uploads for files above this size (in bytes).
-# Files less than it are uploaded whole without this extra processing.
-
-DiffingUploadSizeThreshold = 8192
-
-
-# The limit on how much time is spent diffing files. Most files shouldn't take very long,
-# but if you have really big files you can use this to limit the time spent diffing them.
-# * Reduce if you are having problems with processor usage.
-# * Increase if you have large files, and think the upload of changes is too large and want
-# to spend more time searching for unchanged blocks.
-
-MaximumDiffingTime = 20
-
-# KeepAliveTime requires Gary's SSL KeepAlive patches
-# KeepAliveTime = 250
-
-# Uncomment this line to see exactly what the daemon is going when it's connected to the server.
-
-# ExtendedLogging = yes
-
-
-# Use this to temporarily stop bbackupd from syncronising or connecting to the store.
-# This specifies a program or script script which is run just before each sync, and ideally
-# the full path to the interpreter. It will be run as the same user bbackupd is running as,
-# usually root.
-# The script prints either "now" or a number to STDOUT (and a terminating newline, no quotes).
-# If the result was "now", then the sync will happen. If it's a number, then the script will
-# be asked again in that number of seconds.
-# For example, you could use this on a laptop to only backup when on a specific network.
-
-# SyncAllowScript = /path/to/intepreter/or/exe script-name parameters etc
-
-
-# Where the command socket is created in the filesystem.
-
-CommandSocket = pipe
-
-
-Server
-{
- PidFile = C:\Program Files\Box Backup\bbackupd\bbackupd.pid
-}
-
-# StoreObjectInfoFile requires Gary's client marker serialisation patch
-# StoreObjectInfoFile = C:\Program Files\Box Backup\bbackupd\bbackupd.dat
-
-#
-# BackupLocations specifies which locations on disc should be backed up. Each
-# directory is in the format
-#
-# name
-# {
-# Path = /path/of/directory
-# (optional exclude directives)
-# }
-#
-# 'name' is derived from the Path by the config script, but should merely be
-# unique.
-#
-# The exclude directives are of the form
-#
-# [Exclude|AlwaysInclude][File|Dir][|sRegex] = regex or full pathname
-#
-# (The regex suffix is shown as 'sRegex' to make File or Dir plural)
-#
-# For example:
-#
-# ExcludeDir = /home/guest-user
-# ExcludeFilesRegex = *.(mp3|MP3)$
-# AlwaysIncludeFile = /home/username/veryimportant.mp3
-#
-# This excludes the directory /home/guest-user from the backup along with all mp3
-# files, except one MP3 file in particular.
-#
-# In general, Exclude excludes a file or directory, unless the directory is
-# explicitly mentioned in a AlwaysInclude directive.
-#
-# If a directive ends in Regex, then it is a regular expression rather than a
-# explicit full pathname. See
-#
-# man 7 re_format
-#
-# for the regex syntax on your platform.
-#
-
-BackupLocations
-{
- MyDocuments
- {
- Path = C:\Documents and Settings\
- }
-}
-
Copied: box/trunk/bin/bbackupd/win32/bbackupd.conf (from rev 210, box/chris/win32/merge/07-win32-fixes/bin/bbackupd/win32/bbackupd.conf)
Deleted: box/trunk/bin/bbackupd/win32/installer.iss
===================================================================
--- box/chris/win32/merge/07-win32-fixes/bin/bbackupd/win32/installer.iss 2005-12-12 02:03:39 UTC (rev 210)
+++ box/trunk/bin/bbackupd/win32/installer.iss 2005-12-12 20:50:00 UTC (rev 213)
@@ -1,51 +0,0 @@
-; Script to generate output file for Box Backup client for the Windows Platform
-;
-; Very important - this is the release process
-;
-; 1/ Upgrade BOX_VERSION in the file emu.h to the current version for example 0.09eWin32 - then perform a full rebuild
-;
-; 2/ Upgrade the AppVerName below to reflect the version
-;
-; 3/ Generate the output file, then rename it to the relevent filename to reflect the version
-
-[Setup]
-AppName=Box Backup
-AppVerName=BoxWin32 0.09h
-AppPublisher=Fluffy & Omniis
-AppPublisherURL=http://www.omniis.com
-AppSupportURL=http://www.omniis.com
-AppUpdatesURL=http://www.omniis.com
-DefaultDirName={pf}\Box Backup
-DefaultGroupName=Box Backup
-Compression=lzma
-SolidCompression=yes
-PrivilegesRequired=admin
-
-[Files]
-Source: "..\..\Release\bbackupd.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace
-Source: "..\..\Release\bbackupctl.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace
-Source: "..\..\Release\bbackupquery.exe"; DestDir: "{app}"; Flags: ignoreversion restartreplace
-Source: "..\..\ExceptionCodes.txt"; DestDir: "{app}"; Flags: ignoreversion restartreplace
-Source: "icon.ico"; DestDir: "{app}\"; Flags: ignoreversion restartreplace
-Source: "msvcr71.dll"; DestDir: "{app}\"; Flags: restartreplace
-Source: "bbackupd.conf"; DestDir: "{app}"; Flags: confirmoverwrite
-Source: "..\..\..\zlib\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace
-Source: "..\..\..\openssl\bin\libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace
-Source: "..\..\..\openssl\bin\ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace
-Source: "ReadMe.txt"; DestDir: "{app}"; Flags: ignoreversion restartreplace
-
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\Box Backup Query"; Filename: "{app}\bbackupquery.exe"; IconFilename: "{app}\icon.ico" ;Parameters: "-c bbackupd.conf"; WorkingDir: "{app}"
-Name: "{group}\Service\Install Service"; Filename: "{app}\bbackupd.exe"; IconFilename: "{app}\icon.ico" ;Parameters: "-i"; WorkingDir: "{app}"
-Name: "{group}\Service\Remove Service"; Filename: "{app}\bbackupd.exe"; IconFilename: "{app}\icon.ico" ;Parameters: "-r"; WorkingDir: "{app}"
-Name: "{group}\Initiate Backup Now"; Filename: "{app}\bbackupctl.exe"; IconFilename: "{app}\icon.ico" ;Parameters: "-c bbackupd.conf sync"; WorkingDir: "{app}"
-
-[Dirs]
-Name: "{app}\bbackupd"
-
-[Run]
-Filename: "{app}\bbackupd.exe"; Description: "Install Boxbackup as service"; Parameters: "-i"; Flags: postinstall
-Filename: "{app}\Readme.txt"; Description: "View upgrade notes"; Flags: postinstall shellexec skipifsilent
-
Copied: box/trunk/bin/bbackupd/win32/installer.iss (from rev 210, box/chris/win32/merge/07-win32-fixes/bin/bbackupd/win32/installer.iss)
Modified: box/trunk/bin/bbackupquery/BackupQueries.cpp
===================================================================
--- box/trunk/bin/bbackupquery/BackupQueries.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/bin/bbackupquery/BackupQueries.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -380,7 +380,11 @@
{
// add object ID to line
char oid[32];
+#ifdef WIN32
+ sprintf(oid, "%08I64x ", en->GetObjectID());
+#else
sprintf(oid, "%08llx ", en->GetObjectID());
+#endif
line += oid;
}
@@ -404,6 +408,7 @@
}
// attributes flags
*(f++) = (en->HasAttributes())?'a':'-';
+
// terminate
*(f++) = ' ';
*(f++) = '\0';
@@ -424,14 +429,22 @@
if(opts[LIST_OPTION_DISPLAY_HASH])
{
char hash[64];
+#ifdef WIN32
+ ::sprintf(hash, "%016I64x ", en->GetAttributesHash());
+#else
::sprintf(hash, "%016llx ", en->GetAttributesHash());
+#endif
line += hash;
}
if(opts[LIST_OPTION_SIZEINBLOCKS])
{
char num[32];
+#ifdef WIN32
+ sprintf(num, "%05I64d ", en->GetSizeInBlocks());
+#else
sprintf(num, "%05lld ", en->GetSizeInBlocks());
+#endif
line += num;
}
@@ -1034,7 +1047,8 @@
}
// Then get it compared
- Compare(std::string("/") + rLocation, loc.GetKeyValue("Path"), rParams);
+ Compare(std::string(DIRECTORY_SEPARATOR) + rLocation,
+ loc.GetKeyValue("Path"), rParams);
}
catch(...)
{
@@ -1165,7 +1179,7 @@
#ifndef HAVE_VALID_DIRENT_D_TYPE
std::string fn(rLocalDir);
- fn += '/';
+ fn += DIRECTORY_SEPARATOR_ASCHAR;
fn += localDirEn->d_name;
struct stat st;
if(::lstat(fn.c_str(), &st) != 0)
Modified: box/trunk/bin/bbackupquery/bbackupquery.cpp
===================================================================
--- box/trunk/bin/bbackupquery/bbackupquery.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/bin/bbackupquery/bbackupquery.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -56,6 +56,19 @@
{
MAINHELPER_SETUP_MEMORY_LEAK_EXIT_REPORT("bbackupquery.memleaks", "bbackupquery")
+#ifdef WIN32
+ WSADATA info;
+
+ // Under Win32 we must initialise the Winsock library
+ // before using it.
+
+ if (WSAStartup(MAKELONG(1, 1), &info) == SOCKET_ERROR)
+ {
+ // throw error? perhaps give it its own id in the furture
+ THROW_EXCEPTION(BackupStoreException, Internal)
+ }
+#endif
+
// Really don't want trace statements happening, even in debug mode
#ifndef NDEBUG
BoxDebugTraceOn = false;
@@ -253,7 +266,11 @@
MAINHELPER_END
- exit(returnCode);
+#ifdef WIN32
+ // Clean up our sockets
+ WSACleanup();
+#endif
+
return returnCode;
}
Modified: box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp
===================================================================
--- box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -70,7 +70,11 @@
double mb = (Blocks * BlockSizeOfDiscSet(DiscSet)) / (1024.0*1024.0);
// Format string
+#ifdef WIN32
+ sprintf(string, "%I64d (%.2fMb)", Blocks, mb);
+#else
sprintf(string, "%lld (%.2fMb)", Blocks, mb);
+#endif
return string;
}
Copied: box/trunk/boxbackup.sln (from rev 210, box/chris/win32/merge/07-win32-fixes/boxbackup.sln)
Copied: box/trunk/boxbackup.suo (from rev 210, box/chris/win32/merge/07-win32-fixes/boxbackup.suo)
Copied: box/trunk/boxquery.vcproj (from rev 210, box/chris/win32/merge/07-win32-fixes/boxquery.vcproj)
Copied: box/trunk/common.vcproj (from rev 210, box/chris/win32/merge/07-win32-fixes/common.vcproj)
Copied: box/trunk/config.guess (from rev 210, box/chris/win32/merge/07-win32-fixes/config.guess)
Copied: box/trunk/config.sub (from rev 210, box/chris/win32/merge/07-win32-fixes/config.sub)
Modified: box/trunk/configure.ac
===================================================================
--- box/trunk/configure.ac 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/configure.ac 2005-12-12 20:50:00 UTC (rev 213)
@@ -6,6 +6,10 @@
AC_CONFIG_SRCDIR([lib/common/Box.h])
AC_CONFIG_HEADERS([lib/common/config.h])
+touch install-sh
+AC_CANONICAL_SYSTEM
+# echo "Build target OS: '$target_os'"
+test -s install-sh || rm install-sh
### Checks for programs.
@@ -26,9 +30,11 @@
### Checks for libraries.
+if test "$target_os" != "mingw32" -a "$target_os" != "winnt"; then
+AC_SEARCH_LIBS([nanosleep], [rt], [ac_have_nanosleep=yes],
+ [AC_MSG_ERROR([[Cannot find a short sleep function (nanosleep)]])])
+fi
-AC_SEARCH_LIBS([nanosleep], [rt],,
- [AC_MSG_ERROR([[Cannot find library with nanosleep]])])
AC_CHECK_LIB([z], [zlibVersion],, [AC_MSG_ERROR([[Cannot find zlib]])])
AX_CHECK_BDB_V1
VL_LIB_READLINE
@@ -89,8 +95,12 @@
AC_SYS_LARGEFILE
AX_CHECK_LLONG_MINMAX
AX_CHECK_DEFINE_PRAGMA
+
+if test "$target_os" != "mingw32"; then
AX_RANDOM_DEVICE
-AX_CHECK_MOUNT_POINT(, [AC_MSG_ERROR([[cannot work out how to discover mount points on your platform]])])
+fi
+
+AX_CHECK_MOUNT_POINT([],[])
AX_CHECK_MALLOC_WORKAROUND
@@ -124,12 +134,6 @@
AC_CHECK_FUNCS([flock])
AC_CHECK_DECLS([O_EXLOCK],,, [[#include <fcntl.h>]])
AC_CHECK_DECLS([F_SETLK],,, [[#include <fcntl.h>]])
-if test "x$ac_cv_func_flock" != "xyes" && \
- test "x$ac_cv_have_decl_O_EXLOCK" != "xyes" && \
- test "x$ac_cv_have_decl_F_SETLK" != "xyes"
-then
- AC_MSG_ERROR([[cannot work out how to do file locking on your platform]])
-fi
## Get tmpdir
temp_directory_name="/tmp"
@@ -144,7 +148,7 @@
[static-bin],
[AC_HELP_STRING([--enable-static-bin], [Link binaries with static libraries])])
if test "x$enable_static_bin" = "xyes"; then
- AC_CHECK_LIB([ssl],[SSL_read])
+ AC_CHECK_LIB([ssl],[SSL_read],[],[],[crypto])
LIBS="-Wl,-Bstatic $LIBS -Wl,-Bdynamic"
fi
Copied: box/trunk/docs/backup/Win32_Clients.txt (from rev 210, box/chris/win32/merge/07-win32-fixes/docs/backup/Win32_Clients.txt)
Copied: box/trunk/docs/backup/win32_build_on_cygwin_using_mingw.txt (from rev 210, box/chris/win32/merge/07-win32-fixes/docs/backup/win32_build_on_cygwin_using_mingw.txt)
Copied: box/trunk/docs/backup/win32_build_on_linux_using_mingw.txt (from rev 210, box/chris/win32/merge/07-win32-fixes/docs/backup/win32_build_on_linux_using_mingw.txt)
Modified: box/trunk/infrastructure/BoxPlatform.pm.in
===================================================================
--- box/trunk/infrastructure/BoxPlatform.pm.in 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/infrastructure/BoxPlatform.pm.in 2005-12-12 20:50:00 UTC (rev 213)
@@ -1,7 +1,7 @@
package BoxPlatform;
use Exporter;
@ISA = qw/Exporter/;
-@EXPORT = qw/$build_os $build_cpu $make_command $bsd_make $platform_define $platform_cpu $gcc_v3 $product_version $product_name $install_into_dir $sub_make_options $platform_compile_line_extra $platform_link_line_extra $platform_lib_files/;
+@EXPORT = qw/$build_os $build_cpu $target_os $make_command $bsd_make $platform_define $platform_cpu $gcc_v3 $product_version $product_name $install_into_dir $sub_make_options $platform_compile_line_extra $platform_link_line_extra $platform_lib_files $platform_exe_ext/;
BEGIN
{
@@ -23,9 +23,11 @@
$platform_compile_line_extra = '@CPPFLAGS@ @CXXFLAGS@ @CXXFLAGS_STRICT@';
$platform_link_line_extra = '@LDFLAGS@';
$platform_lib_files = '@LIBS@';
+ $target_os = '@target_os@';
+ $platform_exe_ext = '@EXEEXT@';
# get version
- open VERSION,"VERSION.txt";
+ open VERSION,"VERSION.txt" or die "VERSION.txt: $!";
$product_version = <VERSION>;
chomp $product_version;
$product_name = <VERSION>;
Modified: box/trunk/infrastructure/m4/ax_check_mount_point.m4
===================================================================
--- box/trunk/infrastructure/m4/ax_check_mount_point.m4 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/infrastructure/m4/ax_check_mount_point.m4 2005-12-12 20:50:00 UTC (rev 213)
@@ -3,6 +3,7 @@
dnl This macro will find out how to get mount point information if possible.
dnl
dnl The following defines will be set as appropriate:
+dnl HAVE_MOUNTS
dnl HAVE_MNTENT_H
dnl HAVE_SYS_MNTTAB_H
dnl HAVE_SYS_MOUNT_H
@@ -35,6 +36,7 @@
test "x$ac_cv_member_struct_mntent_mnt_dir" = "xyes" || \
test "x$ac_cv_member_struct_mnttab_mnt_mountp" = "xyes"
then
+ AC_DEFINE([HAVE_MOUNTS], [1], [Define to 1 if this platform supports mounts])
m4_ifvaln([$1],[$1],[:])dnl
m4_ifvaln([$2],[else $2])dnl
fi
Modified: box/trunk/infrastructure/m4/ax_check_ssl.m4
===================================================================
--- box/trunk/infrastructure/m4/ax_check_ssl.m4 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/infrastructure/m4/ax_check_ssl.m4 2005-12-12 20:50:00 UTC (rev 213)
@@ -27,7 +27,7 @@
ax_check_ssl_found=yes
AC_CHECK_HEADERS([openssl/ssl.h],, [ax_check_ssl_found=no])
- AC_CHECK_LIB([ssl], [SSL_read],, [ax_check_ssl_found=no])
+ AC_CHECK_LIB([ssl], [SSL_read],, [ax_check_ssl_found=no], [-lcrypto])
if test "x$ax_check_ssl_found" = "xyes"; then
AC_DEFINE([HAVE_SSL], 1, [Define to 1 if SSL is available])
Modified: box/trunk/infrastructure/makebuildenv.pl
===================================================================
--- box/trunk/infrastructure/makebuildenv.pl 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/infrastructure/makebuildenv.pl 2005-12-12 20:50:00 UTC (rev 213)
@@ -182,6 +182,7 @@
print "Scanning code...\n";
my $modules_omitted = 0;
+my $modules_omitting = 0;
# process lines in flattened modules files
for(@modules_files)
@@ -191,16 +192,20 @@
next unless m/\S/;
# omit bits on some platforms?
- next if m/\AEND-OMIT/;
+ if(m/\AEND-OMIT/)
+ {
+ $modules_omitting = 0;
+ next;
+ }
+
+ next if $modules_omitting;
+
if(m/\AOMIT:(.+)/)
{
- if($1 eq $build_os)
+ if($1 eq $build_os or $1 eq $target_os)
{
$modules_omitted = 1;
- while(<MODULES>)
- {
- last if m/\AEND-OMIT/;
- }
+ $modules_omitting = 1;
}
next;
}
@@ -402,8 +407,10 @@
close TESTFILE;
}
- writetestfile("$mod/_t", './test $1 $2 $3 $4 $5', $mod);
- writetestfile("$mod/_t-gdb", 'gdb ./test', $mod);
+ writetestfile("$mod/_t",
+ './test${platform_exe_ext} $1 $2 $3 $4 $5', $mod);
+ writetestfile("$mod/_t-gdb",
+ 'gdb ./test${platform_exe_ext}', $mod);
}
@@ -440,15 +447,26 @@
# make include path
- my $include_paths = join(' ',map {'-I../../'.$_} @all_deps_for_module);
+ my $include_paths = "-I../../lib/win32 " .
+ join(' ',map {'-I../../'.$_} @all_deps_for_module);
# is target a library?
my $target_is_library = ($type ne 'bin' && $type ne 'test');
# make target name
my $end_target = $name;
- $end_target .= '.a' if $target_is_library;
- $end_target = 'test' if $type eq 'test';
+
+ if ($target_is_library)
+ {
+ $end_target .= '.a';
+ }
+ else
+ {
+ $end_target .= $platform_exe_ext;
+ }
+
+ $end_target = 'test'.$platform_exe_ext if $type eq 'test';
+
# adjust for outdir
$end_target = '$(OUTDIR)/' . $end_target;
@@ -456,6 +474,13 @@
my $mk_name_extra = ($bsd_make)?'':'X';
open MAKE,">$mod/Makefile".$mk_name_extra or die "Can't open Makefile for $mod\n";
my $debug_link_extra = ($target_is_library)?'':'../../debug/lib/debug/debug.a';
+
+ my $release_flags = "-O2";
+ if ($target_os eq "mingw32")
+ {
+ $release_flags = "-O0 -g";
+ }
+
print MAKE <<__E;
#
# AUTOMATICALLY GENERATED FILE
@@ -466,7 +491,7 @@
AR = ar
RANLIB = ranlib
.ifdef RELEASE
-CXXFLAGS = -DNDEBUG -O2 -Wall $include_paths $extra_platform_defines -DBOX_VERSION="\\"$product_version\\""
+CXXFLAGS = -DNDEBUG $release_flags -Wall $include_paths $extra_platform_defines -DBOX_VERSION="\\"$product_version\\""
OUTBASE = ../../release
OUTDIR = ../../release/$mod
DEPENDMAKEFLAGS = -D RELEASE
@@ -567,6 +592,7 @@
my $has_deps = ($#{$module_dependency{$mod}} >= 0);
# ----- # always has dependencies with debug library
$has_deps = 1;
+ $has_deps = 0 if $target_is_library;
# Depenency stuff
my $deps_makeinfo;
@@ -613,7 +639,7 @@
my $o_file_list = join(' ',map {'$(OUTDIR)/'.$_.'.o'} @objs);
print MAKE $end_target,': ',$o_file_list;
- print MAKE ' dep_modules' if !$bsd_make;
+ print MAKE ' dep_modules' if $has_deps and not $bsd_make;
print MAKE " ",$lib_files unless $target_is_library;
print MAKE "\n";
@@ -658,7 +684,7 @@
# dependency line?
print MAKE "\n";
- # module dependcies for GNU make?
+ # module dependencies for GNU make?
print MAKE $deps_makeinfo if !$bsd_make;
# print the rest of the file
Modified: box/trunk/infrastructure/makeparcels.pl
===================================================================
--- box/trunk/infrastructure/makeparcels.pl 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/infrastructure/makeparcels.pl 2005-12-12 20:50:00 UTC (rev 213)
@@ -26,7 +26,7 @@
next if m/\AEND-OMIT/;
if(m/\AOMIT:(.+)/)
{
- if($1 eq $build_os)
+ if($1 eq $build_os or $1 eq $target_os)
{
while(<PARCELS>)
{
@@ -35,6 +35,21 @@
}
next;
}
+
+ if (m'\AONLY:(.+)')
+ {
+ my @only_targets = split m'\,', $1;
+
+ if (not grep {$_ eq $build_os or $_ eq $target_os}
+ @only_targets)
+ {
+ while (<PARCELS>)
+ {
+ last if m'\AEND-ONLY';
+ }
+ next;
+ }
+ }
# new parcel, or a new parcel definition?
if(m/\A\s+(.+)\Z/)
@@ -100,7 +115,7 @@
if($type eq 'bin')
{
- my $exeext = ($build_os eq 'CYGWIN')?'.exe':'';
+ my $exeext = $platform_exe_ext;
print MAKE "\t(cd bin/$name; \$(MAKE) $release_flag)\n";
print MAKE "\tcp release/bin/$name/$name$exeext $dir\n";
}
Modified: box/trunk/lib/backupclient/BackupClientFileAttributes.cpp
===================================================================
--- box/trunk/lib/backupclient/BackupClientFileAttributes.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/backupclient/BackupClientFileAttributes.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -287,7 +287,7 @@
//
// --------------------------------------------------------------------------
void BackupClientFileAttributes::ReadAttributes(const char *Filename, bool ZeroModificationTimes, box_time_t *pModTime,
- box_time_t *pAttrModTime, int64_t *pFileSize, ino_t *pInodeNumber, bool *pHasMultipleLinks)
+ box_time_t *pAttrModTime, int64_t *pFileSize, InodeRefType *pInodeNumber, bool *pHasMultipleLinks)
{
StreamableMemBlock *pnewAttr = 0;
try
@@ -309,14 +309,46 @@
FillAttributes(*pnewAttr, Filename, st, ZeroModificationTimes);
+#ifndef WIN32
// Is it a link?
if((st.st_mode & S_IFMT) == S_IFLNK)
{
FillAttributesLink(*pnewAttr, Filename, st);
}
+#endif
FillExtendedAttr(*pnewAttr, Filename);
+#ifdef WIN32
+ //this is to catch those problems with invalid time stamps stored...
+ //need to find out the reason why - but also a catch as well.
+
+ attr_StreamFormat *pattr =
+ (attr_StreamFormat*)pnewAttr->GetBuffer();
+ ASSERT(pattr != 0);
+
+ // __time64_t winTime = BoxTimeToSeconds(
+ // pnewAttr->ModificationTime);
+
+ box_time_t bob = BoxTimeToSeconds(pattr->ModificationTime);
+ __time64_t winTime = bob;
+ if (_gmtime64(&winTime) == 0 )
+ {
+ ::syslog(LOG_ERR, "Corrupt value in store "
+ "Modification Time in file %s", Filename);
+ pattr->ModificationTime = 0;
+ }
+
+ bob = BoxTimeToSeconds(pattr->AttrModificationTime);
+ winTime = bob;
+ if (_gmtime64(&winTime) == 0 )
+ {
+ ::syslog(LOG_ERR, "Corrupt value in store "
+ "Attr Modification Time in file %s", Filename);
+ pattr->AttrModificationTime = 0;
+ }
+#endif
+
// Attributes ready. Encrypt into this block
EncryptAttr(*pnewAttr);
@@ -372,7 +404,7 @@
pattr->FileGenerationNumber = htonl(st.st_gen);
#endif
}
-
+#ifndef WIN32
// --------------------------------------------------------------------------
//
// Function
@@ -402,6 +434,7 @@
std::memcpy(buffer+oldSize, linkedTo, linkedToSize);
buffer[oldSize+linkedToSize] = '\0';
}
+#endif
// --------------------------------------------------------------------------
//
@@ -574,12 +607,18 @@
THROW_EXCEPTION(BackupStoreException, AttributesNotLoaded);
}
+#ifdef WIN32
+ ::syslog(LOG_WARNING,
+ "Cannot create symbolic links on Windows: %s",
+ Filename);
+#else
// Make a symlink, first deleting anything in the way
::unlink(Filename);
if(::symlink((char*)(pattr + 1), Filename) != 0)
{
THROW_EXCEPTION(CommonException, OSFileError)
}
+#endif
xattrOffset += std::strlen(reinterpret_cast<char*>(pattr+1))+1;
}
@@ -943,6 +982,3 @@
uint64_t result = *((uint64_t *)(digest.DigestAsData()));
return result;
}
-
-
-
Modified: box/trunk/lib/backupclient/BackupClientFileAttributes.h
===================================================================
--- box/trunk/lib/backupclient/BackupClientFileAttributes.h 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/backupclient/BackupClientFileAttributes.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -44,7 +44,7 @@
void ReadAttributes(const char *Filename, bool ZeroModificationTimes = false,
box_time_t *pModTime = 0, box_time_t *pAttrModTime = 0, int64_t *pFileSize = 0,
- ino_t *pInodeNumber = 0, bool *pHasMultipleLinks = 0);
+ InodeRefType *pInodeNumber = 0, bool *pHasMultipleLinks = 0);
void WriteAttributes(const char *Filename) const;
bool IsSymLink() const;
Modified: box/trunk/lib/backupclient/BackupStoreFile.cpp
===================================================================
--- box/trunk/lib/backupclient/BackupStoreFile.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/backupclient/BackupStoreFile.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -15,7 +15,9 @@
#include <new>
#include <string.h>
#ifndef BOX_DISABLE_BACKWARDS_COMPATIBILITY_BACKUPSTOREFILE
- #include <syslog.h>
+ #ifndef WIN32
+ #include <syslog.h>
+ #endif
#include <stdio.h>
#endif
Modified: box/trunk/lib/backupclient/BackupStoreFileDiff.cpp
===================================================================
--- box/trunk/lib/backupclient/BackupStoreFileDiff.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/backupclient/BackupStoreFileDiff.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -12,7 +12,11 @@
#include <new>
#include <map>
#include <signal.h>
+#ifdef WIN32
+#include <time.h>
+#else
#include <sys/time.h>
+#endif
#include "BackupStoreFile.h"
#include "BackupStoreFileWire.h"
@@ -989,7 +993,11 @@
for(unsigned int e = 0; e < rRecipe.size(); ++e)
{
char b[64];
+#ifdef WIN32
+ sprintf(b, "%8I64d", (int64_t)(rRecipe[e].mpStartBlock - pIndex));
+#else
sprintf(b, "%8lld", (int64_t)(rRecipe[e].mpStartBlock - pIndex));
+#endif
TRACE3("%8lld %s %8lld\n", rRecipe[e].mSpaceBefore, (rRecipe[e].mpStartBlock == 0)?" -":b, (int64_t)rRecipe[e].mBlocks);
}
}
Modified: box/trunk/lib/backupclient/BackupStoreObjectDump.cpp
===================================================================
--- box/trunk/lib/backupclient/BackupStoreObjectDump.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/backupclient/BackupStoreObjectDump.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -96,11 +96,19 @@
int depends_l = 0;
if((*i)->GetDependsNewer() != 0)
{
+#ifdef WIN32
+ depends_l += ::sprintf(depends + depends_l, " depNew(%I64x)", (*i)->GetDependsNewer());
+#else
depends_l += ::sprintf(depends + depends_l, " depNew(%llx)", (*i)->GetDependsNewer());
+#endif
}
if((*i)->GetDependsOlder() != 0)
{
+#ifdef WIN32
+ depends_l += ::sprintf(depends + depends_l, " depOld(%I64x)", (*i)->GetDependsOlder());
+#else
depends_l += ::sprintf(depends + depends_l, " depOld(%llx)", (*i)->GetDependsOlder());
+#endif
}
// Output item
Modified: box/trunk/lib/common/BoxPlatform.h
===================================================================
--- box/trunk/lib/common/BoxPlatform.h 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/common/BoxPlatform.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -11,13 +11,24 @@
#ifndef BOXPLATFORM__H
#define BOXPLATFORM__H
+#ifdef WIN32
+#define DIRECTORY_SEPARATOR "\\"
+#define DIRECTORY_SEPARATOR_ASCHAR '\\'
+#else
#define DIRECTORY_SEPARATOR "/"
-#define DIRECTORY_SEPARATOR_ASCHAR '/'
+#define DIRECTORY_SEPARATOR_ASCHAR '/'
+#endif
#define PLATFORM_DEV_NULL "/dev/null"
#include "config.h"
+#ifdef WIN32
+ // need msvcrt version 6.1 or higher for _gmtime64()
+ // must define this before importing <sys/types.h>
+ #define __MSVCRT_VERSION__ 0x0601
+#endif
+
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
@@ -51,6 +62,27 @@
#define STRUCTURE_PACKING_FOR_WIRE_USE_HEADERS
#endif
+#if defined WIN32 && !defined __MINGW32__
+ typedef __int8 int8_t;
+ typedef __int16 int16_t;
+ typedef __int32 int32_t;
+ typedef __int64 int64_t;
+
+ typedef unsigned __int8 u_int8_t;
+ typedef unsigned __int16 u_int16_t;
+ typedef unsigned __int32 u_int32_t;
+ typedef unsigned __int64 u_int64_t;
+
+ #define HAVE_UINT8_T
+ #define HAVE_UINT16_T
+ #define HAVE_UINT32_T
+ #define HAVE_UINT64_T
+
+ typedef unsigned int uid_t;
+ typedef unsigned int gid_t;
+ typedef int pid_t;
+#endif // WIN32 && !__MINGW32__
+
// Define missing types
#ifndef HAVE_UINT8_T
typedef u_int8_t uint8_t;
@@ -88,4 +120,15 @@
#define INFTIM -1
#endif
+#ifdef WIN32
+ typedef u_int64_t InodeRefType;
+#else
+ typedef ino_t InodeRefType;
+#endif
+
+#ifdef WIN32
+ #define WIN32_LEAN_AND_MEAN
+ #include "emu.h"
+#endif
+
#endif // BOXPLATFORM__H
Modified: box/trunk/lib/common/BoxPortsAndFiles.h
===================================================================
--- box/trunk/lib/common/BoxPortsAndFiles.h 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/common/BoxPortsAndFiles.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -20,12 +20,17 @@
#define BOX_RAIDFILE_ROOT_BBSTORED "backup"
// Backup client daemon
+#ifdef WIN32
+#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "C:\\Program Files\\Box Backup\\bbackupd.conf"
+#else
#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "/etc/box/bbackupd.conf"
+#endif
-
-// RaidFile conf location efault
+// RaidFile conf location default
#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "/etc/box/raidfile.conf"
+// Default name of the named pipe
+#define BOX_NAMED_PIPE_NAME L"\\\\.\\pipe\\boxbackup"
#endif // BOXPORTSANDFILES__H
Modified: box/trunk/lib/common/BoxTime.h
===================================================================
--- box/trunk/lib/common/BoxTime.h 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/common/BoxTime.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -31,11 +31,11 @@
{
return ((box_time_t)Seconds * MICRO_SEC_IN_SEC_LL);
}
-inline int64_t BoxTimeToSeconds(box_time_t Time)
+inline box_time_t BoxTimeToSeconds(box_time_t Time)
{
return Time / MICRO_SEC_IN_SEC_LL;
}
-inline int64_t BoxTimeToMilliSeconds(box_time_t Time)
+inline box_time_t BoxTimeToMilliSeconds(box_time_t Time)
{
return Time / MILLI_SEC_IN_NANO_SEC_LL;
}
Modified: box/trunk/lib/common/BoxTimeToText.cpp
===================================================================
--- box/trunk/lib/common/BoxTimeToText.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/common/BoxTimeToText.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -27,14 +27,35 @@
// --------------------------------------------------------------------------
std::string BoxTimeToISO8601String(box_time_t Time)
{
+#ifdef WIN32
+ struct tm *time;
+ box_time_t bob = BoxTimeToSeconds(Time);
+
+ __time64_t winTime = bob;
+
+ time = _gmtime64(&winTime);
+ char str[128]; // more than enough space
+
+ if ( time == NULL )
+ {
+ // ::sprintf(str, "%016I64x ", bob);
+ return std::string("unable to convert time");
+ }
+
+ sprintf(str, "%04d-%02d-%02dT%02d:%02d:%02d", time->tm_year + 1900,
+ time->tm_mon + 1, time->tm_mday, time->tm_hour,
+ time->tm_min, time->tm_sec);
+#else // ! WIN32
time_t timeInSecs = (time_t)BoxTimeToSeconds(Time);
struct tm time;
gmtime_r(&timeInSecs, &time);
char str[128]; // more than enough space
sprintf(str, "%04d-%02d-%02dT%02d:%02d:%02d", time.tm_year + 1900,
- time.tm_mon + 1, time.tm_mday, time.tm_hour, time.tm_min, time.tm_sec);
-
+ time.tm_mon + 1, time.tm_mday, time.tm_hour,
+ time.tm_min, time.tm_sec);
+#endif // WIN32
+
return std::string(str);
}
Modified: box/trunk/lib/common/BoxTimeToUnix.h
===================================================================
--- box/trunk/lib/common/BoxTimeToUnix.h 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/common/BoxTimeToUnix.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -10,7 +10,11 @@
#ifndef FILEMODIFICATIONTIMETOTIMEVAL__H
#define FILEMODIFICATIONTIMETOTIMEVAL__H
+#ifdef WIN32
+#include <time.h>
+#else
#include <sys/time.h>
+#endif
#include "BoxTime.h"
Modified: box/trunk/lib/common/CommonException.txt
===================================================================
--- box/trunk/lib/common/CommonException.txt 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/common/CommonException.txt 2005-12-12 20:50:00 UTC (rev 213)
@@ -42,3 +42,4 @@
KEventErrorRemove 35
KQueueNotSupportedOnThisPlatform 36
IOStreamGetLineNotEnoughDataToIgnore 37 Bad value passed to IOStreamGetLine::IgnoreBufferedData()
+TempDirPathTooLong 38 Your temporary directory path is too long. Check the TMP and TEMP environment variables.
Modified: box/trunk/lib/common/DebugPrintf.cpp
===================================================================
--- box/trunk/lib/common/DebugPrintf.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/common/DebugPrintf.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -55,10 +55,16 @@
// But tracing to syslog is independent of tracing being on or not
if(BoxDebugTraceToSyslog)
{
+#ifdef WIN32
// Remove trailing '\n', if it's there
+ if(r > 0 && text[r-1] == '\n')
+ {
+ text[r-1] = '\0';
+#else
if(r > 0 && text[r] == '\n')
{
text[r] = '\0';
+#endif
--r;
}
// Log it
Modified: box/trunk/lib/common/FileStream.cpp
===================================================================
--- box/trunk/lib/common/FileStream.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/common/FileStream.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -22,14 +22,25 @@
//
// --------------------------------------------------------------------------
FileStream::FileStream(const char *Filename, int flags, int mode)
+#ifdef WIN32
+ : mOSFileHandle(::openfile(Filename, flags, mode)),
+#else
: mOSFileHandle(::open(Filename, flags, mode)),
+#endif
mIsEOF(false)
{
+#ifdef WIN32
+ if(mOSFileHandle == 0)
+#else
if(mOSFileHandle < 0)
+#endif
{
MEMLEAKFINDER_NOT_A_LEAK(this);
THROW_EXCEPTION(CommonException, OSFileOpenError)
}
+#ifdef WIN32
+ this->fileName = Filename;
+#endif
}
@@ -41,7 +52,7 @@
// Created: 2003/08/28
//
// --------------------------------------------------------------------------
-FileStream::FileStream(int FileDescriptor)
+FileStream::FileStream(tOSFileHandle FileDescriptor)
: mOSFileHandle(FileDescriptor),
mIsEOF(false)
{
@@ -52,7 +63,7 @@
}
}
-
+#if 0
// --------------------------------------------------------------------------
//
// Function
@@ -71,6 +82,7 @@
THROW_EXCEPTION(CommonException, OSFileOpenError)
}
}
+#endif // 0
// --------------------------------------------------------------------------
//
@@ -82,7 +94,7 @@
// --------------------------------------------------------------------------
FileStream::~FileStream()
{
- if(mOSFileHandle >= 0)
+ if(mOSFileHandle != INVALID_FILE)
{
Close();
}
@@ -98,8 +110,33 @@
// --------------------------------------------------------------------------
int FileStream::Read(void *pBuffer, int NBytes, int Timeout)
{
- if(mOSFileHandle == -1) {THROW_EXCEPTION(CommonException, FileClosed)}
+ if(mOSFileHandle == INVALID_FILE)
+ {
+ THROW_EXCEPTION(CommonException, FileClosed)
+ }
+
+#ifdef WIN32
+ int r;
+ DWORD numBytesRead = 0;
+ BOOL valid = ReadFile(
+ this->mOSFileHandle,
+ pBuffer,
+ NBytes,
+ &numBytesRead,
+ NULL
+ );
+
+ if ( valid )
+ {
+ r = numBytesRead;
+ }
+ else
+ {
+ r = -1;
+ }
+#else
int r = ::read(mOSFileHandle, pBuffer, NBytes);
+#endif
if(r == -1)
{
THROW_EXCEPTION(CommonException, OSFileReadError)
@@ -143,11 +180,34 @@
// --------------------------------------------------------------------------
void FileStream::Write(const void *pBuffer, int NBytes)
{
- if(mOSFileHandle == -1) {THROW_EXCEPTION(CommonException, FileClosed)}
+ if(mOSFileHandle == INVALID_FILE)
+ {
+ THROW_EXCEPTION(CommonException, FileClosed)
+ }
+
+#ifdef WIN32
+ DWORD numBytesWritten = 0;
+ BOOL res = WriteFile(
+ this->mOSFileHandle,
+ pBuffer,
+ NBytes,
+ &numBytesWritten,
+ NULL
+ );
+
+ if ( (res == 0) || (numBytesWritten != NBytes))
+ {
+ DWORD err = GetLastError();
+ THROW_EXCEPTION(CommonException, OSFileWriteError)
+ }
+
+
+#else
if(::write(mOSFileHandle, pBuffer, NBytes) != NBytes)
{
THROW_EXCEPTION(CommonException, OSFileWriteError)
}
+#endif
}
@@ -161,7 +221,21 @@
// --------------------------------------------------------------------------
IOStream::pos_type FileStream::GetPosition() const
{
- if(mOSFileHandle == -1) {THROW_EXCEPTION(CommonException, FileClosed)}
+ if(mOSFileHandle == INVALID_FILE)
+ {
+ THROW_EXCEPTION(CommonException, FileClosed)
+ }
+
+#ifdef WIN32
+ LARGE_INTEGER conv;
+
+ conv.HighPart = 0;
+ conv.LowPart = 0;
+
+ conv.LowPart = SetFilePointer(this->mOSFileHandle, 0, &conv.HighPart, FILE_CURRENT);
+
+ return (IOStream::pos_type)conv.QuadPart;
+#else // ! WIN32
off_t p = ::lseek(mOSFileHandle, 0, SEEK_CUR);
if(p == -1)
{
@@ -169,6 +243,7 @@
}
return (IOStream::pos_type)p;
+#endif // WIN32
}
@@ -182,12 +257,28 @@
// --------------------------------------------------------------------------
void FileStream::Seek(IOStream::pos_type Offset, int SeekType)
{
- if(mOSFileHandle == -1) {THROW_EXCEPTION(CommonException, FileClosed)}
+ if(mOSFileHandle == INVALID_FILE)
+ {
+ THROW_EXCEPTION(CommonException, FileClosed)
+ }
+
+#ifdef WIN32
+ LARGE_INTEGER conv;
+
+ conv.QuadPart = Offset;
+ DWORD retVal = SetFilePointer(this->mOSFileHandle, conv.LowPart, &conv.HighPart, ConvertSeekTypeToOSWhence(SeekType));
+
+ if ( retVal == INVALID_SET_FILE_POINTER && (GetLastError() != NO_ERROR) )
+ {
+ THROW_EXCEPTION(CommonException, OSFileError)
+ }
+#else // ! WIN32
if(::lseek(mOSFileHandle, Offset, ConvertSeekTypeToOSWhence(SeekType)) == -1)
{
THROW_EXCEPTION(CommonException, OSFileError)
}
-
+#endif // WIN32
+
// Not end of file any more!
mIsEOF = false;
}
@@ -207,12 +298,21 @@
{
THROW_EXCEPTION(CommonException, FileAlreadyClosed)
}
+#ifdef WIN32
+ if(::CloseHandle(mOSFileHandle) == 0)
+ {
+ THROW_EXCEPTION(CommonException, OSFileCloseError)
+ }
+ mOSFileHandle = NULL;
+ mIsEOF = true;
+#else
if(::close(mOSFileHandle) != 0)
{
THROW_EXCEPTION(CommonException, OSFileCloseError)
}
mOSFileHandle = -1;
mIsEOF = true;
+#endif
}
Modified: box/trunk/lib/common/FileStream.h
===================================================================
--- box/trunk/lib/common/FileStream.h 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/common/FileStream.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -17,12 +17,26 @@
#include <sys/stat.h>
#include <unistd.h>
+#ifdef WIN32
+ #define INVALID_FILE NULL
+ typedef HANDLE tOSFileHandle;
+#else
+ #define INVALID_FILE -1
+ typedef int tOSFileHandle;
+#endif
+
class FileStream : public IOStream
{
public:
- FileStream(const char *Filename, int flags = O_RDONLY, int mode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
- FileStream(int FileDescriptor);
- FileStream(const FileStream &rToCopy);
+ FileStream(const char *Filename,
+#ifdef WIN32
+ int flags = (O_RDONLY | O_BINARY),
+#else
+ int flags = O_RDONLY,
+#endif
+ int mode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
+ FileStream(tOSFileHandle FileDescriptor);
+
virtual ~FileStream();
virtual int Read(void *pBuffer, int NBytes, int Timeout = IOStream::TimeOutInfinite);
@@ -36,8 +50,14 @@
virtual bool StreamClosed();
private:
- int mOSFileHandle;
+ tOSFileHandle mOSFileHandle;
bool mIsEOF;
+ FileStream(const FileStream &rToCopy) { /* do not call */ }
+
+#ifdef WIN32
+ // for debugging..
+ std::string fileName;
+#endif
};
Modified: box/trunk/lib/common/IOStream.cpp
===================================================================
--- box/trunk/lib/common/IOStream.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/common/IOStream.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -105,7 +105,18 @@
int ostype = SEEK_SET;
switch(SeekType)
{
+#ifdef WIN32
case SeekType_Absolute:
+ ostype = FILE_BEGIN;
+ break;
+ case SeekType_Relative:
+ ostype = FILE_CURRENT;
+ break;
+ case SeekType_End:
+ ostype = FILE_END;
+ break;
+#else // ! WIN32
+ case SeekType_Absolute:
ostype = SEEK_SET;
break;
case SeekType_Relative:
@@ -114,6 +125,7 @@
case SeekType_End:
ostype = SEEK_END;
break;
+#endif // WIN32
default:
THROW_EXCEPTION(CommonException, IOStreamBadSeekType)
Modified: box/trunk/lib/common/NamedLock.cpp
===================================================================
--- box/trunk/lib/common/NamedLock.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/common/NamedLock.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -105,7 +105,7 @@
THROW_EXCEPTION(CommonException, OSFileError)
}
}
-#else
+#elif HAVE_DECL_F_SETLK
struct flock desc;
desc.l_type = F_WRLCK;
desc.l_whence = SEEK_SET;
Modified: box/trunk/lib/common/TemporaryDirectory.h
===================================================================
--- box/trunk/lib/common/TemporaryDirectory.h 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/common/TemporaryDirectory.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -12,15 +12,35 @@
#include <string>
-#ifdef TEMP_DIRECTORY_NAME
- // Prefix name with Box to avoid clashing with OS API names
- inline std::string BoxGetTemporaryDirectoryName()
+#ifdef WIN32
+ #include <windows.h>
+#endif
+
+// Prefix name with Box to avoid clashing with OS API names
+std::string BoxGetTemporaryDirectoryName()
+{
+#ifdef WIN32
+ // http://msdn.microsoft.com/library/default.asp?
+ // url=/library/en-us/fileio/fs/creating_and_using_a_temporary_file.asp
+
+ DWORD dwRetVal;
+ char lpPathBuffer[1024];
+ DWORD dwBufSize = sizeof(lpPathBuffer);
+
+ // Get the temp path.
+ dwRetVal = GetTempPath(dwBufSize, // length of the buffer
+ lpPathBuffer); // buffer for path
+ if (dwRetVal > dwBufSize)
{
- return std::string(TEMP_DIRECTORY_NAME);
+ THROW_EXCEPTION(CommonException, TempDirPathTooLong)
}
-#else
- non-static temporary directory names not supported yet
+
+ return std::string(lpPathBuffer);
+#elif defined TEMP_DIRECTORY_NAME
+ return std::string(TEMP_DIRECTORY_NAME);
+#else
+ #error non-static temporary directory names not supported yet
#endif
+}
#endif // TEMPORARYDIRECTORY__H
-
Modified: box/trunk/lib/common/UnixUser.cpp
===================================================================
--- box/trunk/lib/common/UnixUser.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/common/UnixUser.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -9,7 +9,10 @@
#include "Box.h"
+#ifndef WIN32
#include <pwd.h>
+#endif
+
#include <unistd.h>
#include "UnixUser.h"
Modified: box/trunk/lib/common/WaitForEvent.h
===================================================================
--- box/trunk/lib/common/WaitForEvent.h 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/common/WaitForEvent.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -15,7 +15,9 @@
#include <sys/time.h>
#else
#include <vector>
- #include <poll.h>
+ #ifndef WIN32
+ #include <poll.h>
+ #endif
#endif
#include "CommonException.h"
Modified: box/trunk/lib/server/Daemon.cpp
===================================================================
--- box/trunk/lib/server/Daemon.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/server/Daemon.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -11,11 +11,14 @@
#include <stdio.h>
#include <unistd.h>
-#include <syslog.h>
#include <signal.h>
#include <string.h>
#include <stdarg.h>
+#ifndef WIN32
+#include <syslog.h>
+#endif
+
#include "Daemon.h"
#include "Configuration.h"
#include "ServerException.h"
@@ -140,6 +143,7 @@
// Let the derived class have a go at setting up stuff in the initial process
SetupInInitialProcess();
+#ifndef WIN32
// Set signal handler
struct sigaction sa;
sa.sa_handler = SignalHandler;
@@ -219,12 +223,14 @@
break;
}
}
+#endif // ! WIN32
// open the log
::openlog(DaemonName(), LOG_PID, LOG_LOCAL6);
// Log the start message
::syslog(LOG_INFO, "Starting daemon (config: %s) (version " BOX_VERSION ")", configfile);
+#ifndef WIN32
// Write PID to file
char pid[32];
int pidsize = sprintf(pid, "%d", (int)getpid());
@@ -233,6 +239,7 @@
::syslog(LOG_ERR, "can't write pid file");
THROW_EXCEPTION(ServerException, DaemoniseFailed)
}
+#endif
// Set up memory leak reporting
#ifdef BOX_MEMORY_LEAK_TESTING
@@ -245,6 +252,7 @@
if(asDaemon)
{
+#ifndef WIN32
// Close standard streams
::close(0);
::close(1);
@@ -265,8 +273,9 @@
{
::close(devnull);
}
-
- // And definately don't try and send anything to those file descriptors
+#endif // ! WIN32
+
+ // And definitely don't try and send anything to those file descriptors
// -- this has in the past sent text to something which isn't expecting it.
TRACE_TO_STDOUT(false);
}
@@ -357,6 +366,7 @@
// --------------------------------------------------------------------------
void Daemon::EnterChild()
{
+#ifndef WIN32
// Unset signal handlers
struct sigaction sa;
sa.sa_handler = SIG_DFL;
@@ -364,6 +374,7 @@
sigemptyset(&sa.sa_mask); // macro
::sigaction(SIGHUP, &sa, NULL);
::sigaction(SIGTERM, &sa, NULL);
+#endif
}
@@ -377,6 +388,7 @@
// --------------------------------------------------------------------------
void Daemon::SignalHandler(int sigraised)
{
+#ifndef WIN32
if(spDaemon != 0)
{
switch(sigraised)
@@ -393,6 +405,7 @@
break;
}
}
+#endif
}
// --------------------------------------------------------------------------
@@ -534,5 +547,3 @@
#endif // HAVE_SETPROCTITLE
}
-
-
Modified: box/trunk/lib/server/LocalProcessStream.cpp
===================================================================
--- box/trunk/lib/server/LocalProcessStream.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/server/LocalProcessStream.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -9,7 +9,9 @@
#include "Box.h"
+#ifndef WIN32
#include <sys/socket.h>
+#endif
#include <unistd.h>
#include "LocalProcessStream.h"
@@ -36,6 +38,8 @@
// Split up command
std::vector<std::string> command;
SplitString(std::string(CommandLine), ' ', command);
+
+#ifndef WIN32
// Build arguments
char *args[MAX_ARGUMENTS + 4];
{
@@ -94,6 +98,11 @@
// Return the stream object and PID
rPidOut = pid;
return stream;
+#else // WIN32
+ ::syslog(LOG_ERR, "vfork not implemented - LocalProcessStream.cpp");
+ std::auto_ptr<IOStream> stream;
+ return stream;
+#endif // ! WIN32
}
Modified: box/trunk/lib/server/SSLLib.cpp
===================================================================
--- box/trunk/lib/server/SSLLib.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/server/SSLLib.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -14,7 +14,9 @@
#include <openssl/err.h>
#include <openssl/rand.h>
+#ifndef WIN32
#include <syslog.h>
+#endif
#include "SSLLib.h"
#include "ServerException.h"
Modified: box/trunk/lib/server/ServerStream.h
===================================================================
--- box/trunk/lib/server/ServerStream.h 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/server/ServerStream.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -10,11 +10,14 @@
#ifndef SERVERSTREAM__H
#define SERVERSTREAM__H
-#include <syslog.h>
#include <stdlib.h>
#include <errno.h>
-#include <sys/wait.h>
+#ifndef WIN32
+ #include <syslog.h>
+ #include <sys/wait.h>
+#endif
+
#include "Daemon.h"
#include "SocketListen.h"
#include "Utils.h"
Modified: box/trunk/lib/server/Socket.cpp
===================================================================
--- box/trunk/lib/server/Socket.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/server/Socket.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -11,11 +11,13 @@
#include <unistd.h>
#include <sys/types.h>
+#ifndef WIN32
#include <sys/socket.h>
#include <netdb.h>
#include <syslog.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#endif
#include <string.h>
#include <stdio.h>
@@ -72,6 +74,7 @@
}
break;
+#ifndef WIN32
case TypeUNIX:
sockDomain = AF_UNIX;
{
@@ -89,7 +92,8 @@
::strcpy(addr.sa_unix.sun_path, Name);
}
break;
-
+#endif
+
default:
THROW_EXCEPTION(CommonException, BadArguments)
break;
Modified: box/trunk/lib/server/Socket.h
===================================================================
--- box/trunk/lib/server/Socket.h 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/server/Socket.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -10,16 +10,23 @@
#ifndef SOCKET__H
#define SOCKET__H
+#ifdef WIN32
+#include "emu.h"
+typedef int socklen_t;
+#else
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/un.h>
+#endif
#include <string>
typedef union {
struct sockaddr sa_generic;
struct sockaddr_in sa_inet;
+#ifndef WIN32
struct sockaddr_un sa_unix;
+#endif
} SocketAllAddr;
// --------------------------------------------------------------------------
Modified: box/trunk/lib/server/SocketListen.h
===================================================================
--- box/trunk/lib/server/SocketListen.h 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/server/SocketListen.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -12,15 +12,20 @@
#include <errno.h>
#include <unistd.h>
-#include <new>
-#include <poll.h>
-#include <memory>
-#include <string>
+
#ifdef HAVE_KQUEUE
#include <sys/event.h>
#include <sys/time.h>
#endif
+#ifndef WIN32
+ #include <poll.h>
+#endif
+
+#include <new>
+#include <memory>
+#include <string>
+
#include "Socket.h"
#include "ServerException.h"
@@ -94,7 +99,11 @@
{
if(mSocketHandle != -1)
{
+#ifdef WIN32
+ if(::closesocket(mSocketHandle) == -1)
+#else
if(::close(mSocketHandle) == -1)
+#endif
{
THROW_EXCEPTION(ServerException, SocketCloseError)
}
@@ -128,8 +137,12 @@
}
// Set an option to allow reuse (useful for -HUP situations!)
+#ifdef WIN32
+ if(::setsockopt(mSocketHandle, SOL_SOCKET, SO_REUSEADDR, "", 0) == -1)
+#else
int option = true;
if(::setsockopt(mSocketHandle, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option)) == -1)
+#endif
{
THROW_EXCEPTION(ServerException, SocketOpenError)
}
Modified: box/trunk/lib/server/SocketStream.cpp
===================================================================
--- box/trunk/lib/server/SocketStream.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/server/SocketStream.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -11,9 +11,12 @@
#include <unistd.h>
#include <sys/types.h>
-#include <poll.h>
#include <errno.h>
+#ifndef WIN32
+#include <poll.h>
+#endif
+
#include "SocketStream.h"
#include "ServerException.h"
#include "CommonException.h"
@@ -140,7 +143,11 @@
if(::connect(mSocketHandle, &addr.sa_generic, addrLen) == -1)
{
// Dispose of the socket
+#ifdef WIN32
+ ::closesocket(mSocketHandle);
+#else
::close(mSocketHandle);
+#endif
mSocketHandle = -1;
THROW_EXCEPTION(ConnectionException, Conn_SocketConnectError)
}
@@ -191,7 +198,11 @@
}
}
+#ifdef WIN32
+ int r = ::recv(mSocketHandle, (char*)pBuffer, NBytes, 0);
+#else
int r = ::read(mSocketHandle, pBuffer, NBytes);
+#endif
if(r == -1)
{
if(errno == EINTR)
@@ -236,7 +247,11 @@
while(bytesLeft > 0)
{
// Try to send.
+#ifdef WIN32
+ int sent = ::send(mSocketHandle, buffer, bytesLeft, 0);
+#else
int sent = ::write(mSocketHandle, buffer, bytesLeft);
+#endif
if(sent == -1)
{
// Error.
@@ -283,8 +298,11 @@
void SocketStream::Close()
{
if(mSocketHandle == -1) {THROW_EXCEPTION(ServerException, BadSocketHandle)}
-
+#ifdef WIN32
+ if(::closesocket(mSocketHandle) == -1)
+#else
if(::close(mSocketHandle) == -1)
+#endif
{
THROW_EXCEPTION(ServerException, SocketCloseError)
}
@@ -354,7 +372,7 @@
// Created: 2003/08/06
//
// --------------------------------------------------------------------------
-int SocketStream::GetSocketHandle()
+tOSSocketHandle SocketStream::GetSocketHandle()
{
if(mSocketHandle == -1) {THROW_EXCEPTION(ServerException, BadSocketHandle)}
return mSocketHandle;
Modified: box/trunk/lib/server/SocketStream.h
===================================================================
--- box/trunk/lib/server/SocketStream.h 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/server/SocketStream.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -12,6 +12,12 @@
#include "IOStream.h"
+#ifdef WIN32
+ typedef SOCKET tOSSocketHandle;
+#else
+ typedef int tOSSocketHandle;
+#endif
+
// --------------------------------------------------------------------------
//
// Class
@@ -42,12 +48,12 @@
virtual bool GetPeerCredentials(uid_t &rUidOut, gid_t &rGidOut);
protected:
- int GetSocketHandle();
+ tOSSocketHandle GetSocketHandle();
void MarkAsReadClosed() {mReadClosed = true;}
void MarkAsWriteClosed() {mWriteClosed = true;}
private:
- int mSocketHandle;
+ tOSSocketHandle mSocketHandle;
bool mReadClosed;
bool mWriteClosed;
};
Modified: box/trunk/lib/server/SocketStreamTLS.cpp
===================================================================
--- box/trunk/lib/server/SocketStreamTLS.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/server/SocketStreamTLS.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -12,10 +12,13 @@
#define TLS_CLASS_IMPLEMENTATION_CPP
#include <openssl/ssl.h>
#include <openssl/bio.h>
-#include <poll.h>
#include <errno.h>
#include <fcntl.h>
+#ifndef WIN32
+#include <poll.h>
+#endif
+
#include "SocketStreamTLS.h"
#include "SSLLib.h"
#include "ServerException.h"
@@ -120,7 +123,8 @@
SSLLib::LogError("Create socket bio");
THROW_EXCEPTION(ServerException, TLSAllocationFailed)
}
- int socket = GetSocketHandle();
+
+ tOSSocketHandle socket = GetSocketHandle();
BIO_set_fd(mpBIO, socket, BIO_NOCLOSE);
// Then the SSL object
@@ -131,6 +135,7 @@
THROW_EXCEPTION(ServerException, TLSAllocationFailed)
}
+#ifndef WIN32
// Make the socket non-blocking so timeouts on Read work
// This is more portable than using ioctl with FIONBIO
int statusFlags = 0;
@@ -139,6 +144,7 @@
{
THROW_EXCEPTION(ServerException, SocketSetNonBlockingFailed)
}
+#endif
// FIXME: This is less portable than the above. However, it MAY be needed
// for cygwin, which has/had bugs with fcntl
@@ -464,5 +470,3 @@
// Done.
return std::string(commonName);
}
-
-
Modified: box/trunk/lib/server/makeprotocol.pl
===================================================================
--- box/trunk/lib/server/makeprotocol.pl 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/lib/server/makeprotocol.pl 2005-12-12 20:50:00 UTC (rev 213)
@@ -182,7 +182,11 @@
if($implement_syslog)
{
- print H qq~#include <syslog.h>\n~;
+ print H <<EOF;
+#ifndef WIN32
+#include <syslog.h>
+#endif
+EOF
}
Copied: box/trunk/lib/win32 (from rev 210, box/chris/win32/merge/07-win32-fixes/lib/win32)
Deleted: box/trunk/lib/win32/WinNamedPipeStream.cpp
===================================================================
--- box/chris/win32/merge/07-win32-fixes/lib/win32/WinNamedPipeStream.cpp 2005-12-12 02:03:39 UTC (rev 210)
+++ box/trunk/lib/win32/WinNamedPipeStream.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -1,301 +0,0 @@
-// --------------------------------------------------------------------------
-//
-// File
-// Name: WinNamedPipeStream.cpp
-// Purpose: I/O stream interface for Win32 named pipes
-// Created: 2005/12/07
-//
-// --------------------------------------------------------------------------
-
-#include "Box.h"
-
-#ifdef WIN32
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <windows.h>
-
-#include "WinNamedPipeStream.h"
-#include "ServerException.h"
-#include "CommonException.h"
-#include "Socket.h"
-
-#include "MemLeakFindOn.h"
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: WinNamedPipeStream::WinNamedPipeStream()
-// Purpose: Constructor (create stream ready for Open() call)
-// Created: 2005/12/07
-//
-// --------------------------------------------------------------------------
-WinNamedPipeStream::WinNamedPipeStream()
- : mSocketHandle(NULL),
- mReadClosed(false),
- mWriteClosed(false),
- mIsServer(false),
- mIsConnected(false)
-{
-}
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: WinNamedPipeStream::~WinNamedPipeStream()
-// Purpose: Destructor, closes stream if open
-// Created: 2005/12/07
-//
-// --------------------------------------------------------------------------
-WinNamedPipeStream::~WinNamedPipeStream()
-{
- if (mSocketHandle != NULL)
- {
- Close();
- }
-}
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: WinNamedPipeStream::Accept(const char* Name)
-// Purpose: Creates a new named pipe with the given name,
-// and wait for a connection on it
-// Created: 2005/12/07
-//
-// --------------------------------------------------------------------------
-void WinNamedPipeStream::Accept(const wchar_t* pName)
-{
- if (mSocketHandle != NULL || mIsConnected)
- {
- THROW_EXCEPTION(ServerException, SocketAlreadyOpen)
- }
-
- mSocketHandle = CreateNamedPipeW(
- pName, // pipe name
- PIPE_ACCESS_DUPLEX, // read/write access
- PIPE_TYPE_MESSAGE | // message type pipe
- PIPE_READMODE_MESSAGE | // message-read mode
- PIPE_WAIT, // blocking mode
- 1, // max. instances
- 4096, // output buffer size
- 4096, // input buffer size
- NMPWAIT_USE_DEFAULT_WAIT, // client time-out
- NULL); // default security attribute
-
- if (mSocketHandle == NULL)
- {
- ::syslog(LOG_ERR, "CreateNamedPipeW failed: %d",
- GetLastError());
- THROW_EXCEPTION(ServerException, SocketOpenError)
- }
-
- bool connected = ConnectNamedPipe(mSocketHandle, (LPOVERLAPPED) NULL);
-
- if (!connected)
- {
- ::syslog(LOG_ERR, "ConnectNamedPipe failed: %d",
- GetLastError());
- CloseHandle(mSocketHandle);
- mSocketHandle = NULL;
- THROW_EXCEPTION(ServerException, SocketOpenError)
- }
-
- mReadClosed = FALSE;
- mWriteClosed = FALSE;
- mIsServer = TRUE; // must flush and disconnect before closing
- mIsConnected = TRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: WinNamedPipeStream::Connect(const char* Name)
-// Purpose: Opens a connection to a listening named pipe
-// Created: 2005/12/07
-//
-// --------------------------------------------------------------------------
-void WinNamedPipeStream::Connect(const wchar_t* pName)
-{
- if (mSocketHandle != NULL || mIsConnected)
- {
- THROW_EXCEPTION(ServerException, SocketAlreadyOpen)
- }
-
- mSocketHandle = CreateFileW(
- pName, // pipe name
- GENERIC_READ | // read and write access
- GENERIC_WRITE,
- 0, // no sharing
- NULL, // default security attributes
- OPEN_EXISTING,
- 0, // default attributes
- NULL); // no template file
-
- if (mSocketHandle == INVALID_HANDLE_VALUE)
- {
- ::syslog(LOG_ERR, "Failed to connect to server's named pipe: "
- "error %d", GetLastError());
- THROW_EXCEPTION(ServerException, SocketOpenError)
- }
-
- mReadClosed = FALSE;
- mWriteClosed = FALSE;
- mIsServer = FALSE; // just close the socket
- mIsConnected = TRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: WinNamedPipeStream::Read(void *pBuffer, int NBytes)
-// Purpose: Reads data from stream. Maybe returns less than asked for.
-// Created: 2003/07/31
-//
-// --------------------------------------------------------------------------
-int WinNamedPipeStream::Read(void *pBuffer, int NBytes, int Timeout)
-{
- // TODO no support for timeouts yet
- ASSERT(Timeout == IOStream::TimeOutInfinite)
-
- if (mSocketHandle == NULL || !mIsConnected)
- {
- THROW_EXCEPTION(ServerException, BadSocketHandle)
- }
-
- DWORD NumBytesRead;
-
- bool Success = ReadFile(
- mSocketHandle, // pipe handle
- pBuffer, // buffer to receive reply
- NBytes, // size of buffer
- &NumBytesRead, // number of bytes read
- NULL); // not overlapped
-
- if (!Success)
- {
- THROW_EXCEPTION(ConnectionException, Conn_SocketReadError)
- }
-
- // Closed for reading at EOF?
- if (NumBytesRead == 0)
- {
- mReadClosed = true;
- }
-
- return NumBytesRead;
-}
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: WinNamedPipeStream::Write(void *pBuffer, int NBytes)
-// Purpose: Writes data, blocking until it's all done.
-// Created: 2003/07/31
-//
-// --------------------------------------------------------------------------
-void WinNamedPipeStream::Write(const void *pBuffer, int NBytes)
-{
- if (mSocketHandle == NULL || !mIsConnected)
- {
- THROW_EXCEPTION(ServerException, BadSocketHandle)
- }
-
- // Buffer in byte sized type.
- ASSERT(sizeof(char) == 1);
- const char *pByteBuffer = (char *)pBuffer;
-
- int NumBytesWrittenTotal = 0;
-
- while (NumBytesWrittenTotal < NBytes)
- {
- DWORD NumBytesWrittenThisTime = 0;
-
- bool Success = WriteFile(
- mSocketHandle, // pipe handle
- pByteBuffer + NumBytesWrittenTotal, // message
- NBytes - NumBytesWrittenTotal, // message length
- &NumBytesWrittenThisTime, // bytes written this time
- NULL); // not overlapped
-
- if (!Success)
- {
- mWriteClosed = true; // assume can't write again
- THROW_EXCEPTION(ConnectionException,
- Conn_SocketWriteError)
- }
-
- NumBytesWrittenTotal += NumBytesWrittenThisTime;
- }
-}
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: WinNamedPipeStream::Close()
-// Purpose: Closes connection to remote socket
-// Created: 2003/07/31
-//
-// --------------------------------------------------------------------------
-void WinNamedPipeStream::Close()
-{
- if (mSocketHandle == NULL || !mIsConnected)
- {
- THROW_EXCEPTION(ServerException, BadSocketHandle)
- }
-
- if (mIsServer)
- {
- if (!FlushFileBuffers(mSocketHandle))
- {
- ::syslog(LOG_INFO, "FlushFileBuffers failed: %d",
- GetLastError());
- }
-
- if (!DisconnectNamedPipe(mSocketHandle))
- {
- ::syslog(LOG_ERR, "DisconnectNamedPipe failed: %d",
- GetLastError());
- }
-
- mIsServer = false;
- }
-
- if (!CloseHandle(mSocketHandle))
- {
- ::syslog(LOG_ERR, "CloseHandle failed: %d", GetLastError());
- THROW_EXCEPTION(ServerException, SocketCloseError)
- }
-
- mSocketHandle = NULL;
- mIsConnected = FALSE;
-}
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: WinNamedPipeStream::StreamDataLeft()
-// Purpose: Still capable of reading data?
-// Created: 2003/08/02
-//
-// --------------------------------------------------------------------------
-bool WinNamedPipeStream::StreamDataLeft()
-{
- return !mReadClosed;
-}
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: WinNamedPipeStream::StreamClosed()
-// Purpose: Connection been closed?
-// Created: 2003/08/02
-//
-// --------------------------------------------------------------------------
-bool WinNamedPipeStream::StreamClosed()
-{
- return mWriteClosed;
-}
-
-#endif // WIN32
Copied: box/trunk/lib/win32/WinNamedPipeStream.cpp (from rev 210, box/chris/win32/merge/07-win32-fixes/lib/win32/WinNamedPipeStream.cpp)
Deleted: box/trunk/lib/win32/WinNamedPipeStream.h
===================================================================
--- box/chris/win32/merge/07-win32-fixes/lib/win32/WinNamedPipeStream.h 2005-12-12 02:03:39 UTC (rev 210)
+++ box/trunk/lib/win32/WinNamedPipeStream.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -1,60 +0,0 @@
-// --------------------------------------------------------------------------
-//
-// File
-// Name: WinNamedPipeStream.h
-// Purpose: I/O stream interface for Win32 named pipes
-// Created: 2005/12/07
-//
-// --------------------------------------------------------------------------
-
-#if ! defined WINNAMEDPIPESTREAM__H && defined WIN32
-#define WINNAMEDPIPESTREAM__H
-
-#include "IOStream.h"
-
-// --------------------------------------------------------------------------
-//
-// Class
-// Name: WinNamedPipeStream
-// Purpose: I/O stream interface for Win32 named pipes
-// Created: 2003/07/31
-//
-// --------------------------------------------------------------------------
-class WinNamedPipeStream : public IOStream
-{
-public:
- WinNamedPipeStream();
- ~WinNamedPipeStream();
-
- // server side - create the named pipe and listen for connections
- void Accept(const wchar_t* Name);
-
- // client side - connect to a waiting server
- void Connect(const wchar_t* Name);
-
- // both sides
- virtual int Read(void *pBuffer, int NBytes,
- int Timeout = IOStream::TimeOutInfinite);
- virtual void Write(const void *pBuffer, int NBytes);
- virtual void Close();
- virtual bool StreamDataLeft();
- virtual bool StreamClosed();
- bool IsConnected() { return mIsConnected; }
-
-protected:
- HANDLE GetSocketHandle();
- void MarkAsReadClosed() {mReadClosed = true;}
- void MarkAsWriteClosed() {mWriteClosed = true;}
-
-private:
- WinNamedPipeStream(const WinNamedPipeStream &rToCopy)
- { /* do not call */ }
-
- HANDLE mSocketHandle;
- bool mReadClosed;
- bool mWriteClosed;
- bool mIsServer;
- bool mIsConnected;
-};
-
-#endif // WINNAMEDPIPESTREAM__H
Copied: box/trunk/lib/win32/WinNamedPipeStream.h (from rev 210, box/chris/win32/merge/07-win32-fixes/lib/win32/WinNamedPipeStream.h)
Deleted: box/trunk/lib/win32/emu.cpp
===================================================================
--- box/chris/win32/merge/07-win32-fixes/lib/win32/emu.cpp 2005-12-12 02:03:39 UTC (rev 210)
+++ box/trunk/lib/win32/emu.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -1,978 +0,0 @@
-// Box Backup Win32 native port by Nick Knight
-
-// Need at least 0x0500 to use GetFileSizeEx on Cygwin/MinGW
-#define WINVER 0x0500
-
-#include "Box.h"
-
-#ifdef WIN32
-
-// #include "emu.h"
-
-#include <windows.h>
-#include <fcntl.h>
-// #include <atlenc.h>
-#include <unistd.h>
-
-#include <string>
-#include <list>
-
-//our implimentation for a timer
-//based on a simple thread which sleeps for a
-//period of time
-static bool gFinishTimer;
-static CRITICAL_SECTION gLock;
-
-typedef struct
-{
- int countDown;
- int interval;
-}
-tTimer;
-
-std::list<tTimer> gTimerList;
-static void (__cdecl *gTimerFunc) (int) = NULL;
-
-int setitimer(int type , struct itimerval *timeout, int)
-{
- if ( SIGVTALRM == type || ITIMER_VIRTUAL == type )
- {
- EnterCriticalSection(&gLock);
- // we only need seconds for the mo!
- if (timeout->it_value.tv_sec == 0 &&
- timeout->it_value.tv_usec == 0)
- {
- gTimerList.clear();
- }
- else
- {
- tTimer ourTimer;
- ourTimer.countDown = timeout->it_value.tv_sec;
- ourTimer.interval = timeout->it_interval.tv_sec;
- gTimerList.push_back(ourTimer);
- }
- LeaveCriticalSection(&gLock);
- }
-
- // indicate success
- return 0;
-}
-
-static unsigned int WINAPI RunTimer(LPVOID lpParameter)
-{
- gFinishTimer = false;
-
- while (!gFinishTimer)
- {
- std::list<tTimer>::iterator it;
- EnterCriticalSection(&gLock);
-
- for (it = gTimerList.begin(); it != gTimerList.end(); it++)
- {
- tTimer& rTimer(*it);
-
- rTimer.countDown --;
- if (rTimer.countDown == 0)
- {
- if (gTimerFunc != NULL)
- {
- gTimerFunc(0);
- }
- if (rTimer.interval)
- {
- rTimer.countDown = rTimer.interval;
- }
- else
- {
- // mark for deletion
- rTimer.countDown = -1;
- }
- }
- }
-
- for (it = gTimerList.begin(); it != gTimerList.end(); it++)
- {
- tTimer& rTimer(*it);
-
- if (rTimer.countDown == -1)
- {
- gTimerList.erase(it);
- //if we don't do this the search is on a corrupt list
- it = gTimerList.begin();
- }
- }
-
- LeaveCriticalSection(&gLock);
- // we only need to have a 1 second resolution
- Sleep(1000);
- }
-
- return 0;
-}
-
-int SetTimerHandler(void (__cdecl *func ) (int))
-{
- gTimerFunc = func;
- return 0;
-}
-
-void InitTimer(void)
-{
- InitializeCriticalSection(&gLock);
-
- // create our thread
- HANDLE ourThread = (HANDLE)_beginthreadex(NULL, 0, RunTimer, 0,
- CREATE_SUSPENDED, NULL);
- SetThreadPriority(ourThread, THREAD_PRIORITY_LOWEST);
- ResumeThread(ourThread);
-}
-
-void FiniTimer(void)
-{
- gFinishTimer = true;
- EnterCriticalSection(&gLock);
- DeleteCriticalSection(&gLock);
-}
-
-//Our constants we need to keep track of
-//globals
-struct passwd gTempPasswd;
-
-bool EnableBackupRights( void )
-{
- HANDLE hToken;
- TOKEN_PRIVILEGES token_priv;
-
- //open current process to adjust privileges
- if( !OpenProcessToken( GetCurrentProcess( ),
- TOKEN_ADJUST_PRIVILEGES,
- &hToken ))
- {
- printf( "Cannot open process token - err = %d\n", GetLastError( ) );
- return false;
- }
-
- //let's build the token privilege struct -
- //first, look up the LUID for the backup privilege
-
- if( !LookupPrivilegeValue( NULL, //this system
- SE_BACKUP_NAME, //the name of the privilege
- &( token_priv.Privileges[0].Luid )) ) //result
- {
- printf( "Cannot lookup backup privilege - err = %d\n", GetLastError( ) );
- return false;
- }
-
- token_priv.PrivilegeCount = 1;
- token_priv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
-
- // now set the privilege
- // because we're going exit right after dumping the streams, there isn't
- // any need to save current state
-
- if( !AdjustTokenPrivileges( hToken, //our process token
- false, //we're not disabling everything
- &token_priv, //address of structure
- sizeof( token_priv ), //size of structure
- NULL, NULL )) //don't save current state
- {
- //this function is a little tricky - if we were adjusting
- //more than one privilege, it could return success but not
- //adjust them all - in the general case, you need to trap this
- printf( "Could not enable backup privileges - err = %d\n", GetLastError( ) );
- return false;
-
- }
- else
- {
- return true;
- }
-}
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: openfile
-// Purpose: replacement for any open calls - handles unicode filenames - supplied in utf8
-// Created: 25th October 2004
-//
-// --------------------------------------------------------------------------
-HANDLE openfile(const char *filename, int flags, int mode)
-{
- try{
-
- wchar_t *buffer;
- std::string fileN(filename);
-
- std::string tmpStr("\\\\?\\");
- //is the path relative or otherwise
- if ( fileN[1] != ':' )
- {
- //we need to get the current directory
- char wd[PATH_MAX];
- if(::getcwd(wd, PATH_MAX) == 0)
- {
- return NULL;
- }
- tmpStr += wd;
- if (tmpStr[tmpStr.length()] != '\\')
- {
- tmpStr += '\\';
- }
- }
- tmpStr += filename;
-
- int strlen = MultiByteToWideChar(
- CP_UTF8, // code page
- 0, // character-type options
- tmpStr.c_str(), // string to map
- (int)tmpStr.length(), // number of bytes in string
- NULL, // wide-character buffer
- 0 // size of buffer - work out how much space we need
- );
-
- buffer = new wchar_t[strlen+1];
- if ( buffer == NULL )
- {
- return NULL;
- }
-
- strlen = MultiByteToWideChar(
- CP_UTF8, // code page
- 0, // character-type options
- tmpStr.c_str(), // string to map
- (int)tmpStr.length(), // number of bytes in string
- buffer, // wide-character buffer
- strlen // size of buffer
- );
-
- if ( strlen == 0 )
- {
- delete [] buffer;
- return NULL;
- }
-
- buffer[strlen] = L'\0';
-
- //flags could be O_WRONLY | O_CREAT | O_RDONLY
- DWORD createDisposition = OPEN_EXISTING;
- DWORD shareMode = FILE_SHARE_READ;
- DWORD accessRights = FILE_READ_ATTRIBUTES | FILE_LIST_DIRECTORY | FILE_READ_EA;
-
- if ( flags & O_WRONLY )
- {
- createDisposition = OPEN_EXISTING;
- shareMode |= FILE_SHARE_READ ;//| FILE_SHARE_WRITE;
- }
- if ( flags & O_CREAT )
- {
- createDisposition = OPEN_ALWAYS;
- shareMode |= FILE_SHARE_READ ;//| FILE_SHARE_WRITE;
- accessRights |= FILE_WRITE_ATTRIBUTES | FILE_WRITE_DATA | FILE_WRITE_EA | FILE_ALL_ACCESS;
- }
- if ( flags & O_TRUNC )
- {
- createDisposition = OPEN_ALWAYS;
- }
-
- HANDLE hdir = CreateFileW(buffer,
- accessRights,
- shareMode,
- NULL,
- createDisposition,
- FILE_FLAG_BACKUP_SEMANTICS,
- NULL);
-
- if ( hdir == INVALID_HANDLE_VALUE )
- {
- // DWORD err = GetLastError();
- // syslog(EVENTLOG_WARNING_TYPE, "Couldn't open file %s, err %i\n", filename, err);
- delete [] buffer;
- return NULL;
- }
-
- delete [] buffer;
- return hdir;
-
- }
- catch(...)
- {
- printf("Caught openfile:%s\r\n", filename);
- }
- return NULL;
-
-}
-
-// MinGW provides a getopt implementation
-#ifndef __MINGW32__
-//works with getopt
-char *optarg;
-//optind looks like an index into the string - how far we have moved along
-int optind = 1;
-char nextchar = -1;
-#endif
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: ourfstat
-// Purpose: replacement for fstat supply a windows handle
-// Created: 25th October 2004
-//
-// --------------------------------------------------------------------------
-int ourfstat(HANDLE hdir, struct stat * st)
-{
- ULARGE_INTEGER conv;
-
- if (hdir == INVALID_HANDLE_VALUE)
- {
- ::syslog(LOG_ERR, "Error: invalid file handle in ourfstat()");
- errno = EBADF;
- return -1;
- }
-
- BY_HANDLE_FILE_INFORMATION fi;
- if (!GetFileInformationByHandle(hdir, &fi))
- {
- ::syslog(LOG_WARNING, "Failed to read file information: "
- "error %d", GetLastError());
- errno = EACCES;
- return -1;
- }
-
- // This next example is how we get our INODE (equivalent) information
- conv.HighPart = fi.nFileIndexHigh;
- conv.LowPart = fi.nFileIndexLow;
- st->st_ino = conv.QuadPart;
-
- // get the time information
- st->st_ctime = ConvertFileTimeToTime_t(&fi.ftCreationTime);
- st->st_atime = ConvertFileTimeToTime_t(&fi.ftLastAccessTime);
- st->st_mtime = ConvertFileTimeToTime_t(&fi.ftLastWriteTime);
-
- // size of the file
- LARGE_INTEGER st_size;
- if (!GetFileSizeEx(hdir, &st_size))
- {
- ::syslog(LOG_WARNING, "Failed to get file size: error %d",
- GetLastError());
- errno = EACCES;
- return -1;
- }
-
- conv.HighPart = st_size.HighPart;
- conv.LowPart = st_size.LowPart;
- st->st_size = conv.QuadPart;
-
- //the mode of the file
- st->st_mode = 0;
- //DWORD res = GetFileAttributes((LPCSTR)tmpStr.c_str());
-
- if (INVALID_FILE_ATTRIBUTES != fi.dwFileAttributes)
- {
- if (fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
- {
- st->st_mode |= S_IFDIR;
- }
- else
- {
- st->st_mode |= S_IFREG;
- }
- }
- else
- {
- ::syslog(LOG_WARNING, "Failed to get file attributes: "
- "error %d", GetLastError());
- errno = EACCES;
- return -1;
- }
-
- return 0;
-}
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: OpenFileByNameUtf8
-// Purpose: Converts filename to Unicode and returns
-// a handle to it. In case of error, sets errno,
-// logs the error and returns NULL.
-// Created: 10th December 2004
-//
-// --------------------------------------------------------------------------
-HANDLE OpenFileByNameUtf8(const char* pName)
-{
- //some string thing - required by ms to indicate long/unicode filename
- std::string tmpStr("\\\\?\\");
-
- // is the path relative or otherwise
- std::string fileN(pName);
- if (fileN[1] != ':')
- {
- // we need to get the current directory
- char wd[PATH_MAX];
- if(::getcwd(wd, PATH_MAX) == 0)
- {
- ::syslog(LOG_WARNING,
- "Failed to open '%s': path too long", pName);
- errno = ENAMETOOLONG;
- return NULL;
- }
-
- tmpStr += wd;
- if (tmpStr[tmpStr.length()] != '\\')
- {
- tmpStr += '\\';
- }
- }
-
- tmpStr += fileN;
-
- int strlen = MultiByteToWideChar(
- CP_UTF8, // code page
- 0, // character-type options
- tmpStr.c_str(), // string to map
- (int)tmpStr.length(), // number of bytes in string
- NULL, // wide-character buffer
- 0 // size of buffer - work out
- // how much space we need
- );
-
- wchar_t* buffer = new wchar_t[strlen+1];
-
- if (buffer == NULL)
- {
- ::syslog(LOG_WARNING,
- "Failed to open '%s': out of memory", pName);
- errno = ENOMEM;
- return NULL;
- }
-
- strlen = MultiByteToWideChar(
- CP_UTF8, // code page
- 0, // character-type options
- tmpStr.c_str(), // string to map
- (int)tmpStr.length(), // number of bytes in string
- buffer, // wide-character buffer
- strlen // size of buffer
- );
-
- if (strlen == 0)
- {
- ::syslog(LOG_WARNING,
- "Failed to open '%s': could not convert "
- "file name to Unicode", pName);
- errno = EACCES;
- delete [] buffer;
- return NULL;
- }
-
- buffer[strlen] = L'\0';
-
- HANDLE handle = CreateFileW(buffer,
- FILE_READ_ATTRIBUTES | FILE_LIST_DIRECTORY | FILE_READ_EA,
- FILE_SHARE_READ | FILE_SHARE_DELETE | FILE_SHARE_WRITE,
- NULL,
- OPEN_EXISTING,
- FILE_FLAG_BACKUP_SEMANTICS,
- NULL);
-
- if (handle == INVALID_HANDLE_VALUE)
- {
- // if our open fails we should always be able to
- // open in this mode - to get the inode information
- // at least one process must have the file open -
- // in this case someone else does.
- handle = CreateFileW(buffer,
- 0,
- FILE_SHARE_READ,
- NULL,
- OPEN_EXISTING,
- FILE_FLAG_BACKUP_SEMANTICS,
- NULL);
- }
-
- delete [] buffer;
-
- if (handle == INVALID_HANDLE_VALUE)
- {
- DWORD err = GetLastError();
-
- if (err == ERROR_FILE_NOT_FOUND)
- {
- ::syslog(LOG_WARNING,
- "Failed to open '%s': file not found", pName);
- errno = ENOENT;
- }
- else
- {
- ::syslog(LOG_WARNING,
- "Failed to open '%s': error %d", pName);
- errno = EACCES;
- }
-
- return NULL;
- }
-
- return handle;
-}
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: ourstat
-// Purpose: replacement for the lstat and stat functions,
-// works with unicode filenames supplied in utf8 format
-// Created: 25th October 2004
-//
-// --------------------------------------------------------------------------
-int ourstat(const char * pName, struct stat * st)
-{
- // at the mo
- st->st_uid = 0;
- st->st_gid = 0;
- st->st_nlink = 1;
-
- HANDLE handle = OpenFileByNameUtf8(pName);
-
- if (handle == NULL)
- {
- // errno already set and error logged by OpenFileByNameUtf8()
- return -1;
- }
-
- int retVal = ourfstat(handle, st);
- if (retVal != 0)
- {
- // error logged, but without filename
- ::syslog(LOG_WARNING, "Failed to get file information "
- "for '%s'", pName);
- }
-
- // close the handle
- CloseHandle(handle);
-
- return retVal;
-}
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: statfs
-// Purpose: returns the mount point of where a file is located -
-// in this case the volume serial number
-// Created: 25th October 2004
-//
-// --------------------------------------------------------------------------
-int statfs(const char * pName, struct statfs * s)
-{
- HANDLE handle = OpenFileByNameUtf8(pName);
-
- if (handle == NULL)
- {
- // errno already set and error logged by OpenFileByNameUtf8()
- return -1;
- }
-
- BY_HANDLE_FILE_INFORMATION fi;
- if (!GetFileInformationByHandle(handle, &fi))
- {
- ::syslog(LOG_WARNING, "Failed to get file information "
- "for '%s': error %d", pName, GetLastError());
- CloseHandle(handle);
- errno = EACCES;
- return -1;
- }
-
- // convert volume serial number to a string
- _ui64toa(fi.dwVolumeSerialNumber, s->f_mntonname + 1, 16);
-
- // pseudo unix mount point
- s->f_mntonname[0] = DIRECTORY_SEPARATOR_ASCHAR;
-
- CloseHandle(handle); // close the handle
-
- return 0;
-}
-
-
-
-
-
-// MinGW provides opendir(), etc. via <dirent.h>
-// MSVC does not provide these, so emulation is needed
-
-#ifndef __MINGW32__
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: opendir
-// Purpose: replacement for unix function, uses win32 findfirst routines
-// Created: 25th October 2004
-//
-// --------------------------------------------------------------------------
-DIR *opendir(const char *name)
-{
- try
- {
- DIR *dir = 0;
- std::string dirName(name);
-
- //append a '\' win32 findfirst is sensitive to this
- if ( dirName[dirName.size()] != '\\' || dirName[dirName.size()] != '/' )
- {
- dirName += '\\';
- }
-
- //what is the search string? - everything
- dirName += '*';
-
- if(name && name[0])
- {
- if ( ( dir = new DIR ) != 0 )
- {
- //mbstowcs(dir->name, dirName.c_str(),100);
- //wcscpy((wchar_t*)dir->name, (const wchar_t*)dirName.c_str());
- //mbstowcs(dir->name, dirName.c_str(), dirName.size()+1);
- //wchar_t *buffer;
-
- int strlen = MultiByteToWideChar(
- CP_UTF8, // code page
- 0, // character-type options
- dirName.c_str(), // string to map
- (int)dirName.length(), // number of bytes in string
- NULL, // wide-character buffer
- 0 // size of buffer - work out how much space we need
- );
-
- dir->name = new wchar_t[strlen+1];
-
- if (dir->name == NULL)
- {
- delete dir;
- dir = 0;
- errno = ENOMEM;
- return NULL;
- }
-
- strlen = MultiByteToWideChar(
- CP_UTF8, // code page
- 0, // character-type options
- dirName.c_str(), // string to map
- (int)dirName.length(), // number of bytes in string
- dir->name, // wide-character buffer
- strlen // size of buffer
- );
-
- if (strlen == 0)
- {
- delete dir->name;
- delete dir;
- dir = 0;
- errno = ENOMEM;
- return NULL;
- }
-
- dir->name[strlen] = L'\0';
-
-
- dir->fd = _wfindfirst(
- (const wchar_t*)dir->name,
- &dir->info);
-
- if (dir->fd != -1)
- {
- dir->result.d_name = 0;
- }
- else // go back
- {
- delete [] dir->name;
- delete dir;
- dir = 0;
- }
- }
- else // backwards again
- {
- delete dir;
- dir = 0;
- errno = ENOMEM;
- }
- }
- else
- {
- errno = EINVAL;
- }
-
- return dir;
-
- }
- catch(...)
- {
- printf("Caught opendir");
- }
-
- return NULL;
-}
-
-//this kinda makes it not thread friendly!
-//but I don't think it needs to be.
-char tempbuff[MAX_PATH];
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: readdir
-// Purpose: as function above
-// Created: 25th October 2004
-//
-// --------------------------------------------------------------------------
-struct dirent *readdir(DIR *dp)
-{
- try
- {
- struct dirent *den = NULL;
-
- if (dp && dp->fd != -1)
- {
- if (!dp->result.d_name ||
- _wfindnext(dp->fd, &dp->info) != -1)
- {
- den = &dp->result;
- std::wstring input(dp->info.name);
- memset(tempbuff, 0, sizeof(tempbuff));
- WideCharToMultiByte(CP_UTF8, 0, dp->info.name,
- -1, &tempbuff[0], sizeof (tempbuff),
- NULL, NULL);
- //den->d_name = (char *)dp->info.name;
- den->d_name = &tempbuff[0];
- }
- }
- else
- {
- errno = EBADF;
- }
- return den;
- }
- catch (...)
- {
- printf("Caught readdir");
- }
- return NULL;
-}
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: closedir
-// Purpose: as function above
-// Created: 25th October 2004
-//
-// --------------------------------------------------------------------------
-int closedir(DIR *dp)
-{
- try
- {
- int finres = -1;
- if (dp)
- {
- if(dp->fd != -1)
- {
- finres = _findclose(dp->fd);
- }
-
- delete [] dp->name;
- delete dp;
- }
-
- if (finres == -1) // errors go to EBADF
- {
- errno = EBADF;
- }
-
- return finres;
- }
- catch (...)
- {
- printf("Caught closedir");
- }
- return -1;
-}
-#endif // !__MINGW32__
-
-// --------------------------------------------------------------------------
-//
-// Function
-// Name: poll
-// Purpose: a weak implimentation (just enough for box)
-// of the unix poll for winsock2
-// Created: 25th October 2004
-//
-// --------------------------------------------------------------------------
-int poll (struct pollfd *ufds, unsigned long nfds, int timeout)
-{
- try
- {
- fd_set readfd;
- fd_set writefd;
-
- readfd.fd_count = 0;
- writefd.fd_count = 0;
-
- struct pollfd *ufdsTmp = ufds;
-
- timeval timOut;
- timeval *tmpptr;
-
- if (timeout == INFTIM)
- tmpptr = NULL;
- else
- tmpptr = &timOut;
-
- timOut.tv_sec = timeout / 1000;
- timOut.tv_usec = timeout * 1000;
-
- if (ufds->events & POLLIN)
- {
- for (unsigned long i = 0; i < nfds; i++)
- {
- readfd.fd_array[i] = ufdsTmp->fd;
- readfd.fd_count++;
- }
- }
-
- if (ufds->events & POLLOUT)
- {
- for (unsigned long i = 0; i < nfds; i++)
- {
-
- writefd.fd_array[i]=ufdsTmp->fd;
- writefd.fd_count++;
- }
- }
-
- int noffds = select(0, &readfd, &writefd, 0, tmpptr);
-
- if (noffds == SOCKET_ERROR)
- {
- // int errval = WSAGetLastError();
-
- ufdsTmp = ufds;
- for (unsigned long i = 0; i < nfds; i++)
- {
- ufdsTmp->revents = POLLERR;
- ufdsTmp++;
- }
- return (-1);
- }
-
- return noffds;
- }
- catch (...)
- {
- printf("Caught poll");
- }
-
- return -1;
-}
-
-HANDLE gSyslogH = 0;
-
-void syslog(int loglevel, const char *frmt, ...)
-{
- DWORD errinfo;
- char* buffer;
- std::string sixfour(frmt);
-
- switch (loglevel)
- {
- case LOG_INFO:
- errinfo = EVENTLOG_INFORMATION_TYPE;
- break;
- case LOG_ERR:
- errinfo = EVENTLOG_ERROR_TYPE;
- break;
- case LOG_WARNING:
- errinfo = EVENTLOG_WARNING_TYPE;
- break;
- default:
- errinfo = EVENTLOG_WARNING_TYPE;
- break;
- }
-
-
- //taken from MSDN
- try
- {
-
-
- int sixfourpos;
- while ( ( sixfourpos = sixfour.find("%ll")) != -1 )
- {
- //maintain portability - change the 64 bit formater...
- std::string temp = sixfour.substr(0,sixfourpos);
- temp += "%I64";
- temp += sixfour.substr(sixfourpos+3, sixfour.length());
- sixfour = temp;
- }
-
- //printf("parsed string is:%s\r\n", sixfour.c_str());
-
- va_list args;
- va_start(args, frmt);
-
-#ifdef __MINGW32__
- // no _vscprintf, use a fixed size buffer
- buffer = new char[1024];
- int len = 1023;
-#else
- int len = _vscprintf( sixfour.c_str(), args );
- ASSERT(len > 0)
-
- len = len + 1;
- char* buffer = new char[len];
-#endif
-
- ASSERT(buffer)
- memset(buffer, 0, len);
-
- int len2 = vsnprintf(buffer, len, sixfour.c_str(), args);
- ASSERT(len2 <= len);
-
- va_end(args);
- }
- catch (...)
- {
- printf("Caught syslog: %s", sixfour.c_str());
- return;
- }
-
- try
- {
-
- if (!ReportEvent(gSyslogH, // event log handle
- errinfo, // event type
- 0, // category zero
- MSG_ERR_EXIST, // event identifier -
- // we will call them all the same
- NULL, // no user security identifier
- 1, // one substitution string
- 0, // no data
- (LPCSTR*)&buffer, // pointer to string array
- NULL)) // pointer to data
-
- {
- DWORD err = GetLastError();
- printf("Unable to send message to Event Log "
- "(error %i):\r\n", err);
- }
-
- printf("%s\r\n", buffer);
-
- if (buffer) delete [] buffer;
- }
- catch (...)
- {
- printf("Caught syslog ReportEvent");
- }
-}
-
-#endif // WIN32
Copied: box/trunk/lib/win32/emu.cpp (from rev 210, box/chris/win32/merge/07-win32-fixes/lib/win32/emu.cpp)
Deleted: box/trunk/lib/win32/emu.h
===================================================================
--- box/chris/win32/merge/07-win32-fixes/lib/win32/emu.h 2005-12-12 02:03:39 UTC (rev 210)
+++ box/trunk/lib/win32/emu.h 2005-12-12 20:50:00 UTC (rev 213)
@@ -1,426 +0,0 @@
-// emulates unix syscalls to win32 functions
-
-#if ! defined EMU_INCLUDE && defined WIN32
-#define EMU_INCLUDE
-
-#define _STAT_DEFINED
-#define _INO_T_DEFINED
-
-#include <winsock2.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <direct.h>
-#include <errno.h>
-#include <io.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <time.h>
-//#include <winsock.h>
-//#include <sys/types.h>
-//#include <sys/stat.h>
-
-#include <string>
-
-#define gmtime_r( _clock, _result ) \
- ( *(_result) = *gmtime( (_clock) ), \
- (_result) )
-
-
-//signal in unix SIGVTALRM does not exist in win32 - but looking at the
-#define SIGVTALRM 254
-#define SIGALRM SIGVTALRM
-#define ITIMER_VIRTUAL 0
-
-int setitimer(int type , struct itimerval *timeout, int);
-void InitTimer(void);
-void FiniTimer(void);
-
-inline int geteuid(void)
-{
- //lets pretend to be root!
- return 0;
-}
-
-struct passwd {
- char *pw_name;
- char *pw_passwd;
- uid_t pw_uid;
- gid_t pw_gid;
- time_t pw_change;
- char *pw_class;
- char *pw_gecos;
- char *pw_dir;
- char *pw_shell;
- time_t pw_expire;
-};
-
-extern passwd gTempPasswd;
-inline struct passwd * getpwnam(const char * name)
-{
- //for the mo pretend to be root
- gTempPasswd.pw_uid = 0;
- gTempPasswd.pw_gid = 0;
-
- return &gTempPasswd;
-}
-
-#define S_IRWXG 1
-#define S_IRWXO 2
-#define S_ISUID 4
-#define S_ISGID 8
-#define S_ISVTX 16
-
-#ifndef __MINGW32__
- //not sure if these are correct
- //S_IWRITE - writing permitted
- //_S_IREAD - reading permitted
- //_S_IREAD | _S_IWRITE -
- #define S_IRUSR S_IWRITE
- #define S_IWUSR S_IREAD
- #define S_IRWXU (S_IREAD|S_IWRITE|S_IEXEC)
-
- #define S_ISREG(x) (S_IFREG & x)
- #define S_ISDIR(x) (S_IFDIR & x)
-#endif
-
-inline int utimes(const char * Filename, timeval[])
-{
- //again I am guessing this is quite important to
- //be functioning, as large restores would be a problem
-
- //indicate success
- return 0;
-}
-inline int chown(const char * Filename, u_int32_t uid, u_int32_t gid)
-{
- //important - this needs implementing
- //If a large restore is required then
- //it needs to restore files AND permissions
- //reference AdjustTokenPrivileges
- //GetAccountSid
- //InitializeSecurityDescriptor
- //SetSecurityDescriptorOwner
- //The next function looks like the guy to use...
- //SetFileSecurity
-
- //indicate success
- return 0;
-}
-
-inline int chmod(const char * Filename, int uid)
-{
- //indicate sucsess
- return 0;
-}
-
-//I do not perceive a need to change the user or group on a backup client
-//at any rate the owner of a service can be set in the service settings
-inline int setegid(int)
-{
- return true;
-}
-inline int seteuid(int)
-{
- return true;
-}
-inline int setgid(int)
-{
- return true;
-}
-inline int setuid(int)
-{
- return true;
-}
-inline int getgid(void)
-{
- return 0;
-}
-inline int getuid(void)
-{
- return 0;
-}
-
-#ifndef PATH_MAX
-#define PATH_MAX MAX_PATH
-#endif
-
-// MinGW provides a getopt implementation
-#ifndef __MINGW32__
-
-//this will need to be implimented if we see fit that command line
-//options are going to be used! (probably then:)
-//where the calling function looks for the parsed parameter
-extern char *optarg;
-//optind looks like an index into the string - how far we have moved along
-extern int optind;
-extern char nextchar;
-
-inline int getopt(int count, char * const * args, char * tolookfor)
-{
- if ( optind >= count ) return -1;
-
- std::string str((const char *)args[optind]);
- std::string interestin(tolookfor);
- int opttolookfor = 0;
- int index = -1;
- //just initialize the string - just in case it is used.
- //optarg[0] = 0;
- std::string opt;
-
- if ( count == 0 ) return -1;
-
- do
- {
- if ( index != -1 )
- {
- str = str.substr(index+1, str.size());
- }
-
- index = str.find('-');
-
- if ( index == -1 ) return -1;
-
- opt = str[1];
-
- optind ++;
- str = args[optind];
- }
- while ( ( opttolookfor = interestin.find(opt)) == -1 );
-
- if ( interestin[opttolookfor+1] == ':' )
- {
-
- //strcpy(optarg, str.c_str());
- optarg = args[optind];
- optind ++;
- }
-
- //indicate we have finished
- return opt[0];
-}
-#endif // !__MINGW32__
-
-#define timespec timeval
-
-//not available in win32
-struct itimerval
-{
- timeval it_interval;
- timeval it_value;
-};
-
-//win32 deals in usec not nsec - so need to ensure this follows through
-#define tv_nsec tv_usec
-
-#ifndef __MINGW32__
- typedef unsigned __int64 u_int64_t;
- typedef unsigned __int64 uint64_t;
- typedef __int64 int64_t;
- typedef unsigned __int32 uint32_t;
- typedef unsigned __int32 u_int32_t;
- typedef __int32 int32_t;
- typedef unsigned __int16 uint16_t;
- typedef __int16 int16_t;
- typedef unsigned __int8 uint8_t;
- typedef __int8 int8_t;
-
- typedef int socklen_t;
-#endif
-
-// I (re-)defined here for the moment; has to be removed later !!!
-#ifndef BOX_VERSION
-#define BOX_VERSION "0.09hWin32"
-#endif
-
-#define S_IRGRP S_IWRITE
-#define S_IWGRP S_IREAD
-#define S_IROTH S_IWRITE | S_IREAD
-#define S_IWOTH S_IREAD | S_IREAD
-
-//again need to verify these
-#define S_IFLNK 1
-
-#define S_ISLNK(x) ( false )
-
-// nasty implementation to get working - TODO get the win32 equiv
-#ifdef _DEBUG
-#define getpid() 1
-#endif
-
-#define vsnprintf _vsnprintf
-
-#ifndef __MINGW32__
-typedef unsigned int mode_t;
-#endif
-
-inline int mkdir(const char *pathname, mode_t mode)
-{
- return mkdir(pathname);
-}
-
-#ifdef __MINGW32__
- #include <dirent.h>
-#else
- inline int strcasecmp(const char *s1, const char *s2)
- {
- return _stricmp(s1,s2);
- }
-
- struct dirent
- {
- char *d_name;
- };
-
- struct DIR
- {
- intptr_t fd; // filedescriptor
- // struct _finddata_t info;
- struct _wfinddata_t info;
- // struct _finddata_t info;
- struct dirent result; // d_name (first time null)
- wchar_t *name; // null-terminated byte string
- };
-
- DIR *opendir(const char *name);
- struct dirent *readdir(DIR *dp);
- int closedir(DIR *dp);
-#endif
-
-HANDLE openfile(const char *filename, int flags, int mode);
-
-#define LOG_INFO 6
-#define LOG_WARNING 4
-#define LOG_ERR 3
-#define LOG_PID 0
-#define LOG_LOCAL6 0
-
-extern HANDLE gSyslogH;
-void MyReportEvent(LPCTSTR *szMsg, DWORD errinfo);
-inline void openlog(const char * daemonName, int, int)
-{
- gSyslogH = RegisterEventSource(
- NULL, // uses local computer
- daemonName); // source name
- if (gSyslogH == NULL)
- {
- }
-}
-
-inline void closelog(void)
-{
- DeregisterEventSource(gSyslogH);
-}
-
-void syslog(int loglevel, const char *fmt, ...);
-
-#ifndef __MINGW32__
-#define strtoll _strtoi64
-#endif
-
-inline unsigned int sleep(unsigned int secs)
-{
- Sleep(secs*1000);
- return(ERROR_SUCCESS);
-}
-
-#define INFTIM -1
-#define POLLIN 0x1
-#define POLLERR 0x8
-#define POLLOUT 0x4
-
-#define SHUT_RDWR SD_BOTH
-#define SHUT_RD SD_RECEIVE
-#define SHUT_WR SD_SEND
-
-struct pollfd
-{
- SOCKET fd;
- short int events;
- short int revents;
-};
-
-inline int ioctl(SOCKET sock, int flag, int * something)
-{
- //indicate success
- return 0;
-}
-
-inline int waitpid(pid_t pid, int *status, int)
-{
- return 0;
-}
-
-//this shouldn't be needed.
-struct statfs
-{
- TCHAR f_mntonname[MAX_PATH];
-};
-
-// I think this should get us going
-// Although there is a warning about
-// mount points in win32 can now exists - which means inode number can be
-// duplicated, so potential of a problem - perhaps this needs to be
-// implemented with a little more thought... TODO
-
-struct stat {
- //_dev_t st_dev;
- u_int64_t st_ino;
- DWORD st_mode;
- short st_nlink;
- short st_uid;
- short st_gid;
- //_dev_t st_rdev;
- u_int64_t st_size;
- time_t st_atime;
- time_t st_mtime;
- time_t st_ctime;
-};
-
-#ifndef __MINGW32__
-typedef u_int64_t _ino_t;
-#endif
-
-int ourstat(const char * name, struct stat * st);
-int ourfstat(HANDLE file, struct stat * st);
-int statfs(const char * name, struct statfs * s);
-
-//need this for converstions
-inline time_t ConvertFileTimeToTime_t(FILETIME *fileTime)
-{
- SYSTEMTIME stUTC;
- struct tm timeinfo;
-
- // Convert the last-write time to local time.
- FileTimeToSystemTime(fileTime, &stUTC);
- // SystemTimeToTzSpecificLocalTime(NULL, &stUTC, &stLocal);
-
- timeinfo.tm_sec = stUTC.wSecond;
- timeinfo.tm_min = stUTC.wMinute;
- timeinfo.tm_hour = stUTC.wHour;
- timeinfo.tm_mday = stUTC.wDay;
- timeinfo.tm_wday = stUTC.wDayOfWeek;
- timeinfo.tm_mon = stUTC.wMonth - 1;
- // timeinfo.tm_yday = ...;
- timeinfo.tm_year = stUTC.wYear - 1900;
-
- time_t retVal = mktime(&timeinfo);
- return retVal;
-}
-
-#define stat(x,y) ourstat(x,y)
-#define fstat(x,y) ourfstat(x,y)
-#define lstat(x,y) ourstat(x,y)
-
-int poll (struct pollfd *ufds, unsigned long nfds, int timeout);
-bool EnableBackupRights( void );
-
-//
-// MessageId: MSG_ERR_EXIST
-// MessageText:
-// Box Backup.
-//
-#define MSG_ERR_EXIST ((DWORD)0xC0000004L)
-
-#endif // !EMU_INCLUDE && WIN32
Copied: box/trunk/lib/win32/emu.h (from rev 210, box/chris/win32/merge/07-win32-fixes/lib/win32/emu.h)
Modified: box/trunk/modules.txt
===================================================================
--- box/trunk/modules.txt 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/modules.txt 2005-12-12 20:50:00 UTC (rev 213)
@@ -9,16 +9,21 @@
# Generic support code and modules
+OMIT:mingw32
OMIT:CYGWIN
lib/raidfile
END-OMIT
+
lib/crypto
lib/server
+lib/win32 lib/server
lib/compress
test/common
test/crypto lib/crypto
test/compress lib/compress
test/basicserver lib/server
+
+OMIT:mingw32
OMIT:CYGWIN
test/raidfile lib/raidfile
END-OMIT
@@ -28,15 +33,20 @@
# Backup system
lib/backupclient lib/server lib/crypto lib/compress
+
+OMIT:mingw32
OMIT:CYGWIN
lib/backupstore lib/server lib/raidfile lib/backupclient
-bin/bbstored lib/raidfile lib/server lib/backupstore lib/backupclient
-bin/bbstoreaccounts lib/raidfile lib/backupstore
-bin/bbackupobjdump lib/backupclient lib/backupstore
+bin/bbstored lib/raidfile lib/server lib/backupstore lib/backupclient lib/win32
+bin/bbstoreaccounts lib/raidfile lib/backupstore lib/win32
+bin/bbackupobjdump lib/backupclient lib/backupstore lib/win32
END-OMIT
-bin/bbackupd lib/server lib/backupclient
-bin/bbackupquery lib/server lib/backupclient
-bin/bbackupctl lib/server lib/backupclient
+
+bin/bbackupd lib/server lib/backupclient lib/win32
+bin/bbackupquery lib/server lib/backupclient lib/win32
+bin/bbackupctl lib/server lib/backupclient lib/win32
+
+OMIT:mingw32
OMIT:CYGWIN
test/backupstore bin/bbstored bin/bbstoreaccounts lib/server lib/backupstore lib/backupclient lib/raidfile
test/backupstorefix bin/bbstored bin/bbstoreaccounts lib/backupstore lib/raidfile bin/bbackupquery bin/bbackupd
Modified: box/trunk/parcels.txt
===================================================================
--- box/trunk/parcels.txt 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/parcels.txt 2005-12-12 20:50:00 UTC (rev 213)
@@ -8,7 +8,11 @@
bin bbackupquery
bin bbackupctl
script bin/bbackupd/bbackupd-config
+ script bin/bbackupd/win32/installer.iss
+ script bin/bbackupd/win32/ReadMe.txt
+ script bin/bbackupd/win32/bbackupd.conf
+OMIT:mingw32
OMIT:CYGWIN
backup-server
Modified: box/trunk/test/basicserver/testbasicserver.cpp
===================================================================
--- box/trunk/test/basicserver/testbasicserver.cpp 2005-12-12 18:44:44 UTC (rev 212)
+++ box/trunk/test/basicserver/testbasicserver.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -349,9 +349,11 @@
for(unsigned int c = 0; c < conns.size(); ++c)
{
- delete getline[c];
+ if ( getline[c] ) delete getline[c];
+ getline[c] = 0;
}
- delete [] getline;
+ if ( getline ) delete [] getline;
+ getline = 0;
}
void TestStreamReceive(TestProtocolClient &protocol, int value, bool uncertainstream)
Copied: box/trunk/test/win32 (from rev 210, box/chris/win32/merge/07-win32-fixes/test/win32)
Deleted: box/trunk/test/win32/testlibwin32.cpp
===================================================================
--- box/chris/win32/merge/07-win32-fixes/test/win32/testlibwin32.cpp 2005-12-12 02:03:39 UTC (rev 210)
+++ box/trunk/test/win32/testlibwin32.cpp 2005-12-12 20:50:00 UTC (rev 213)
@@ -1,120 +0,0 @@
-// win32test.cpp : Defines the entry point for the console application.
-//
-
-//#include <windows.h>
-#include "Box.h"
-
-#ifdef WIN32
-
-#include "../../bin/bbackupd/BackupDaemon.h"
-#include "BoxPortsAndFiles.h"
-
-
-int main(int argc, char* argv[])
-{
- chdir("c:\\tmp");
- openfile("test", O_CREAT, 0);
- struct stat ourfs;
- //test our opendir, readdir and closedir
- //functions
- DIR *ourDir = opendir("C:");
-
- if ( ourDir != NULL )
- {
- struct dirent *info;
- do
- {
- info = readdir(ourDir);
- if ( info ) printf("File/Dir name is : %s\r\n", info->d_name);
-
- }while ( info != NULL );
-
- closedir(ourDir);
-
- }
-
- std::string diry("C:\\Projects\\boxbuild\\testfiles\\");
- ourDir = opendir(diry.c_str());
- if ( ourDir != NULL )
- {
- struct dirent *info;
- do
- {
- info = readdir(ourDir);
- if ( info == NULL ) break;
- std::string file(diry + info->d_name);
- stat(file.c_str(), &ourfs);
- if ( info ) printf("File/Dir name is : %s\r\n", info->d_name);
-
- }while ( info != NULL );
-
- closedir(ourDir);
-
- }
-
- stat("c:\\windows", &ourfs);
- stat("c:\\autoexec.bat", &ourfs);
- printf("Finished dir read");
-#if 0
- //remove - sleepycat include a version of getopt - mine never REALLY worked !
- //test our getopt function
- std::string commline("-q -c fgfgfg -f -l hello");
-
- int c;
- while((c = getopt(commline.size(), (char * const *)commline.c_str(), "qwc:l:")) != -1)
- {
- printf("switch = %c, param is %s\r\n", c, optarg);
- }
-#endif
- //end of getopt test
-
- //now test our statfs funct
- stat("c:\\cert.cer", &ourfs);
-
-
-
- char *timee;
-
- timee = ctime(&ourfs.st_mtime);
-
- if ( S_ISREG(ourfs.st_mode))
- {
- printf("is a normal file");
- }
- else
- {
- printf("is a directory?");
- }
-
- lstat("c:\\windows", &ourfs);
-
- if ( S_ISDIR(ourfs.st_mode))
- {
- printf("is a directory");
- }
- else
- {
- printf("is a file?");
- }
-
- //test the syslog functions
- openlog("Box Backup", 0,0);
- //the old ones are the best...
- syslog(LOG_ERR, "Hello World");
- syslog(LOG_ERR, "Value of int is: %i", 6);
-
- closelog();
-
- //first off get the path name for the default
- char buf[MAX_PATH];
-
- GetModuleFileName(NULL, buf, sizeof(buf));
- std::string buffer(buf);
- std::string conf("-c " + buffer.substr(0,(buffer.find("win32test.exe"))) + "bbackupd.conf");
- //std::string conf( "-c " + buffer.substr(0,(buffer.find("bbackupd.exe"))) + "bbackupd.conf");
-
-
- return 0;
-}
-
-#endif // WIN32
Copied: box/trunk/test/win32/testlibwin32.cpp (from rev 210, box/chris/win32/merge/07-win32-fixes/test/win32/testlibwin32.cpp)
Copied: box/trunk/win32.bat (from rev 210, box/chris/win32/merge/07-win32-fixes/win32.bat)
Copied: box/trunk/win32test.vcproj (from rev 210, box/chris/win32/merge/07-win32-fixes/win32test.vcproj)