X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_resize.c;h=6065685f17d37748eba3a570f089ed4a013ceab0;hb=9e6db622e8756105c1322481b34650ecbe15da1a;hp=3e67af76f8436de16c977991eab2326d3f47a8a8;hpb=0c87c2676bb826f8defb40d7d45e771ecd40550c;p=rrdtool.git

diff --git a/src/rrd_resize.c b/src/rrd_resize.c
index 3e67af7..6065685 100644
--- a/src/rrd_resize.c
+++ b/src/rrd_resize.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.2.14  Copyright by Tobi Oetiker, 1997-2006
  *****************************************************************************
  * rrd_resize.c Alters size of an RRA
  *****************************************************************************
@@ -11,15 +11,16 @@
 int
 rrd_resize(int argc, char **argv)
 {
-    char             *infilename,outfilename[11]="resize.rrd";
-    FILE             *infile,*outfile;
-    rrd_t             rrdold,rrdnew;
-    rrd_value_t       buffer;
-    unsigned long     l,rra;
-    long              modify;
-    unsigned long     target_rra;
-    int               grow=0,shrink=0;
-    char             *endptr;
+    char		*infilename,outfilename[11]="resize.rrd";
+    FILE		*infile,*outfile;
+    rrd_t		rrdold,rrdnew;
+    rrd_value_t		buffer;
+    int			version;
+    unsigned long	l,rra;
+    long		modify;
+    unsigned long	target_rra;
+    int			grow=0,shrink=0;
+    char		*endptr;
 
     infilename=argv[1];
     if (!strcmp(infilename,"resize.rrd")) {
@@ -84,6 +85,19 @@ rrd_resize(int argc, char **argv)
     rrdnew.cdp_prep  = rrdold.cdp_prep;
     rrdnew.rra_ptr   = rrdold.rra_ptr;
 
+    version = atoi(rrdold.stat_head->version);
+    switch (version) {
+	case 3: break;
+	case 1: rrdold.stat_head->version[3]='3';
+		break;
+	default: {
+		rrd_set_error("Do not know how to handle RRD version %s",rrdold.stat_head->version);
+		rrd_free(&rrdold);	
+		fclose(infile);
+		return(-1);
+		}
+    }
+
     if ((outfile=fopen(outfilename,"wb"))==NULL) {
         rrd_set_error("Can't create '%s'",outfilename);
         return(-1);
@@ -170,8 +184,10 @@ rrd_resize(int argc, char **argv)
     }
     /* Move the rest of the CDPs
     */
-    while (!(feof(infile))) {
-        fread(&buffer,sizeof(rrd_value_t),1,infile);
+    while (1) {
+	fread(&buffer,sizeof(rrd_value_t),1,infile);
+	if (feof(infile))
+	    break;
         fwrite(&buffer,sizeof(rrd_value_t),1,outfile);
     }
     rrdnew.rra_def[target_rra].row_cnt += modify;