X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_restore.c;h=ad53adf425a66dbc7c57d04978da9bbaa4928b9a;hb=413fdcdf1a87c7380e17f5f943b353353c65d760;hp=3e55490c906d3c550f83bab8a073a6f4c9cce28b;hpb=0c87c2676bb826f8defb40d7d45e771ecd40550c;p=rrdtool.git

diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index 3e55490..ad53adf 100644
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2004
+ * RRDtool 1.2.6  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_restore.c  creates new rrd from data dumped by rrd_dump.c
  *****************************************************************************/
@@ -8,6 +8,12 @@
 #include "rrd_rpncalc.h"
 #include <fcntl.h>
 
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#include <io.h>
+#define open _open
+#define close _close
+#endif
+
 /* Prototypes */
 
 void xml_lc(char*);
@@ -131,7 +137,7 @@ int xml2rrd(char* buf, rrd_t* rrd, char rc){
   }
   if (atoi(rrd -> stat_head -> version) < 2) 
   {
-    rrd_set_error("Can only restore version >= 2 (Not %s). Dump your rrd using a current rrdtool dump.",  rrd -> stat_head -> version );
+    rrd_set_error("Can only restore version >= 2 (Not %s). Dump your old rrd using a current rrdtool dump.",  rrd -> stat_head -> version );
     free(rrd -> stat_head);
     return -1;
   }
@@ -415,7 +421,7 @@ rrd_write(char *file_name, rrd_t *rrd, char force_overwrite)
     if (strcmp("-",file_name)==0){
       rrd_file= stdout;
     } else {
-#ifdef WIN32
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
       fdflags = O_RDWR|O_BINARY|O_CREAT;
 #else
       fdflags = O_WRONLY|O_CREAT;
@@ -482,6 +488,7 @@ rrd_restore(int argc, char **argv)
 	char			force_overwrite = 0;	
 
     /* init rrd clean */
+    optind = 0; opterr = 0;  /* initialize getopt */
     rrd_init(&rrd);
     if (argc<3) {
 		rrd_set_error("usage rrdtool %s [--range-check/-r] [--force-overwrite/-f] file.xml file.rrd",argv[0]);