X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_restore.c;h=e759c1c3028a6c895aeef2ab4ddc2f21e4adce1d;hb=61a736a2e1ad057f78cb5c2245207c9d02d86f29;hp=e24cc8e990d2ac4cf8f466241555c5d26f7a8db4;hpb=37b2687fdcdd310be0aa5d622426e04820f92d3c;p=rrdtool.git diff --git a/src/rrd_restore.c b/src/rrd_restore.c index e24cc8e..e759c1c 100644 --- a/src/rrd_restore.c +++ b/src/rrd_restore.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 *****************************************************************************/ @@ -15,12 +15,12 @@ int skip(char **); int eat_tag(char **, char *); int read_tag(char **, char *, char *, void *); int xml2rrd(char*, rrd_t*, char); -int rrd_write(char *, rrd_t *); +int rrd_write(char *, rrd_t *, char); void parse_patch1028_RRA_params(char **buf, rrd_t *rrd, int rra_index); 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 to */ +/* convert all occurrences of to */ void xml_lc(char* buf){ int intag=0; @@ -122,10 +122,16 @@ int xml2rrd(char* buf, rrd_t* rrd, char rc){ strcpy(rrd->stat_head->cookie,RRD_COOKIE); read_tag(&ptr,"version","%4[0-9]",rrd->stat_head->version); /* added primitive version checking */ - if (atoi(rrd -> stat_head -> version) != 2) + if (atoi(rrd -> stat_head -> version) > atoi(RRD_VERSION) ) { - rrd_set_error("Incompatible file version, detected version %s, required version %s\n", - rrd -> stat_head -> version, RRD_VERSION); + rrd_set_error("Incompatible file version, detected version %s is bigger than supported version %s\n", + rrd -> stat_head -> version, RRD_VERSION ); + free(rrd -> stat_head); + return -1; + } + if (atoi(rrd -> stat_head -> version) < 2) + { + rrd_set_error("Can only restore version >= 2 (Not %s). Dump your rrd using a current rrdtool dump.", rrd -> stat_head -> version ); free(rrd -> stat_head); return -1; } @@ -188,12 +194,12 @@ int xml2rrd(char* buf, rrd_t* rrd, char rc){ 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){ @@ -399,18 +405,27 @@ int xml2rrd(char* buf, rrd_t* rrd, char rc){ /* create and empty rrd file according to the specs given */ int -rrd_write(char *file_name, rrd_t *rrd) +rrd_write(char *file_name, rrd_t *rrd, char force_overwrite) { unsigned long i,ii,val_cnt; FILE *rrd_file=NULL; + int fdflags; + int fd; if (strcmp("-",file_name)==0){ - *rrd_file= *stdout; + rrd_file= stdout; } else { - int fd = open(file_name,O_RDWR|O_CREAT|O_EXCL,0666); +#ifdef WIN32 + fdflags = O_RDWR|O_BINARY|O_CREAT; +#else + fdflags = O_WRONLY|O_CREAT; +#endif + if (force_overwrite == 0) { + fdflags |= O_EXCL; + } + fd = open(file_name,fdflags,0666); if (fd == -1 || (rrd_file = fdopen(fd,"wb")) == NULL) { - rrd_set_error("creating '%s': %s",file_name,strerror(errno)); - rrd_free(rrd); + rrd_set_error("creating '%s': %s",file_name,rrd_strerror(errno)); if (fd != -1) close(fd); return(-1); @@ -424,8 +439,12 @@ rrd_write(char *file_name, rrd_t *rrd) fwrite(rrd->rra_def, sizeof(rra_def_t), rrd->stat_head->rra_cnt, rrd_file); - - fwrite(rrd->live_head, sizeof(live_head_t),1, rrd_file); + + /* maybe the xml hold an old formatted rrd */ + if (atoi(rrd->stat_head->version) < 3) + fwrite(&(rrd->live_head->last_up), sizeof(long),1, rrd_file); + else + fwrite(rrd->live_head, sizeof(live_head_t),1, rrd_file); fwrite( rrd->pdp_prep, sizeof(pdp_prep_t),rrd->stat_head->ds_cnt,rrd_file); @@ -460,11 +479,12 @@ rrd_restore(int argc, char **argv) rrd_t rrd; char *buf; char rc = 0; + char force_overwrite = 0; /* init rrd clean */ rrd_init(&rrd); if (argc<3) { - rrd_set_error("usage rrdtool %s [--range-check/-r] file.xml file.rrd",argv[0]); + rrd_set_error("usage rrdtool %s [--range-check/-r] [--force-overwrite/-f] file.xml file.rrd",argv[0]); return -1; } @@ -472,13 +492,14 @@ rrd_restore(int argc, char **argv) static struct option long_options[] = { {"range-check", required_argument, 0, 'r'}, + {"force-overwrite", required_argument, 0, 'f'}, {0,0,0,0} }; int option_index = 0; int opt; - opt = getopt_long(argc, argv, "r", long_options, &option_index); + opt = getopt_long(argc, argv, "r:f", long_options, &option_index); if (opt == EOF) break; @@ -487,9 +508,12 @@ rrd_restore(int argc, char **argv) case 'r': rc=1; break; + case 'f': + 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; } } @@ -503,7 +527,7 @@ rrd_restore(int argc, char **argv) return -1; } free(buf); - if(rrd_write(argv[optind+1],&rrd)==-1){ + if(rrd_write(argv[optind+1],&rrd,force_overwrite)==-1){ rrd_free(&rrd); return -1; }; @@ -513,6 +537,7 @@ rrd_restore(int argc, char **argv) /* a backwards compatibility routine that will parse the RRA params section * generated by the aberrant patch to 1.0.28. */ + void parse_patch1028_RRA_params(char **buf, rrd_t *rrd, int rra_index) { @@ -557,7 +582,7 @@ parse_FAILURES_history(char **buf, rrd_t *rrd, int rra_index, int ds_index) { char history[MAX_FAILURES_WINDOW_LEN + 1]; char *violations_array; - short i; + unsigned short i; /* 28 = MAX_FAILURES_WINDOW_LEN */ read_tag(buf, "history", "%28[0-1]", history);