X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_open.c;h=6be18466a0f096ab87cb8fcfcf500e3d0fcc24a5;hb=3882bb0c2d15f97298aaa7602d6353a1888f5547;hp=f24529df3f3e158b5ccb91f5b221948af37d6df6;hpb=6c5e7f32e3052259aa5e14053cb4bab04346ea94;p=rrdtool.git

diff --git a/src/rrd_open.c b/src/rrd_open.c
index f24529d..6be1846 100644
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2rc6  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.16  Copyright by Tobi Oetiker, 1997-2006
  *****************************************************************************
  * rrd_open.c  Open an RRD File
  *****************************************************************************
@@ -78,17 +78,9 @@ rrd_open(const char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)
     
     rrd_init(rrd);
     if (rdwr == RRD_READONLY) {
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
-	mode = "r";
-#else
 	mode = "rb";
-#endif
     } else {
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
-	mode = "r+";
-#else
 	mode = "rb+";
-#endif
     }
     
     if (((*in_file) = fopen(file_name,mode)) == NULL ){
@@ -109,33 +101,44 @@ rrd_open(const char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)
     if ((MYVAR = malloc(sizeof(MYVART) * MYCNT)) == NULL) {\
 	rrd_set_error("" #MYVAR " malloc"); \
         fclose(*in_file); \
-    return (-1); } \
+        return (-1); } \
     fread(MYVAR,sizeof(MYVART),MYCNT, *in_file); 
 
 
     MYFREAD(rrd->stat_head, stat_head_t,  1)
-    version = atoi(rrd->stat_head->version);
+    /* lets see if the first read worked */
+    if (ferror( *in_file ) || feof(*in_file)) {
+	rrd_set_error("reading the cookie off %s faild",file_name);
+	fclose(*in_file);
+	return(-1);
+    }	
 
 	/* lets do some test if we are on track ... */
 	if (strncmp(rrd->stat_head->cookie,RRD_COOKIE,4) != 0){
 	    rrd_set_error("'%s' is not an RRD file",file_name);
 	    free(rrd->stat_head);
+            rrd->stat_head = NULL; 
 	    fclose(*in_file);
 	    return(-1);}
 
-        if (version > atoi(RRD_VERSION)){
-	    rrd_set_error("can't handle RRD file version %s",
-			rrd->stat_head->version);
+	if (rrd->stat_head->float_cookie != FLOAT_COOKIE){
+	    rrd_set_error("This RRD was created on other architecture");
 	    free(rrd->stat_head);
+            rrd->stat_head = NULL; 
 	    fclose(*in_file);
 	    return(-1);}
 
-	if (rrd->stat_head->float_cookie != FLOAT_COOKIE){
-	    rrd_set_error("This RRD was created on other architecture");
+    version = atoi(rrd->stat_head->version);
+
+        if (version > atoi(RRD_VERSION)){
+	    rrd_set_error("can't handle RRD file version %s",
+			rrd->stat_head->version);
 	    free(rrd->stat_head);
+            rrd->stat_head = NULL; 
 	    fclose(*in_file);
 	    return(-1);}
 
+
     MYFREAD(rrd->ds_def,    ds_def_t,     rrd->stat_head->ds_cnt)
     MYFREAD(rrd->rra_def,   rra_def_t,    rrd->stat_head->rra_cnt)
     /* handle different format for the live_head */