From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 12 Dec 1998 22:10:30 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_0_112~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fc19e48b594911f45a3df47218e47c42238ceb8;p=thirdparty%2Fglibc.git

Update.

1998-12-12  Geoff Keating  <geoffk@ozemail.com.au>

	* posix/fnmatch.c (fnmatch): Arguments to FOLD must not have
	side-effects.
---

diff --git a/ChangeLog b/ChangeLog
index dc8583601f0..2295b5d741f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-12-12  Geoff Keating  <geoffk@ozemail.com.au> 
+ 
+	* posix/fnmatch.c (fnmatch): Arguments to FOLD must not have 
+	side-effects. 
+ 
 1998-12-12  Ulrich Drepper  <drepper@cygnus.com>
 
 	* iconvdata/iso-8859-11.h: ISO 8859-11 conversion data.
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 023029bb891..a15d6decfc7 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,6 @@
 1998-12-12  Ulrich Drepper  <drepper@cygnus.com>
 
+	* charmaps/ISO-8859-13: New file.
 	* charmaps/ISO-8859-14: New file.
 	* charmaps/ISO-8859-15: New file.
 
diff --git a/manual/string.texi b/manual/string.texi
index c6bca05d1c7..ae4ba659af9 100644
--- a/manual/string.texi
+++ b/manual/string.texi
@@ -800,8 +800,8 @@ void
 sort_strings (char **array, int nstrings)
 @{
   /* @r{Sort @code{temp_array} by comparing the strings.} */
-  qsort (array, sizeof (char *),
-         nstrings, compare_elements);
+  qsort (array, nstrings,
+         sizeof (char *), compare_elements);
 @}
 @end smallexample
 
diff --git a/posix/fnmatch.c b/posix/fnmatch.c
index 2d6f6afbd52..6d48be3ca47 100644
--- a/posix/fnmatch.c
+++ b/posix/fnmatch.c
@@ -245,7 +245,8 @@ fnmatch (pattern, string, flags)
 		  {
 		    if (*p == '\0')
 		      return FNM_NOMATCH;
-		    c = FOLD (*p++);
+		    c = FOLD (*p);
+		    ++p;
 
 		    if (c == fn)
 		      goto matched;