Update.

	* posix/fnmatch_loop.c: Fix computation of alignment.

2001-08-09  Isamu Hasegawa  <isamu@yamato.ibm.com>

	* posix/regex.c (wcs_regex_compile): Use appropriate string
	to compare with collating element.
	Fix the padding for the alignment.

2001-08-09  Isamu Hasegawa  <isamu@yamato.ibm.com>

	* locale/programs/ld-collate.c (collate_output): Exclude
	characters from elem_table.
	Reduce if clause to write collating elements correctly.
	* posix/Makefile (tests): Add bug-regex5.
	* posix/bug-regex5.c: New file.

2001-08-09  Ulrich Drepper  <drepper@redhat.com>

1 files changed, 61 insertions, 0 deletions

diff --git a/posix/bug-regex5.c b/posix/bug-regex5.c
new file mode 100644
index 0000000000..12bbcffe21
--- /dev/null
+++ b/posix/bug-regex5.c
@@ -0,0 +1,61 @@
+#include <stdio.h>
+#include <string.h>
+#include <locale.h>
+#include <locale/localeinfo.h>
+
+int
+main (void)
+{
+  int32_t table_size, idx, i, found;
+  const int32_t *symb_table;
+  const unsigned char *extra;
+  uint32_t nrules;
+  char *ca;
+
+  ca = setlocale (LC_ALL, "da_DK.ISO-8859-1");
+  if (ca == NULL)
+    {
+      printf ("cannot set locale: %m\n");
+      return 1;
+    }
+  printf ("current locale : %s\n", ca);
+
+  nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+  if (nrules == 0)
+    {
+      printf("No rule\n");
+      return 1;
+    }
+
+  table_size = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_SYMB_HASH_SIZEMB);
+  symb_table = (const int32_t *)
+    _NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_TABLEMB);
+  extra = (const unsigned char *)
+    _NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB);
+
+  found = 0;
+  for (i = 0; i < table_size; ++i)
+    {
+      if (symb_table[2 * i] != 0)
+	{
+	  char elem[256];
+	  idx = symb_table[2 * i + 1];
+	  strncpy (elem, extra + idx + 1, extra[idx]);
+	  elem[extra[idx]] = '\0';
+	  printf ("Found a collating element: %s\n", elem);
+	  ++found;
+	}
+    }
+  if (found == 0)
+    {
+      printf ("No collating element!\n");
+      return 1;
+    }
+  else if (found != 4)
+    {
+      printf ("expected 4 collating elements, found %d\n", found);
+      return 1;
+    }
+
+  return 0;
+}