X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_restore.c;h=f3764dac6ce21042dc38d55778586cbf09198f9d;hb=c5282fa77324d86f882cfda15f43b62d2b1f8bc2;hp=207986d89d617f5dd4a052665c0920e77789c735;hpb=285da1fa16e80919db972b1d7021c0b4705bedb1;p=rrdtool.git

diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index 207986d..f3764da 100644
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
@@ -6,6 +6,7 @@
 
 #include "rrd_tool.h"
 #include "rrd_rpncalc.h"
+#include <fcntl.h>
 
 /* Prototypes */
 
@@ -121,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;
   }
@@ -404,11 +411,13 @@ rrd_write(char *file_name, rrd_t *rrd)
     FILE             *rrd_file=NULL;
 
     if (strcmp("-",file_name)==0){
-      *rrd_file= *stdout;
+      rrd_file= stdout;
     } else {
-      if ((rrd_file = fopen(file_name,"wb")) == NULL ) {
-	rrd_set_error("creating '%s': %s",file_name,strerror(errno));
-	rrd_free(rrd);
+      int fd = open(file_name,O_RDWR|O_CREAT|O_EXCL,0666);
+      if (fd == -1 || (rrd_file = fdopen(fd,"wb")) == NULL) {
+	rrd_set_error("creating '%s': %s",file_name,rrd_strerror(errno));
+        if (fd != -1)
+          close(fd);
 	return(-1);
       }
     }
@@ -420,8 +429,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);
     
@@ -509,6 +522,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)
 {
@@ -553,7 +567,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);