for windows we must open files in O_BINARY mode

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1423 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/src/rrd_create.c b/program/src/rrd_create.c
index bb8d45d67364c7ba593ee22efe0d022a84c3e5b9..028123ef46f4a65ce2704a755b8fd0d5e7dbf1fa 100644 (file)
--- a/program/src/rrd_create.c
+++ b/program/src/rrd_create.c
@@ -675,8 +675,12 @@ int rrd_create_fn(
     int       unkn_cnt;
     rrd_file_t *rrd_file_dn;
     rrd_t     rrd_dn;
+    unsigned flags = O_WRONLY | O_CREAT | O_TRUNC;
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+    flags |= O_BINARY;
+#endif
 
-    if ((rrd_file = open(file_name, O_WRONLY | O_CREAT | O_TRUNC, 0666)) < 0) {
+    if ((rrd_file = open(file_name, flags, 0666)) < 0) {
         rrd_set_error("creating '%s': %s", file_name, rrd_strerror(errno));
         free(rrd->stat_head);
         free(rrd->live_head);

diff --git a/program/src/rrd_open.c b/program/src/rrd_open.c
index 4caebd394cf156970f622bddb4e12d68513cafba..67687fad3e3faf413f9177a473c323d4e8eddc5d 100644 (file)
--- a/program/src/rrd_open.c
+++ b/program/src/rrd_open.c
@@ -117,6 +117,10 @@ rrd_file_t *rrd_open(
 #endif
     }
 
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+    flags |= O_BINARY;
+#endif
+
     if ((rrd_file->fd = open(file_name, flags, mode)) < 0) {
         rrd_set_error("opening '%s': %s", file_name, rrd_strerror(errno));
         goto out_free;