/*****************************************************************************
- * RRDtool 1.3rc9 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_info Get Information about the configuration of an RRD
*****************************************************************************/
#include "rrd_tool.h"
#include "rrd_rpncalc.h"
+#include "rrd_client.h"
#include <stdarg.h>
/* proto */
int maxlen = 1024 + strlen(fmt);
char *str = NULL;
va_list argp;
- str = malloc(sizeof(char) * (maxlen + 1));
+ str = (char*)malloc(sizeof(char) * (maxlen + 1));
if (str != NULL) {
va_start(argp, fmt);
#ifdef HAVE_VSNPRINTF
{
rrd_info_t *next;
- next = malloc(sizeof(*next));
+ next = (rrd_info_t*)malloc(sizeof(*next));
next->next = (rrd_info_t *) 0;
if (info)
info->next = next;
next->value.u_int = value.u_int;
break;
case RD_I_STR:
- next->value.u_str = malloc(sizeof(char) * (strlen(value.u_str) + 1));
+ next->value.u_str = (char*)malloc(sizeof(char) * (strlen(value.u_str) + 1));
strcpy(next->value.u_str, value.u_str);
break;
case RD_I_BLO:
next->value.u_blo.size = value.u_blo.size;
next->value.u_blo.ptr =
- malloc(sizeof(unsigned char) * value.u_blo.size);
+ (unsigned char *)malloc(sizeof(unsigned char) * value.u_blo.size);
memcpy(next->value.u_blo.ptr, value.u_blo.ptr, value.u_blo.size);
break;
}
char **argv)
{
rrd_info_t *info;
+ char *opt_daemon = NULL;
+ int status;
- if (argc < 2) {
- rrd_set_error("please specify an rrd");
- return NULL;
- }
+ optind = 0;
+ opterr = 0; /* initialize getopt */
- info = rrd_info_r(argv[1]);
+ while (42) {
+ int opt;
+ int option_index = 0;
+ static struct option long_options[] = {
+ {"daemon", required_argument, 0, 'd'},
+ {0, 0, 0, 0}
+ };
- return (info);
-}
+ opt = getopt_long(argc, argv, "d:", long_options, &option_index);
+
+ if (opt == EOF)
+ break;
+
+ switch (opt) {
+ case 'd':
+ if (opt_daemon != NULL)
+ free (opt_daemon);
+ opt_daemon = strdup (optarg);
+ if (opt_daemon == NULL)
+ {
+ rrd_set_error ("strdup failed.");
+ return (NULL);
+ }
+ break;
+ default:
+ rrd_set_error ("Usage: rrdtool %s [--daemon <addr>] <file>",
+ argv[0]);
+ return (NULL);
+ break;
+ }
+ } /* while (42) */
+
+ if ((argc - optind) != 1) {
+ rrd_set_error ("Usage: rrdtool %s [--daemon <addr>] <file>",
+ argv[0]);
+ return (NULL);
+ }
+ status = rrdc_flush_if_daemon(opt_daemon, argv[optind]);
+ if (opt_daemon) free (opt_daemon);
+ if (status) return (NULL);
+
+ info = rrd_info_r(argv[optind]);
+
+ return (info);
+} /* rrd_info_t *rrd_info */
rrd_info_t *rrd_info_r(
char *filename)
enum cf_en current_cf;
enum dst_en current_ds;
+ rrd_init(&rrd);
rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
if (rrd_file == NULL)
goto err_free;
info.u_cnt = rrd.live_head->last_up;
cd = rrd_info_push(cd, sprintf_alloc("last_update"), RD_I_CNT, info);
+ info.u_cnt = rrd_get_header_size(&rrd);
+ cd = rrd_info_push(cd, sprintf_alloc("header_size"), RD_I_CNT, info);
+
for (i = 0; i < rrd.stat_head->ds_cnt; i++) {
info.u_str = rrd.ds_def[i].dst;