X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_open.c;h=76c333f60ef99f2048dba724faceaa826d4e7b22;hp=9ce17a33f300c9b06d80660fe66d250d90e44e26;hb=990fcfb7eec407edfe504f42760bae204e1c074d;hpb=801ce418130e78b4b6818f2c8af85c3ddae400ff

diff --git a/src/rrd_open.c b/src/rrd_open.c
index 9ce17a3..76c333f 100644
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
@@ -1,10 +1,20 @@
 /*****************************************************************************
- * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.2rc9  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_open.c  Open an RRD File
  *****************************************************************************
  * $Id$
  * $Log$
+ * Revision 1.10  2004/05/26 22:11:12  oetiker
+ * reduce compiler warnings. Many small fixes. -- Mike Slifcak <slif@bellsouth.net>
+ *
+ * Revision 1.9  2003/04/29 21:56:49  oetiker
+ * readline in rrd_open.c reads the file in 8 KB blocks, and calls realloc for
+ * each block. realloc is very slow in Mac OS X for huge blocks, e.g. when
+ * restoring databases from huge xml files. This patch finds the size of the
+ * file, and starts out with malloc'ing the full size.
+ * -- Peter Speck <speck@ruc.dk>
+ *
  * Revision 1.8  2003/04/11 19:43:44  oetiker
  * New special value COUNT which allows calculations based on the position of a
  * value within a data set. Bug fix in rrd_rpncalc.c. PREV returned erroneus
@@ -59,7 +69,7 @@
 /* positioned to the first cdp in the first rra */
 
 int
-rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)    
+rrd_open(const char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)    
 {
 
     
@@ -68,13 +78,13 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)
     
     rrd_init(rrd);
     if (rdwr == RRD_READONLY) {
-#ifndef WIN32
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
 	mode = "r";
 #else
 	mode = "rb";
 #endif
     } else {
-#ifndef WIN32
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
 	mode = "r+";
 #else
 	mode = "rb+";
@@ -183,8 +193,9 @@ void rrd_freemem(void *mem)
     if (mem) free(mem);
 }
 
-int readfile(char *file_name, char **buffer, int skipfirst){
+int readfile(const char *file_name, char **buffer, int skipfirst){
     long writecnt=0,totalcnt = MEMBLK;
+     long offset = 0;
     FILE *input=NULL;
     char c ;
     if ((strcmp("-",file_name) == 0)) { input = stdin; }
@@ -195,14 +206,22 @@ int readfile(char *file_name, char **buffer, int skipfirst){
       }
     }
     if (skipfirst){
-      do { c = getc(input); } while (c != '\n' && ! feof(input)); 
+      do { c = getc(input); offset++; } while (c != '\n' && ! feof(input));
+    }
+    if (strcmp("-",file_name)) {
+      fseek(input, 0, SEEK_END);
+      /* have extra space for detecting EOF without realloc */
+      totalcnt = (ftell(input) + 1) / sizeof(char) - offset;
+      if (totalcnt < MEMBLK)
+	totalcnt = MEMBLK; /* sanitize */
+      fseek(input, offset * sizeof(char), SEEK_SET);
     }
-    if (((*buffer) = (char *) malloc((MEMBLK+4)*sizeof(char))) == NULL) {
+    if (((*buffer) = (char *) malloc((totalcnt+4) * sizeof(char))) == NULL) {
 	perror("Allocate Buffer:");
 	exit(1);
     };
     do{
-      writecnt += fread((*buffer)+writecnt, 1, MEMBLK * sizeof(char) ,input);
+      writecnt += fread((*buffer)+writecnt, 1, (totalcnt - writecnt) * sizeof(char),input);
       if (writecnt >= totalcnt){
 	totalcnt += MEMBLK;
 	if (((*buffer)=rrd_realloc((*buffer), (totalcnt+4) * sizeof(char)))==NULL){