Utils/Daemon: BUGFIX: Fix command line argument parsing

Utils/Daemon: Add 'main()' documentatory example

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@536 270642c3-0616-0410-b53a-bc976706d245

diff --git a/Utils/Daemon/Daemon.cc b/Utils/Daemon/Daemon.cc
index 201fe37..7f1effe 100644 (file)
--- a/Utils/Daemon/Daemon.cc
+++ b/Utils/Daemon/Daemon.cc
@@ -151,7 +151,7 @@ prefix_ void senf::Daemon::detach()
 
 namespace {
     /* Purposely *not* derived from std::exception */
-    struct  DaemonExitException {
+    struct DaemonExitException {
         DaemonExitException(unsigned c) : code(c) {}
         unsigned code;
     };
@@ -223,7 +223,8 @@ prefix_ void senf::Daemon::configure()
             std::string::size_type komma (arg.find(','));
             if (komma == std::string::npos) {
                 boost::trim(arg);
-                consoleLog(arg);
+                if (arg == std::string("none")) consoleLog("");
+                else if (!arg.empty())          consoleLog(arg);
             } else {
                 std::string arg1 (arg,0,komma);
                 std::string arg2 (arg,komma+1);

diff --git a/Utils/Daemon/Mainpage.dox b/Utils/Daemon/Mainpage.dox
index ffde18d..904028c 100644 (file)
--- a/Utils/Daemon/Mainpage.dox
+++ b/Utils/Daemon/Mainpage.dox
@@ -36,7 +36,7 @@
             // here after setting default parameters
             senf::Daemon::configure();
         }
-
+    
         void init() {
             // Initialize application. Setup all necessary objects. After init()
             // has completed, the startup should not fail
@@ -63,7 +63,32 @@
     Since there are times, where separating init() and run() into two separate functions is
     difficult, instead of defining init() and run(), the member main() may be defined. This member
     must call detach() as soon as initialization is completed to detach from the foreground
-    terminal.
+    terminal.    
+    \code
+    class MyDaemon : public senf::Daemon
+    {
+        // 'configure()' like above. Don't implement 'init()' or 'run()' if you implement 'main()'.
+
+        void main() {
+            // Initialize application. Setup all necessary objects. When implementing main(), the
+            // objects will most often live on the stack.
+
+            MyAppObject app;
+
+            if (some_error)
+                // Call Daemon::exit() to terminate execution prematurely
+                exit(1);
+
+            // After initialization is complete, you *must* call 'detach()'.
+
+            detach()
+
+            // Now we can start the application main loop
+
+            app.run();
+        }
+    };
+    \endcode
 
     \see 
         \ref senf::Daemon class \n