diff --git a/src/rrd_resize.c b/src/rrd_resize.c
index 81410251d0071583db8a5f24cd12c24fa68a42de..d429f1740403ac78872014a0220cff1657c287b3 100644 (file)
--- a/src/rrd_resize.c
+++ b/src/rrd_resize.c
unsigned long l, rra;
long modify;
unsigned long target_rra;
- int grow = 0, shrink = 0;
+ int shrink = 0;
char *endptr;
rrd_file_t *rrd_file, *rrd_out_file;
target_rra = strtol(argv[2], &endptr, 0);
if (!strcmp(argv[3], "GROW"))
- grow = 1;
+ shrink = 0;
else if (!strcmp(argv[3], "SHRINK"))
shrink = 1;
else {
/* 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,