X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_daemon.c;h=7a72b070e088191af853c1b43dfc896eee515acb;hp=68216cb5ee4525f92c01809b5f512c5285b31259;hb=85cd3f3afae48026843bea34d2d0d1056ee9dda5;hpb=2fd3455de8e25630bb6c533314806ed70ba41344 diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c index 68216cb..7a72b07 100644 --- a/src/rrd_daemon.c +++ b/src/rrd_daemon.c @@ -75,19 +75,24 @@ #include "rrd_client.h" #include + +#ifndef WIN32 #include -#include #include -#include #include -#include #include +# include + +#else + +#endif +#include +#include #include #include #include #include -#include #include #include #include @@ -461,7 +466,7 @@ static int add_response_info(listen_socket_t *sock, char *fmt, ...) /* {{{ */ va_start(argp, fmt); #ifdef HAVE_VSNPRINTF - len = vsnprintf(buffer, sizeof(buffer)-1, fmt, argp); + len = vsnprintf(buffer, sizeof(buffer), fmt, argp); #else len = vsprintf(buffer, fmt, argp); #endif @@ -519,7 +524,7 @@ static int send_response (listen_socket_t *sock, response_code rc, rclen = sprintf(buffer, "%d ", lines); va_start(argp, fmt); #ifdef HAVE_VSNPRINTF - len = vsnprintf(buffer+rclen, sizeof(buffer)-rclen-1, fmt, argp); + len = vsnprintf(buffer+rclen, sizeof(buffer)-rclen, fmt, argp); #else len = vsprintf(buffer+rclen, fmt, argp); #endif @@ -2154,7 +2159,7 @@ static int open_listen_socket_network(const listen_socket_t *sock) /* {{{ */ char *port; int status; - strncpy (addr_copy, sock->addr, sizeof (addr_copy)); + strncpy (addr_copy, sock->addr, sizeof(addr_copy)-1); addr_copy[sizeof (addr_copy) - 1] = 0; addr = addr_copy; @@ -2446,7 +2451,7 @@ static int daemonize (void) /* {{{ */ { listen_socket_t sock; memset(&sock, 0, sizeof(sock)); - strncpy(sock.addr, RRDCACHED_DEFAULT_ADDRESS, sizeof(sock.addr)); + strncpy(sock.addr, RRDCACHED_DEFAULT_ADDRESS, sizeof(sock.addr)-1); open_listen_socket (&sock); }