+2020-05-28 Daiki Ueno <ueno@gnu.org>
+
+ fopen-gnu: make 'b' flag can be used with 'e' on Windows
+ * lib/fopen.c (rpl_fopen): Pass O_BINARY to open, if a 'b' flag is
+ specified on Windows.
+ * tests/test-fopen-gnu.c (DATA): New define.
+ (main): Add test for reading binary files with an 'e' flag.
+
2020-05-27 Bruno Haible <bruno@clisp.org>
Don't assume that UNICODE is not defined.
#endif
continue;
case 'b':
+ /* While it is non-standard, O_BINARY is guaranteed by
+ gnulib <fcntl.h>. We can also assume that orig_fopen
+ supports the 'b' flag. */
+ open_flags_standard |= O_BINARY;
#if GNULIB_FOPEN_GNU
if (q < fdopen_mode_buf + BUF_SIZE)
*q++ = *p;
#define BASE "test-fopen-gnu.t"
+/* 0x1a is an EOF on Windows. */
+#define DATA "abc\x1adef"
+
int
main (void)
{
FILE *f;
int fd;
int flags;
+ char buf[16];
/* Remove anything from prior partial run. */
unlink (BASE "file");
+ unlink (BASE "binary");
/* Create the file. */
f = fopen (BASE "file", "w");
ASSERT (f == NULL);
ASSERT (errno == EEXIST);
+ /* Open a binary file and check that the 'e' mode doesn't interfere. */
+ f = fopen (BASE "binary", "wbe");
+ ASSERT (f);
+ ASSERT (fwrite (DATA, 1, sizeof (DATA)-1, f) == sizeof (DATA)-1);
+ ASSERT (fclose (f) == 0);
+
+ f = fopen (BASE "binary", "rbe");
+ ASSERT (f);
+ ASSERT (fread (buf, 1, sizeof (buf), f) == sizeof (DATA)-1);
+ ASSERT (fclose (f) == 0);
+
/* Cleanup. */
ASSERT (unlink (BASE "file") == 0);
+ ASSERT (unlink (BASE "binary") == 0);
return 0;
}