X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectdmon.c;h=33f02b45694d889d07613a05110230c1b32d7442;hb=290741f2e6de9e9b467463c1f0c6f031c4036428;hp=e496eb07a65d23138513786967fb0fb2350f6fa3;hpb=759c544568c019721fe868e7c319bd1471fd501c;p=collectd.git diff --git a/src/collectdmon.c b/src/collectdmon.c index e496eb07..13304f2a 100644 --- a/src/collectdmon.c +++ b/src/collectdmon.c @@ -1,24 +1,33 @@ /** * collectd - src/collectdmon.c - * Copyright (C) 2007 Sebastian Harl + * Copyright (C) 2007 Sebastian Harl * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License is applicable. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * - * Author: + * Authors: * Sebastian Harl **/ +#if !defined(__GNUC__) || !__GNUC__ +# define __attribute__(x) /**/ +#endif + #include "config.h" #include @@ -57,10 +66,11 @@ static int loop = 0; static int restart = 0; -static char *pidfile = NULL; -static pid_t collectd_pid = 0; +static const char *pidfile = NULL; +static pid_t collectd_pid = 0; -static void exit_usage (char *name) +__attribute__((noreturn)) +static void exit_usage (const char *name) { printf ("Usage: %s [-- ]\n" @@ -71,8 +81,8 @@ static void exit_usage (char *name) "\nFor see collectd.conf(5).\n" - "\n"PACKAGE" "VERSION", http://collectd.org/\n" - "by Florian octo Forster \n" + "\n"PACKAGE_NAME" "PACKAGE_VERSION", http://collectd.org/\n" + "by Florian octo Forster \n" "for contributions see `AUTHORS'\n", name); exit (0); } /* exit_usage */ @@ -110,6 +120,7 @@ static int pidfile_delete (void) static int daemonize (void) { struct rlimit rl; + int dev_null; pid_t pid = 0; int i = 0; @@ -143,26 +154,33 @@ static int daemonize (void) for (i = 0; i < (int)rl.rlim_max; ++i) close (i); - errno = 0; - if (open ("/dev/null", O_RDWR) != 0) { - syslog (LOG_ERR, "Error: couldn't connect STDIN to /dev/null: %s", - strerror (errno)); + dev_null = open ("/dev/null", O_RDWR); + if (dev_null == -1) { + syslog (LOG_ERR, "Error: couldn't open /dev/null: %s", strerror (errno)); return -1; } - errno = 0; - if (dup (0) != 1) { - syslog (LOG_ERR, "Error: couldn't connect STDOUT to /dev/null: %s", - strerror (errno)); + if (dup2 (dev_null, STDIN_FILENO) == -1) { + close (dev_null); + syslog (LOG_ERR, "Error: couldn't connect STDIN to /dev/null: %s", strerror (errno)); return -1; } - errno = 0; - if (dup (0) != 2) { - syslog (LOG_ERR, "Error: couldn't connect STDERR to /dev/null: %s", - strerror (errno)); + if (dup2 (dev_null, STDOUT_FILENO) == -1) { + close (dev_null); + syslog (LOG_ERR, "Error: couldn't connect STDOUT to /dev/null: %s", strerror (errno)); return -1; } + + if (dup2 (dev_null, STDERR_FILENO) == -1) { + close (dev_null); + syslog (LOG_ERR, "Error: couldn't connect STDERR to /dev/null: %s", strerror (errno)); + return -1; + } + + if ((dev_null != STDIN_FILENO) && (dev_null != STDOUT_FILENO) && (dev_null != STDERR_FILENO)) + close (dev_null); + return 0; } /* daemonize */ @@ -197,13 +215,13 @@ static int collectd_stop (void) return 0; } /* collectd_stop */ -static void sig_int_term_handler (int signo) +static void sig_int_term_handler (int __attribute__((unused)) signo) { ++loop; return; } /* sig_int_term_handler */ -static void sig_hup_handler (int signo) +static void sig_hup_handler (int __attribute__((unused)) signo) { ++restart; return; @@ -308,7 +326,10 @@ int main (int argc, char **argv) openlog ("collectdmon", LOG_CONS | LOG_PID, LOG_DAEMON); if (-1 == daemonize ()) + { + free (collectd_argv); return 1; + } sa.sa_handler = sig_int_term_handler; sa.sa_flags = 0; @@ -316,11 +337,13 @@ int main (int argc, char **argv) if (0 != sigaction (SIGINT, &sa, NULL)) { syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno)); + free (collectd_argv); return 1; } if (0 != sigaction (SIGTERM, &sa, NULL)) { syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno)); + free (collectd_argv); return 1; } @@ -328,12 +351,7 @@ int main (int argc, char **argv) if (0 != sigaction (SIGHUP, &sa, NULL)) { syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno)); - return 1; - } - - sigaddset (&sa.sa_mask, SIGCHLD); - if (0 != sigprocmask (SIG_BLOCK, &sa.sa_mask, NULL)) { - syslog (LOG_ERR, "Error: sigprocmask() failed: %s", strerror (errno)); + free (collectd_argv); return 1; }