static int buffer_add_value (const char *value, /* {{{ */
char **buffer_ret, size_t *buffer_size_ret)
{
- char temp[4096];
+ char temp[RRD_CMD_MAX];
if (strncmp (value, "N:", 2) == 0)
snprintf (temp, sizeof (temp), "%lu:%s",
static int buffer_add_ulong (const unsigned long value, /* {{{ */
char **buffer_ret, size_t *buffer_size_ret)
{
- char temp[4096];
+ char temp[RRD_CMD_MAX];
snprintf (temp, sizeof (temp), "%lu", value);
temp[sizeof (temp) - 1] = 0;
rrdc_response_t *ret = NULL;
int status = 0;
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t i;
return 0;
else if (daemon_addr == NULL)
{
+ char *addr = getenv(ENV_RRDCACHED_ADDRESS);
/* here we have to handle the case i.e.
* UPDATE --daemon ...; UPDATEV (no --daemon) ...
* In other words: we have a cached connection,
* but it is not specified in the current command.
* Daemon is only implied in this case if set in ENV
*/
- if (getenv(ENV_RRDCACHED_ADDRESS) != NULL)
+ if (addr != NULL && strcmp(addr,"") != 0)
return 1;
else
return 0;
{
int status = 0;
- if (addr == NULL)
+ if (addr == NULL) {
addr = getenv (ENV_RRDCACHED_ADDRESS);
+ }
- if (addr == NULL)
+ if (addr == NULL || strcmp(addr,"") == 0) {
+ addr = NULL;
return 0;
+ }
pthread_mutex_lock(&lock);
int rrdc_update (const char *filename, int values_num, /* {{{ */
const char * const *values)
{
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
int rrdc_flush (const char *filename) /* {{{ */
{
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
rrd_info_t * rrdc_info (const char *filename) /* {{{ */
{
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
break;
case RD_I_STR:
chomp(s);
- info.u_str = (char*)malloc(sizeof(char) * (strlen(s) + 1));
- strcpy(info.u_str,s);
+ info.u_str = strdup(s);
break;
case RD_I_BLO:
rrd_set_error ("rrdc_info: BLOB objects are not supported");
time_t rrdc_last (const char *filename) /* {{{ */
{
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
time_t rrdc_first (const char *filename, int rraindex) /* {{{ */
{
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
int argc,
const char **argv)
{
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
char ***ret_ds_names,
rrd_value_t **ret_data)
{
- char buffer[4096];
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
response_free (res);
if (head == NULL)
+#ifdef EPROTO
return (EPROTO);
+#else
+ return (EINVAL);
+#endif
*ret_stats = head;
return (0);