Re: [PATCH v2][BZ #12685] Allow arbitrary number of modes in fopen.

[OndÅej BÃlka <neleai at seznam dot cz>]

On Tue, May 14, 2013 at 02:15:40PM +0200, OndÅej BÃlka wrote:
> On Fri, May 10, 2013 at 11:45:15AM +0000, Joseph S. Myers wrote:
> > On Fri, 10 May 2013, Ondrej Bilka wrote:
> > 
> > > > > I think this should add testcases (for both functions) that a mode late in 
> > > > > a long string is properly handled.
> > > > > 
> > > > 
> > > > I agree we need test cases for this to prevent regression.
> > > >
> > > How should I test it? It looks that only x has directly testable
> > > behaviour.
> > 
> > E.g. open with mode "rccccccccccccccccccccce" and use fcntl to verify that 
> > FD_CLOEXEC is set on the file descriptor.
> > 
> > Looking at the descriptions you quote, maybe testing for fdopen is hard 
> > because various flags are ignored anyway for fdopen, but it should at 
> > least be possible to test for fopen.
> > 
> Here is version with test.
> 
I forgotten that e is ignored in fdopen. Test adjusted.

	* libio/fileops.c (_IO_new_file_fopen): Allow arbitrary number of modes.
	* libio/iofdopen.c (_IO_new_fdopen): Likewise.
	* libio/test-fopen-bz12685.c: New file.
	* libio/Makefile (tests): Updated.


---
 libio/Makefile             |    2 +-
 libio/fileops.c            |    4 +--
 libio/iofdopen.c           |    4 +--
 libio/test-fopen-bz12685.c |   50 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 libio/test-fopen-bz12685.c

diff --git a/libio/Makefile b/libio/Makefile
index e3ed974..d134815 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -54,7 +54,7 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc   \
 	tst-mmap-setvbuf bug-ungetwc1 bug-ungetwc2 tst-atime tst-eof          \
 	tst-freopen bug-rewind bug-rewind2 bug-ungetc bug-fseek \
 	tst-mmap-eofsync tst-mmap-fflushsync bug-mmap-fflush \
-	tst-mmap2-eofsync tst-mmap-offend bug-fopena+ bug-wfflush \
+	tst-mmap2-eofsync tst-mmap-offend test-fopen-bz12685 bug-fopena+ bug-wfflush \
 	bug-ungetc2 bug-ftell bug-ungetc3 bug-ungetc4 tst-fopenloc2 \
 	tst-memstream1 tst-memstream2 \
 	tst-wmemstream1 tst-wmemstream2 \
diff --git a/libio/fileops.c b/libio/fileops.c
index 61b61b3..50c3eb2 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -286,12 +286,10 @@ _IO_new_file_fopen (fp, filename, mode, is32not64)
 #ifdef _LIBC
   last_recognized = mode;
 #endif
-  for (i = 1; i < 7; ++i)
+  while (*mode && *mode != ',')
     {
       switch (*++mode)
 	{
-	case '\0':
-	  break;
 	case '+':
 	  omode = O_RDWR;
 	  read_write &= _IO_IS_APPENDING;
diff --git a/libio/iofdopen.c b/libio/iofdopen.c
index a65a5a6..2c3045f 100644
--- a/libio/iofdopen.c
+++ b/libio/iofdopen.c
@@ -75,12 +75,10 @@ _IO_new_fdopen (fd, mode)
       MAYBE_SET_EINVAL;
       return NULL;
   }
-  for (i = 1; i < 5; ++i)
+  while (*mode && *mode != ',')
     {
       switch (*++mode)
 	{
-	case '\0':
-	  break;
 	case '+':
 	  read_write &= _IO_IS_APPENDING;
 	  break;
diff --git a/libio/test-fopen-bz12685.c b/libio/test-fopen-bz12685.c
new file mode 100644
index 0000000..c5ced4b
--- /dev/null
+++ b/libio/test-fopen-bz12685.c
@@ -0,0 +1,50 @@
+/* Test for fopen and fdopen modes, see bug 12685.
+   Copyright (C) 2013 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+int
+main (void)
+{
+  int i;
+  FILE *stream, *stream2;
+
+  /* Test if fopen mode e that sets FD_CLOEXEC is recognized.  */
+  stream = fopen ("/dev/null", "rccccccccccccccccccccce");
+
+  if ((fcntl (fileno (stream), F_GETFD) & FD_CLOEXEC) == 0)
+    {
+		  printf("no FD_CLOEXEC on fopen\n");
+      return 1;
+    }
+	/* In fdopen e flag is ignored.  */
+	/*
+  stream2 = fdopen (fileno(fopen("/dev/null", "r"))
+                    , "rccccccccccccccccccccce");
+  if ((fcntl (fileno (stream2), F_GETFD) & FD_CLOEXEC) == 0)
+    {
+		  printf("no FD_CLOEXEC on fdopen\n");
+      return 1;
+    }
+	*/
+
+  return 0;
+}
-- 
1.7.4.4