From: Daiki Ueno Date: Thu, 28 May 2020 09:40:49 +0000 (+0200) Subject: fopen-gnu: make 'b' flag can be used with 'e' on Windows X-Git-Tag: v1.0~4050 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=01204a148d0ca7c7f493ff331b462294f4959850;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index c17b76b72e..ea2716b2f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-05-28 Daiki Ueno + + 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 Don't assume that UNICODE is not defined. diff --git a/lib/fopen.c b/lib/fopen.c index 20065e4c6f..47d7f194df 100644 --- a/lib/fopen.c +++ b/lib/fopen.c @@ -101,6 +101,10 @@ rpl_fopen (const char *filename, const char *mode) #endif continue; case 'b': + /* While it is non-standard, O_BINARY is guaranteed by + gnulib . 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; diff --git a/tests/test-fopen-gnu.c b/tests/test-fopen-gnu.c index cae40421ab..4d98dcd855 100644 --- a/tests/test-fopen-gnu.c +++ b/tests/test-fopen-gnu.c @@ -29,15 +29,20 @@ #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"); @@ -64,8 +69,20 @@ main (void) 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; }