/*****************************************************************************
- * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2004
*****************************************************************************
* rrd_restore.c creates new rrd from data dumped by rrd_dump.c
*****************************************************************************/
void parse_patch1028_CDP_params(char **buf, rrd_t *rrd, int rra_index, int ds_index);
void parse_FAILURES_history(char **buf, rrd_t *rrd, int rra_index, int ds_index);
-/* convert all ocurances of <BlaBlaBla> to <blablabla> */
+/* convert all occurrences of <BlaBlaBla> to <blablabla> */
void xml_lc(char* buf){
int intag=0;
while (eat_tag(&ptr2,"rra") == 1){
rrd->stat_head->rra_cnt++;
- /* alocate and reset rra definition areas */
+ /* allocate and reset rra definition areas */
if((rrd->rra_def = rrd_realloc(rrd->rra_def,rrd->stat_head->rra_cnt*sizeof(rra_def_t)))==NULL){
rrd_set_error("allocating rra_def"); return -1; }
memset(&(rrd->rra_def[rrd->stat_head->rra_cnt-1]), 0, sizeof(rra_def_t));
- /* alocate and reset consolidation point areas */
+ /* allocate and reset consolidation point areas */
if((rrd->cdp_prep = rrd_realloc(rrd->cdp_prep,
rrd->stat_head->rra_cnt
*rrd->stat_head->ds_cnt*sizeof(cdp_prep_t)))==NULL){
if (strcmp("-",file_name)==0){
rrd_file= stdout;
} else {
+#ifdef WIN32
+ fdflags = O_RDWR|O_BINARY|O_CREAT;
+#else
fdflags = O_WRONLY|O_CREAT;
+#endif
if (force_overwrite == 0) {
fdflags |= O_EXCL;
}
force_overwrite=1;
break;
default:
- rrd_set_error("usage rrdtool %s [--range-check|-r] file.xml file.rrd",argv[0]);
- return -1;
+ rrd_set_error("usage rrdtool %s [--range-check|-r] [--force-overwrite/-f] file.xml file.rrd",argv[0]);
+ return -1;
break;
}
}