X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_open.c;h=11476de43cb85bcec38ceb56cab7a42da86454c9;hb=9b54930dbbfe127febcd165e79f6019f822ec802;hp=4432ab49a2b60a3d09b1f2eac80f744ffcdccfa4;hpb=35f5945e114df7324be00de01bcde77e096a2373;p=rrdtool.git

diff --git a/src/rrd_open.c b/src/rrd_open.c
index 4432ab4..11476de 100644
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.0  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.9  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * 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,11 +101,17 @@ 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)
+    /* 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);
+    }	
     version = atoi(rrd->stat_head->version);
 
 	/* lets do some test if we are on track ... */