Some work in compiler happiness department.

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 2 insertions, 0 deletions

diff --git a/src/dudki.cc b/src/dudki.cc
index 91a3342..1f95be4 100644
--- a/src/dudki.cc
+++ b/src/dudki.cc
@@ -1,135 +1,137 @@
 #include <unistd.h>
 #include <signal.h>
 #include <syslog.h>
 #include <errno.h>
 #include <iostream>
 #include <fstream>
 #include <stdexcept>
+#include <cstring>
+#include <stdlib.h>
 using namespace std;
 #include "configuration.h"
 #include "util.h"
 
 #include "config.h"
 #ifdef HAVE_GETOPT_H
 # include <getopt.h>
 #endif
 
 #ifndef DEFAULT_CONF_FILE
 # define DEFAULT_CONF_FILE "/etc/dudki.conf"
 #endif
 
 #define PHEADER PACKAGE " Version " VERSION
 #define PCOPY   "Copyright (c) 2004-2006 Klever Group"
 
 bool finishing = false;
 bool restarting = false;
 static char **_argv = NULL;
 
 static void lethal_signal_handler(int signum) {
     syslog(LOG_NOTICE,"Lethal signal received. Terminating.");
     finishing = true;
 }
 static void sighup_handler(int signum) {
     syslog(LOG_NOTICE,"SUGHUP received, reloading.");
     restarting = finishing = true;
 }
 
 void check_herd(configuration& config) {
     process::prepare_herd();
     for(processes_t::iterator i=config.processes.begin();i!=config.processes.end();++i)
         i->second.check(i->first,config);
     process::unprepare_herd();
 }
 
 void signal_self(const configuration& config,int signum) {
     ifstream pids(config.pidfile.c_str(),ios::in);
     if(!pids)
         throw runtime_error("Can't detect running instance");
     pid_t pid = 0;
     pids >> pid;
     if(!pid)
         throw runtime_error("Can't detect running instance");
     if(pid==getpid())
         throw 0;
     if(kill(pid,signum))
         throw runtime_error("Failed to signal running instance");
 }
 
 int main(int argc,char **argv) {
     try {
         _argv = new char*[argc+1];
         if(!_argv)
             throw runtime_error("memory allocation problem at the very start");
         memmove(_argv,argv,sizeof(*_argv)*(argc+1));
         string config_file = DEFAULT_CONF_FILE;
         enum {
             op_default,
             op_work,
             op_signal,
             op_ensure,
             op_test
         } op = op_default;
         int op_signum = 0;
         while(true) {
         #defineSHORTOPTSTRING "f:hVLrkcets:"
 #ifdef HAVE_GETOPT_LONG
             static struct option opts[] = {
                 { "help", no_argument, 0, 'h' },
                 { "usage", no_argument, 0, 'h' },
                 { "version", no_argument, 0, 'V' },
                 { "license", no_argument, 0, 'L' },
                 { "config", required_argument, 0, 'f' },
                 { "kill", no_argument, 0, 'k' },
                 { "reload", no_argument, 0, 'r' },
                 { "signal", required_argument, 0, 's' },
                 { "check", no_argument, 0, 'c' },
                 { "ensure", no_argument, 0, 'e' },
                 { "test", no_argument, 0, 't' },
                 { NULL, 0, 0, 0 }
             };
             int c = getopt_long(argc,argv,SHORTOPTSTRING,opts,NULL);
 #else /* !HAVE_GETOPT_LONG */
             int c = getopt(argc,argv,SHORTOPTSTRING);
 #endif /* /HAVE_GETOPT_LONG */
             if(c==-1)
                 break;
             switch(c) {
                 case 'h':
                     cerr << PHEADER << endl
                         << PCOPY << endl << endl
                         << " " << argv[0] << " [options] [processes]" << endl << endl <<
 #ifdef HAVE_GETOPT_LONG
                         " -h, --help\n"
                         " --usage         display this text\n"
                         " -V, --version   display version number\n"
                         " -L, --license   show license\n"
                         " -f filename, --config=filename\n"
                         "                 specify the configuration file to use\n"
                         "\n"
                         " -k, --kill      stop running instance (send SIGTERM)\n"
                         " -r, --reload    reload running instance (send SIGHUP)\n"
                         " -s signum, --signal=signum\n"
                         "                 send the specified signal to the running process\n"
                         " -c, --check     check if the process is running\n"
                         "     (the above commands operate on dudki itself if no\n"
                         "      process name has been specified)\n"
                         " -e, --ensure    ensure that dudki is running\n"
                         " -t, --test      test configuration file and exit"
 #else /* !HAVE_GETOPT_LONG */
                         " -h              display this text\n"
                         " -V              display version number\n"
                         " -L              show license\n"
                         " -f filename     specify the configuration file to use\n"
                         "\n"
                         " -k              stop running instance (send SIGTERM)\n"
                         " -r              reload running instance (send SIGHUP)\n"
                         " -s signum       send the specified signal to the running process\n"
                         " -c              check if the process is running\n"
                         "     (the above commands operate on dudki itself if no\n"
                         "      process name has been specified)\n"
                         " -e              ensure that dudki is running\n"
                         " -t              test configuration file and exit"
 #endif /* /HAVE_GETOPT_LONG */
                         << endl;
                     exit(0);
                     break;