Incorrect file mode on Windows about audiofile HOT 4 CLOSED

Maybe not the best place for a patch... if you need a better way to submit it tell me (e.g. mailing, or forking the code and pointing to the forked repository)

--- Fileold.cpp Wed Jan 11 07:19:38 2012
+++ File.cpp Sat Oct 20 23:00:41 2012
@@ -38,6 +38,11 @@
#include <unistd.h>
#include <stdio.h>

+#if defined(WIN32) || defined(CYGWIN)
+#include <io.h>
+#include <fcntl.h>
+#endif /* WIN32 || CYGWIN */
+
#include "af_vfs.h"

class FilePOSIX : public File
@@ -84,6 +89,9 @@
int fd = ::open(path, flags, 0666);
if (fd == -1)
return NULL;
+#if defined(WIN32) || defined(CYGWIN)

• _setmode(fd, _O_BINARY);
  +#endif /* WIN32 || CYGWIN */
  File *file = new FilePOSIX(fd, mode);
  return file;
  }

from audiofile.

Hi Fabrizio, thanks for catching this problem and for suggesting a fix. The following is slightly simpler; does it seem reasonable to you?

diff --git a/libaudiofile/File.cpp b/libaudiofile/File.cpp
index 36fecdb..089b182 100644
--- a/libaudiofile/File.cpp
+++ b/libaudiofile/File.cpp
@@ -81,6 +81,9 @@ File *File::open(const char *path, File::AccessMode mode)
                flags = O_RDONLY;
        else if (mode == WriteAccess)
                flags = O_CREAT | O_WRONLY | O_TRUNC;
+#if defined(WIN32) || defined(__CYGWIN__)
+       flags |= O_BINARY;
+#endif
        int fd = ::open(path, flags, 0666);
        if (fd == -1)
                return NULL;

from audiofile.

Yes, tested and it works, and it looks like a very clean solution.

from audiofile.

Thanks for proposing this change. It's checked in as commit 946bf19.

from audiofile.