aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-12-12 22:10:30 +0000
committerUlrich Drepper <drepper@redhat.com>1998-12-12 22:10:30 +0000
commit9fc19e48b594911f45a3df47218e47c42238ceb8 (patch)
treec91e4e0ec341bdcde59263ff9ce6104e804fe2f4
parentc090aa15110f9c3781150c4e1d7d3733b455459e (diff)
downloadglibc-9fc19e48b594911f45a3df47218e47c42238ceb8.zip
glibc-9fc19e48b594911f45a3df47218e47c42238ceb8.tar.gz
glibc-9fc19e48b594911f45a3df47218e47c42238ceb8.tar.bz2
Update.
1998-12-12 Geoff Keating <geoffk@ozemail.com.au> * posix/fnmatch.c (fnmatch): Arguments to FOLD must not have side-effects.
-rw-r--r--ChangeLog5
-rw-r--r--localedata/ChangeLog1
-rw-r--r--manual/string.texi4
-rw-r--r--posix/fnmatch.c3
4 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index dc85836..2295b5d 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 023029b..a15d6de 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 c6bca05..ae4ba65 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 2d6f6af..6d48be3 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;