import version 0.11rc1

This commit has been made by 'bzr import'. I used the upstream tarball
of Version 0.11rc1 for creating it. It has the md5sum:

75608d8bb72dff9a556850ccd0ae8cb9

1 files changed, 15 insertions, 3 deletions

diff --git a/lib/server/Daemon.h b/lib/server/Daemon.h
index ff36fba4..a500ec6a 100644
--- a/lib/server/Daemon.h
+++ b/lib/server/Daemon.h
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
@@ -79,14 +79,18 @@ private:
 public:
 
 	int Main(const char *DefaultConfigFile, int argc, const char *argv[]);
+
+	/* override this Main() if you want custom option processing: */
+	virtual int Main(const std::string &rConfigFile);
 	
 	virtual void Run();
 	const Configuration &GetConfiguration() const;
 	const std::string &GetConfigFileName() const {return mConfigFileName;}
 
 	virtual const char *DaemonName() const;
-	virtual const char *DaemonBanner() const;
+	virtual std::string DaemonBanner() const;
 	virtual const ConfigurationVerify *GetConfigVerify() const;
+	virtual void Usage();
 	
 	bool StopRun() {return mReloadConfigWanted | mTerminateWanted;}
 	bool IsReloadConfigWanted() {return mReloadConfigWanted;}
@@ -103,18 +107,26 @@ public:
 
 protected:
 	box_time_t GetLoadedConfigModifiedTime() const;
+	bool IsSingleProcess() { return mSingleProcess; }
+	virtual std::string GetOptionString();
+	virtual int ProcessOption(signed int option);
 	
 private:
 	static void SignalHandler(int sigraised);
 	box_time_t GetConfigFileModifiedTime() const;
 	
-private:
 	std::string mConfigFileName;
 	Configuration *mpConfiguration;
 	box_time_t mLoadedConfigModifiedTime;
 	bool mReloadConfigWanted;
 	bool mTerminateWanted;
+	bool mSingleProcess;
+	bool mRunInForeground;
+	bool mKeepConsoleOpenAfterFork;
+	bool mHaveConfigFile;
+	int mLogLevel; // need an int to do math with
 	static Daemon *spDaemon;
+	std::string mAppName;
 };
 
 #define DAEMON_VERIFY_SERVER_KEYS 	{"PidFile", 0, ConfigTest_Exists, 0}, \