summary refs log tree commit diff
diff options
context:
space:
mode:
authorOndřej Bílka <neleai@seznam.cz>2013-10-25 10:42:33 +0200
committerOndřej Bílka <neleai@seznam.cz>2013-10-25 10:44:24 +0200
commitca42d35ea1a4b69b11a3b9a3e3bd1390470d188f (patch)
tree91881341b1ae8a98d20090480de647b5f1b59116
parent52e6d80122eee44b64db0e947fe7e4001e92ce83 (diff)
downloadglibc-ca42d35ea1a4b69b11a3b9a3e3bd1390470d188f.tar.gz
glibc-ca42d35ea1a4b69b11a3b9a3e3bd1390470d188f.tar.xz
glibc-ca42d35ea1a4b69b11a3b9a3e3bd1390470d188f.zip
Acknowledge that fnmatch can fail. Fixes bug 14029.
-rw-r--r--ChangeLog5
-rw-r--r--NEWS16
-rw-r--r--manual/pattern.texi7
3 files changed, 15 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index f37d84ea88..d6a6ff963f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-25   Ondřej Bílka  <neleai@seznam.cz>
+
+	[BZ 14029]
+	* manual/pattern.texi: Acknowledge that fnmatch can fail.
+
 2013-10-25  Fabrice Bauzac  <fbauzac@debian71.nce.amadeus.net>
 
 	[BZ #16074]
diff --git a/NEWS b/NEWS
index f228878903..00d64f41bf 100644
--- a/NEWS
+++ b/NEWS
@@ -9,14 +9,14 @@ Version 2.19
 
 * The following bugs are resolved with this release:
 
-  156, 431, 832, 10278, 13028, 13982, 13985, 14155, 14547, 14699, 14910,
-  15048, 15218, 15277, 15308, 15362, 15400, 15427, 15522, 15531, 15532,
-  15608, 15609, 15610, 15632, 15640, 15670, 15672, 15680, 15681, 15723,
-  15734, 15735, 15736, 15748, 15749, 15754, 15760, 15764, 15797, 15825,
-  15844, 15847, 15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887,
-  15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923,
-  15939, 15948, 15963, 15966, 15988, 16032, 16034, 16036, 16041, 16072,
-  16074.
+  156, 431, 832, 10278, 13028, 13982, 13985, 14029, 14155, 14547, 14699,
+  14910, 15048, 15218, 15277, 15308, 15362, 15400, 15427, 15522, 15531,
+  15532, 15608, 15609, 15610, 15632, 15640, 15670, 15672, 15680, 15681,
+  15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15764, 15797,
+  15825, 15844, 15847, 15849, 15855, 15856, 15857, 15859, 15867, 15886,
+  15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921,
+  15923, 15939, 15948, 15963, 15966, 15988, 16032, 16034, 16036, 16041,
+  16072, 16074.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache
diff --git a/manual/pattern.texi b/manual/pattern.texi
index 1966f3f148..afd6480926 100644
--- a/manual/pattern.texi
+++ b/manual/pattern.texi
@@ -36,11 +36,8 @@ returns the nonzero value @code{FNM_NOMATCH}.  The arguments
 The argument @var{flags} is a combination of flag bits that alter the
 details of matching.  See below for a list of the defined flags.
 
-In @theglibc{}, @code{fnmatch} cannot experience an ``error''---it
-always returns an answer for whether the match succeeds.  However, other
-implementations of @code{fnmatch} might sometimes report ``errors''.
-They would do so by returning nonzero values that are not equal to
-@code{FNM_NOMATCH}.
+In @theglibc{}, @code{fnmatch} might sometimes report ``errors'' by
+returning nonzero values that are not equal to @code{FNM_NOMATCH}.
 @end deftypefun
 
 These are the available flags for the @var{flags} argument: