projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
integrate rrdinfo and rrdcreate into the rrdupdate binary - Sven-Göran Bergh
[rrdtool.git]
/
src
/
rrd_info.c
diff --git
a/src/rrd_info.c
b/src/rrd_info.c
index
506dce3
..
5722025
100644
(file)
--- a/
src/rrd_info.c
+++ b/
src/rrd_info.c
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.
3.2 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.
4.3 Copyright by Tobi Oetiker, 1997-2010
*****************************************************************************
* rrd_info Get Information about the configuration of an RRD
*****************************************************************************/
*****************************************************************************
* rrd_info Get Information about the configuration of an RRD
*****************************************************************************/
@@
-71,8
+71,7
@@
rrd_info_t
next->value.u_int = value.u_int;
break;
case RD_I_STR:
next->value.u_int = value.u_int;
break;
case RD_I_STR:
- next->value.u_str = (char*)malloc(sizeof(char) * (strlen(value.u_str) + 1));
- strcpy(next->value.u_str, value.u_str);
+ next->value.u_str = strdup(value.u_str);
break;
case RD_I_BLO:
next->value.u_blo.size = value.u_blo.size;
break;
case RD_I_BLO:
next->value.u_blo.size = value.u_blo.size;
@@
-92,6
+91,7
@@
rrd_info_t *rrd_info(
rrd_info_t *info;
char *opt_daemon = NULL;
int status;
rrd_info_t *info;
char *opt_daemon = NULL;
int status;
+ int flushfirst = 1;
optind = 0;
opterr = 0; /* initialize getopt */
optind = 0;
opterr = 0; /* initialize getopt */
@@
-101,10
+101,11
@@
rrd_info_t *rrd_info(
int option_index = 0;
static struct option long_options[] = {
{"daemon", required_argument, 0, 'd'},
int option_index = 0;
static struct option long_options[] = {
{"daemon", required_argument, 0, 'd'},
+ {"noflush", no_argument, 0, 'F'},
{0, 0, 0, 0}
};
{0, 0, 0, 0}
};
- opt = getopt_long(argc, argv, "d:", long_options, &option_index);
+ opt = getopt_long(argc, argv, "d:
F
", long_options, &option_index);
if (opt == EOF)
break;
if (opt == EOF)
break;
@@
-121,8
+122,12
@@
rrd_info_t *rrd_info(
}
break;
}
break;
+ case 'F':
+ flushfirst = 0;
+ break;
+
default:
default:
- rrd_set_error ("Usage: rrdtool %s [--daemon <addr>] <file>",
+ rrd_set_error ("Usage: rrdtool %s [--daemon <addr>
[--noflush]
] <file>",
argv[0]);
return (NULL);
break;
argv[0]);
return (NULL);
break;
@@
-130,17
+135,23
@@
rrd_info_t *rrd_info(
} /* while (42) */
if ((argc - optind) != 1) {
} /* while (42) */
if ((argc - optind) != 1) {
- rrd_set_error ("Usage: rrdtool %s [--daemon <addr>] <file>",
+ rrd_set_error ("Usage: rrdtool %s [--daemon <addr>
[--noflush]
] <file>",
argv[0]);
return (NULL);
}
argv[0]);
return (NULL);
}
+ if( flushfirst ) {
status = rrdc_flush_if_daemon(opt_daemon, argv[optind]);
status = rrdc_flush_if_daemon(opt_daemon, argv[optind]);
- if (opt_daemon) free (opt_daemon);
if (status) return (NULL);
if (status) return (NULL);
+ }
+ rrdc_connect (opt_daemon);
+ if (rrdc_is_connected (opt_daemon))
+ info = rrdc_info (argv[optind]);
+ else
info = rrd_info_r(argv[optind]);
info = rrd_info_r(argv[optind]);
+ if (opt_daemon) free(opt_daemon);
return (info);
} /* rrd_info_t *rrd_info */
return (info);
} /* rrd_info_t *rrd_info */
@@
-179,7
+190,7
@@
rrd_info_t *rrd_info_r(
for (i = 0; i < rrd.stat_head->ds_cnt; i++) {
info.u_cnt=i;
for (i = 0; i < rrd.stat_head->ds_cnt; i++) {
info.u_cnt=i;
- cd=info_push(cd,sprintf_alloc("ds[%s].index",
+ cd=
rrd_
info_push(cd,sprintf_alloc("ds[%s].index",
rrd.ds_def[i].ds_nam),
RD_I_CNT, info);
rrd.ds_def[i].ds_nam),
RD_I_CNT, info);