proper fix for the header size problem and its effects on rrd_resize

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4@2192 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/src/rrd_format.c b/program/src/rrd_format.c
index 221dcd71f31723f71b23de27ca479bf2e602e91c..21d81d8d1686b7061f0ae391d0deb71aae5d5996 100644 (file)
--- a/program/src/rrd_format.c
+++ b/program/src/rrd_format.c
@@ -105,8 +105,7 @@ off_t rrd_get_header_size(
     return sizeof(stat_head_t) + \
         sizeof(ds_def_t) * rrd->stat_head->ds_cnt + \
         sizeof(rra_def_t) * rrd->stat_head->rra_cnt + \
-        sizeof(time_t) + \
-        sizeof(live_head_t) + \
+        ( atoi(rrd->stat_head->version) < 3 ? sizeof(time_t) : sizeof(live_head_t) ) + \
         sizeof(pdp_prep_t) * rrd->stat_head->ds_cnt + \
         sizeof(cdp_prep_t) * rrd->stat_head->ds_cnt * rrd->stat_head->rra_cnt + \
         sizeof(rra_ptr_t) * rrd->stat_head->rra_cnt;

diff --git a/program/src/rrd_resize.c b/program/src/rrd_resize.c
index f68051c0e5bf8a73abff52f0a657a2df05e55ab4..fb989a9d71c5da9c57e6c3bdf9c478ed565d268b 100644 (file)
--- a/program/src/rrd_resize.c
+++ b/program/src/rrd_resize.c
@@ -267,9 +267,14 @@ int rrd_resize(
     /* Move the rest of the CDPs
      */
     while (1) {
-        if (rrd_read(rrd_file, &buffer, sizeof(rrd_value_t) * 1) <= 0)
+        ssize_t b_read;
+        if ((b_read=rrd_read(rrd_file, &buffer, sizeof(rrd_value_t) * 1)) <= 0)
             break;
-        rrd_write(rrd_out_file, &buffer, sizeof(rrd_value_t) * 1);
+        if(rrd_out_file->pos+b_read > rrd_out_file->file_len) {
+            fprintf(stderr,"WARNING: ignoring last %zu bytes\nWARNING: if you see this message multiple times for a single file you're in trouble\n", b_read);
+            continue;
+        }
+        rrd_write(rrd_out_file, &buffer, b_read);
     }
     rrdnew.rra_def[target_rra].row_cnt += modify;
     rrd_seek(rrd_out_file,