This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH v5][BZ #12685] Allow arbitrary number of modes in fopen.
- From: OndÅej BÃlka <neleai at seznam dot cz>
- To: Andreas Schwab <schwab at suse dot de>
- Cc: Carlos O'Donell <carlos at redhat dot com>, "Joseph S. Myers" <joseph at codesourcery dot com>, libc-alpha at sourceware dot org
- Date: Fri, 24 May 2013 15:13:33 +0200
- Subject: Re: [PATCH v5][BZ #12685] Allow arbitrary number of modes in fopen.
- References: <20130510103330 dot GA12338 at domone dot kolej dot mff dot cuni dot cz> <Pine dot LNX dot 4 dot 64 dot 1305101139470 dot 1189 at digraph dot polyomino dot org dot uk> <20130514121540 dot GA28892 at domone dot kolej dot mff dot cuni dot cz> <mvm38tpzqst dot fsf at hawking dot suse dot de> <20130514124257 dot GB18821 at domone dot kolej dot mff dot cuni dot cz> <mvmy5bhyb4h dot fsf at hawking dot suse dot de> <20130515091735 dot GA22641 at domone dot kolej dot mff dot cuni dot cz> <5193F463 dot 3040501 at redhat dot com> <20130520081258 dot GA32195 at domone dot kolej dot mff dot cuni dot cz> <mvmwqqspz50 dot fsf at hawking dot suse dot de>
On Tue, May 21, 2013 at 09:31:39AM +0200, Andreas Schwab wrote:
> OndÅej BÃlka <neleai@seznam.cz> writes:
>
> > diff --git a/libio/Makefile b/libio/Makefile
> > index e15cd40..8892305 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 \
>
> Overlong line.
It will conflict with my other patches so it is better format when all
will be applied.
>
> > +int
> > +do_test (int argc, char *argv)
> > +{
> > + 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. */
>
> Odd indentation.
>
Thanks, here is v5.
---
libio/Makefile | 1 +
libio/fileops.c | 6 ++----
libio/iofdopen.c | 6 ++----
libio/test-fopen-bz12685.c | 43 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 48 insertions(+), 8 deletions(-)
create mode 100644 libio/test-fopen-bz12685.c
diff --git a/libio/Makefile b/libio/Makefile
index e15cd40..6f26401 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -59,6 +59,7 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \
tst-memstream1 tst-memstream2 \
tst-wmemstream1 tst-wmemstream2 \
bug-memstream1 bug-wmemstream1 \
+ test-fopen-bz12685 \
tst-setvbuf1 tst-popen1 tst-fgetwc bug-wsetpos tst-fseek \
tst-fwrite-error
ifeq (yes,$(build-shared))
diff --git a/libio/fileops.c b/libio/fileops.c
index 61b61b3..78a269a 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 != '\0' && *mode != ',')
{
- switch (*++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..db646c0 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 != '\0' && *mode != ',')
{
- switch (*++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..7042104
--- /dev/null
+++ b/libio/test-fopen-bz12685.c
@@ -0,0 +1,43 @@
+/* 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
+do_test (int argc, char *argv)
+{
+ 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. */
+
+ return 0;
+}
+
+#include "../test-skeleton.c"
--
1.7.4.4