X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FDaemon%2FDaemon.cc;h=27e03e9a68f032b1f854f2bc2f8017c9a8b293af;hb=b20d0d54af0287c76f403e301f068acc60e89d79;hp=1b6e8ae9a62817b28f81fc36a462ebb24c579745;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Daemon/Daemon.cc b/senf/Utils/Daemon/Daemon.cc
index 1b6e8ae..27e03e9 100644
--- a/senf/Utils/Daemon/Daemon.cc
+++ b/senf/Utils/Daemon/Daemon.cc
@@ -35,16 +35,18 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <signal.h>
-#include <execinfo.h>
+#ifdef SENF_DEBUG
+   #include <execinfo.h>
+#endif
 #include <sstream>
 #include <algorithm>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/format.hpp>
-#include "../Exception.hh"
-#include "../membind.hh"
-#include "../Backtrace.hh"
-#include "../signalnames.hh"
+#include <senf/Utils/Exception.hh>
+#include <senf/Utils/membind.hh>
+#include <senf/Utils/Backtrace.hh>
+#include <senf/Utils/signalnames.hh>
 
 // #define __USE_GNU
 #include <ucontext.h>
@@ -314,10 +316,11 @@ prefix_ void senf::Daemon::configure()
 {
     // int i (not unsigned) since argc_ is int ...
     for (int i (1); i<argc_; ++i) {
-        if (argv_[i] == std::string("--no-daemon"))
+        std::string argv (argv_[i]);
+        if (argv == "--no-daemon")
             daemonize(false);
-        else if (boost::starts_with(argv_[i], std::string("--console-log="))) {
-            std::string arg (std::string(argv_[i]), 14u);
+        else if (boost::starts_with(argv, "--console-log=")) {
+            std::string arg (argv.substr(14u));
             std::string::size_type komma (arg.find(','));
             if (komma == std::string::npos) {
                 boost::trim(arg);
@@ -334,7 +337,7 @@ prefix_ void senf::Daemon::configure()
                 else if (! arg2.empty() )        consoleLog(arg2, StdErr);
             }
         }
-        else if (boost::starts_with(argv_[i], std::string("--pid-file="))) 
+        else if (boost::starts_with(argv, "--pid-file="))
             pidFile(std::string(std::string(argv_[i]), 11u));
     }
 }
@@ -568,7 +571,9 @@ prefix_ void senf::Daemon::installSighandlers()
     ::sigaction(SIGFPE,    &sa, NULL);
     ::sigaction(SIGBUS,    &sa, NULL);
     ::sigaction(SIGSEGV,   &sa, NULL);
+#ifdef SIGSTKFLT //SIGSTKFLT is used for stack faults on coprocessors. That condition doesn't exist on MIPS 
     ::sigaction(SIGSTKFLT, &sa, NULL);
+#endif
     ::sigaction(SIGSYS,    &sa, NULL);
     ::sigaction(SIGUSR2,   &sa, NULL);
 #endif