Win32: default to binary mode in vlc_open() (fix #5578)

...rather than merely vlc_fopen().

diff --git a/src/text/filesystem.c b/src/text/filesystem.c
index 11f1c990398d738b66e552af68624ddc9aad88f3..cfe0d13f768396e802ab8d7ee05a78bd0a6f364e 100644 (file)
--- a/src/text/filesystem.c
+++ b/src/text/filesystem.c
@@ -52,10 +52,6 @@ FILE *vlc_fopen (const char *filename, const char *mode)
 {
     int rwflags = 0, oflags = 0;
 
-#ifdef O_BINARY
-    /* Assume binary mode by default (i.e. no translation) */
-    oflags |= O_BINARY;
-#endif
     for (const char *ptr = mode; *ptr; ptr++)
     {
         switch (*ptr)

diff --git a/src/win32/filesystem.c b/src/win32/filesystem.c
index f26c29ce5256683e1a4fec09569585d91c67081f..36b52c90a565aaee4cb2d8e234309a580067821a 100644 (file)
--- a/src/win32/filesystem.c
+++ b/src/win32/filesystem.c
@@ -78,6 +78,10 @@ int vlc_open (const char *filename, int flags, ...)
         mode = va_arg (ap, unsigned int);
     va_end (ap);
 
+    /* Defaults to binary mode */
+    if ((flags & O_TEXT) == 0)
+        flags |= O_BINARY;
+
 #ifdef UNDER_CE
     /*_open translates to wchar internally on WinCE*/
     return _open (filename, flags, mode);