Took a closer `look' at last nights changes..

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index 5458a2c..76c62d9 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -31,7 +31,7 @@
 
 static int loop = 0;
 
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT
 kstat_ctl_t *kc;
 #endif /* HAVE_LIBKSTAT */
 
@@ -45,7 +45,7 @@ int   num_pinghosts = 0;
  */
 time_t curtime;
 
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
 int operating_mode;
 #endif
 
@@ -89,7 +89,7 @@ static int change_basedir (char *dir)
        return (0);
 } /* static int change_basedir (char *dir) */
 
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT
 static void update_kstat (void)
 {
        if (kc == NULL)
@@ -121,10 +121,8 @@ static void exit_usage (char *name)
                        
                        "Available options:\n"
                        "  General:\n"
-                       /*
                        "    -C <file>       Configuration file.\n"
                        "                    Default: "CONFIGFILE"\n"
-                       */
 #if COLLECT_DAEMON
                        "    -P <file>       PID file.\n"
                        "                    Default: "PIDFILE"\n"
@@ -160,12 +158,12 @@ static int start_client (void)
 {
        int sleepingtime;
 
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT
        kc = NULL;
        update_kstat ();
 #endif
 
-#ifdef HAVE_LIBSTATGRAB
+#if HAVE_LIBSTATGRAB
        if (sg_init ())
        {
                syslog (LOG_ERR, "sg_init: %s", sg_str_error (sg_get_error ()));
@@ -184,7 +182,7 @@ static int start_client (void)
        while (loop == 0)
        {
                curtime = time (NULL);
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT
                update_kstat ();
 #endif
                plugin_read_all ();
@@ -201,7 +199,7 @@ static int start_client (void)
        return (0);
 } /* static int start_client (void) */
 
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
 static int start_server (void)
 {
        char *host;
@@ -225,7 +223,7 @@ static int start_server (void)
 #endif /* HAVE_LIBRRD */
 
 #if COLLECT_DAEMON
-static int pidfile_create (char *file)
+static int pidfile_create (const char *file)
 {
        FILE *fh;
 
@@ -242,14 +240,17 @@ static int pidfile_create (char *file)
        fclose(fh);
 
        return (0);
-} /* static int pidfile_create (char *file) */
+} /* static int pidfile_create (const char *file) */
 #endif /* COLLECT_DAEMON */
 
 #if COLLECT_DAEMON
-static int pidfile_remove (void)
+static int pidfile_remove (const char *file)
 {
-      return (unlink (PIDFILE));
-} /* static int pidfile_remove (void) */
+       if (file == NULL) {
+               file = PIDFILE;
+       }
+       return (unlink (file));
+} /* static int pidfile_remove (const char *file) */
 #endif /* COLLECT_DAEMON */
 
 int main (int argc, char **argv)
@@ -261,13 +262,13 @@ int main (int argc, char **argv)
 #if COLLECT_DAEMON
        char *pidfile    = PIDFILE;
        pid_t pid;
-       int daemonize = 1;
+       int daemonize    = 1;
 #endif
 #if COLLECT_DEBUG
        char *logfile    = LOGFILE;
 #endif
 
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
        operating_mode = MODE_LOCAL;
 #endif
 
@@ -299,7 +300,7 @@ int main (int argc, char **argv)
 
                switch (c)
                {
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
                        case 'c':
                                operating_mode = MODE_CLIENT;
                                break;
@@ -427,7 +428,7 @@ int main (int argc, char **argv)
        /*
         * run the actual loops
         */
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
        if (operating_mode == MODE_SERVER)
                start_server ();
        else /* if (operating_mode == MODE_CLIENT || operating_mode == MODE_LOCAL) */
@@ -442,8 +443,8 @@ int main (int argc, char **argv)
 
 #if COLLECT_DAEMON
        if (daemonize)
-               pidfile_remove();
+               pidfile_remove(pidfile);
 #endif /* COLLECT_DAEMON */
 
        return (0);
-}
+} /* int main (int argc, char **argv) */