fixed leak in VDEF_PERCENT handlin -- Perry Stoll <perry_stoll@yahoo.com>

[rrdtool.git] / src / rrd_open.c

diff --git a/src/rrd_open.c b/src/rrd_open.c
index 36bc875..c0e6545 100644 (file)
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
@@ -1,12 +1,29 @@
 /*****************************************************************************
- * RRDtool 1.0.33  Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2002
  *****************************************************************************
  * rrd_open.c  Open an RRD File
  *****************************************************************************
  * $Id$
  * $Log$
- * Revision 1.1  2001/02/25 22:25:05  oetiker
- * Initial revision
+ * Revision 1.5  2002/06/20 00:21:03  jake
+ * More Win32 build changes; thanks to Kerry Calvert.
+ *
+ * Revision 1.4  2002/02/01 20:34:49  oetiker
+ * fixed version number and date/time
+ *
+ * Revision 1.3  2001/03/04 13:01:55  oetiker
+ * Aberrant Behavior Detection support. A brief overview added to rrdtool.pod.
+ * Major updates to rrd_update.c, rrd_create.c. Minor update to other core files.
+ * This is backwards compatible! But new files using the Aberrant stuff are not readable
+ * by old rrdtool versions. See http://cricket.sourceforge.net/aberrant/rrd_hw.htm
+ * -- Jake Brutlag <jakeb@corp.webtv.net>
+ *
+ * Revision 1.2  2001/03/04 10:29:20  oetiker
+ * fixed filedescriptor leak
+ * -- Mike Franusich <mike@franusich.com>
+ *
+ * Revision 1.1.1.1  2001/02/25 22:25:05  oetiker
+ * checkin
  *
  *****************************************************************************/
 
@@ -41,10 +58,20 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)
        rrd_set_error("opening '%s': %s",file_name, strerror(errno));
        return (-1);
     }
+/*
+       if (rdwr == RRD_READWRITE)
+       {
+          if (setvbuf((*in_file),NULL,_IONBF,2)) {
+                 rrd_set_error("failed to disable the stream buffer\n");
+                 return (-1);
+          }
+       }
+*/
     
 #define MYFREAD(MYVAR,MYVART,MYCNT) \
     if ((MYVAR = malloc(sizeof(MYVART) * MYCNT)) == NULL) {\
        rrd_set_error("" #MYVAR " malloc"); \
+        fclose(*in_file); \
     return (-1); } \
     fread(MYVAR,sizeof(MYVART),MYCNT, *in_file); 
 
@@ -55,17 +82,20 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)
        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);
+           fclose(*in_file);
            return(-1);}
 
-       if (strncmp(rrd->stat_head->version,RRD_VERSION,5) != 0){
-           rrd_set_error("cant handle RRD file version %s",
+        if (atoi(rrd->stat_head->version) > atoi(RRD_VERSION)){
+           rrd_set_error("can't handle RRD file version %s",
                        rrd->stat_head->version);
            free(rrd->stat_head);
+           fclose(*in_file);
            return(-1);}
 
        if (rrd->stat_head->float_cookie != FLOAT_COOKIE){
            rrd_set_error("This RRD was created on other architecture");
            free(rrd->stat_head);
+           fclose(*in_file);
            return(-1);}
 
     MYFREAD(rrd->ds_def,    ds_def_t,     rrd->stat_head->ds_cnt)
@@ -104,6 +134,14 @@ void rrd_free(rrd_t *rrd)
     free(rrd->rrd_value);
 }
 
+/* routine used by external libraries to free memory allocated by
+ * rrd library */
+void rrd_freemem(void *mem)
+{
+
+    free(mem);
+}
+
 int readfile(char *file_name, char **buffer, int skipfirst){
     long writecnt=0,totalcnt = MEMBLK;
     FILE *input=NULL;