aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2012-04-09 21:06:55 +0200
committerAndreas Jaeger <aj@suse.de>2012-04-09 21:07:51 +0200
commit823fbbb41b4a7cbd45e5506d3f2d9381e9112405 (patch)
tree55d66009eab7e0dc04a904e238576f39520fc8f5
parentc0ed9d7d2be861dc01cd6051415b8a8f1f5fa2aa (diff)
downloadglibc-823fbbb41b4a7cbd45e5506d3f2d9381e9112405.tar
glibc-823fbbb41b4a7cbd45e5506d3f2d9381e9112405.tar.gz
glibc-823fbbb41b4a7cbd45e5506d3f2d9381e9112405.tar.bz2
glibc-823fbbb41b4a7cbd45e5506d3f2d9381e9112405.zip
Document additional fopen options
[BZ #10254] The manual failed to explain the new (the first were introduced with glibc 2.3 or so) parameters to fopen.
-rw-r--r--ChangeLog6
-rw-r--r--NEWS16
-rw-r--r--manual/stdio.texi32
3 files changed, 39 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 58006ee87b..74758bde17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-09 Andreas Jaeger <aj@suse.de>
+
+ [BZ #10254]
+ * manual/stdio.texi (Opening Streams): Document additional fopen
+ parameters.
+
2012-04-09 Carlos O'Donell <carlos_odonell@mentor.com>
[BZ # 13963]
diff --git a/NEWS b/NEWS
index b3ff9764b9..99d8000939 100644
--- a/NEWS
+++ b/NEWS
@@ -13,14 +13,14 @@ Version 2.16
2563, 2565, 2566, 2576, 2678, 3335, 3866, 3868, 3976, 3992, 4026, 4108,
4596, 4822, 5077, 5461, 5805, 5993, 6471, 6486, 6578, 6649, 6730, 6770,
6884, 6890, 6895, 6907, 6911, 9739, 9902, 10110, 10135, 10140, 10153,
- 10210, 10346, 10545, 10716, 11174, 11322, 11365, 11451, 11494, 12047,
- 12340, 13058, 13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532,
- 13533, 13547, 13551, 13552, 13553, 13555, 13559, 13566, 13583, 13592,
- 13618, 13637, 13656, 13658, 13673, 13691, 13695, 13704, 13705, 13706,
- 13726, 13738, 13760, 13761, 13786, 13792, 13806, 13824, 13840, 13841,
- 13844, 13846, 13851, 13852, 13854, 13871, 13873, 13879, 13883, 13892,
- 13895, 13908, 13910, 13911, 13912, 13913, 13915, 13916, 13917, 13918,
- 13919, 13920, 13921, 13926, 13928, 13938, 13963
+ 10210, 10254, 10346, 10545, 10716, 11174, 11322, 11365, 11451, 11494,
+ 12047, 12340, 13058, 13525, 13526, 13527, 13528, 13529, 13530, 13531,
+ 13532, 13533, 13547, 13551, 13552, 13553, 13555, 13559, 13566, 13583,
+ 13592, 13618, 13637, 13656, 13658, 13673, 13691, 13695, 13704, 13705,
+ 13706, 13726, 13738, 13760, 13761, 13786, 13792, 13806, 13824, 13840,
+ 13841, 13844, 13846, 13851, 13852, 13854, 13871, 13873, 13879, 13883,
+ 13892, 13895, 13908, 13910, 13911, 13912, 13913, 13915, 13916, 13917,
+ 13918, 13919, 13920, 13921, 13926, 13928, 13938, 13963
* ISO C11 support:
diff --git a/manual/stdio.texi b/manual/stdio.texi
index 0d23daae2c..e870afb163 100644
--- a/manual/stdio.texi
+++ b/manual/stdio.texi
@@ -196,13 +196,31 @@ Additional characters may appear after these to specify flags for the
call. Always put the mode (@samp{r}, @samp{w+}, etc.) first; that is
the only part you are guaranteed will be understood by all systems.
-@Theglibc{} defines one additional character for use in
-@var{opentype}: the character @samp{x} insists on creating a new
-file---if a file @var{filename} already exists, @code{fopen} fails
-rather than opening it. If you use @samp{x} you are guaranteed that
-you will not clobber an existing file. This is equivalent to the
-@code{O_EXCL} option to the @code{open} function (@pxref{Opening and
-Closing Files}).
+@Theglibc{} defines additional characters for use in @var{opentype}:
+
+@table @samp
+@item c
+The file is opened with cancellation in the I/O functions disabled.
+
+@item e
+The underlying file descriptor will be closed if you use any of the
+@code{exec@dots{}} functions (@pxref{Executing a File}). (This is
+equivalent to having set @code{FD_CLOEXEC} on that descriptor.
+@xref{Descriptor Flags}.)
+
+@item m
+The file is opened and accessed using @code{mmap}. This is only
+supported with files opened for reading.
+
+@item x
+Insist on creating a new file---if a file @var{filename} already
+exists, @code{fopen} fails rather than opening it. If you use
+@samp{x} you are guaranteed that you will not clobber an existing
+file. This is equivalent to the @code{O_EXCL} option to the
+@code{open} function (@pxref{Opening and Closing Files}).
+
+The @samp{x} modifier is part of @w{ISO C11}.
+@end table
The character @samp{b} in @var{opentype} has a standard meaning; it
requests a binary stream rather than a text stream. But this makes no