Enable UTF8 in gnulib regexp.

* config.h.in (RE_ENABLE_I18N) [!GRUB_UTIL]: New define.
	* grub-core/lib/posix_wrap/ctype.h (islower): Use grub_islower.
	(isupper): Use grub_isupper.
	(isascii): New inline function.
	* grub-core/lib/posix_wrap/wchar.h: Replace dummy with real contents.
	* grub-core/lib/posix_wrap/wctype.h: Likewise.
	* grub-core/normal/charset.c (grub_utf8_process): New function.
	(grub_utf8_to_utf16): Use grub_utf8_process.
	(grub_encode_utf8_character): New function.
	(grub_ucs4_to_utf8): Use grub_encode_utf8_character.
	* include/grub/charset.h (grub_utf8_process): New declaration.
	(grub_encode_utf8_character): Likewise.
	* include/grub/misc.h (grub_islower): New inline function.
	(grub_isupper): Likewise.
	(grub_strchrsub): Moved down to fix the definitions.

grub-core/lib/posix_wrap/ctype.h

@@ -42,13 +42,19 @@ isdigit (int c)
 static inline int
 islower (int c)
 {
-  return (c >= 'a' && c <= 'z');
+  return grub_islower (c);
+}
+
+static inline int
+isascii (int c)
+{
+  return !(c & ~0x7f);
 }
 
 static inline int
 isupper (int c)
 {
-  return (c >= 'A' && c <= 'Z');
+  return grub_isupper (c);
 }
 
 static inline int

grub-core/lib/posix_wrap/wchar.h

@@ -19,7 +19,92 @@
 #ifndef GRUB_POSIX_WCHAR_H
 #define GRUB_POSIX_WCHAR_H	1
 
+#include <grub/charset.h>
+
 /* UCS-4.  */
-typedef grub_uint32_t wchar_t;
+typedef grub_int32_t wint_t;
+enum
+  {
+    WEOF = -1
+  };
+
+#define MB_LEN_MAX 4
+
+/* UCS-4.  */
+typedef grub_int32_t wchar_t;
+
+typedef struct mbstate {
+  grub_uint32_t code;
+  int count;
+} mbstate_t;
+
+static inline size_t
+mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
+{
+  const char *ptr;
+  if (!s)
+    {
+      pwc = 0;
+      s = "";
+      n = 1;
+    }
+
+  for (ptr = s; ptr < s + n; ptr++)
+    {
+      if (!grub_utf8_process (*ptr, &ps->code, &ps->count))
+	return -1;
+      if (ps->count)
+	continue;
+      if (pwc)
+	*pwc = ps->code;
+      if (ps->code == 0)
+	return 0;
+      return ptr - s + 1;
+    }
+  return -2;
+}
+
+static inline int
+mbsinit(const mbstate_t *ps)
+{
+  return ps->count == 0;
+}
+
+static inline size_t
+wcrtomb (char *s, wchar_t wc, mbstate_t *ps __attribute__ ((unused)))
+{
+  if (s == 0)
+    return 1;
+  return grub_encode_utf8_character ((grub_uint8_t *) s,
+				     (grub_uint8_t *) s + MB_LEN_MAX,
+				     wc);
+}
+
+static inline wint_t btowc (int c)
+{
+  if (c & ~0x7f)
+    return WEOF;
+  return c;
+}
+
+
+static inline int
+wcscoll (const wchar_t *s1, const wchar_t *s2)
+{
+  while (*s1 && *s2)
+    {
+      if (*s1 != *s2)
+	break;
+
+      s1++;
+      s2++;
+    }
+
+  if (*s1 < *s2)
+    return -1;
+  if (*s1 > *s2)
+    return +1;
+  return 0;
+}
 
 #endif

grub-core/lib/posix_wrap/wctype.h

@@ -0,0 +1,106 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009, 2010, 2011  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_POSIX_WCTYPE_H
+#define GRUB_POSIX_WCTYPE_H	1
+
+#include <grub/misc.h>
+#include <wchar.h>
+
+typedef enum { GRUB_CTYPE_INVALID,
+	       GRUB_CTYPE_ALNUM, GRUB_CTYPE_CNTRL, GRUB_CTYPE_LOWER,
+	       GRUB_CTYPE_SPACE, GRUB_CTYPE_ALPHA, GRUB_CTYPE_DIGIT,
+	       GRUB_CTYPE_PRINT, GRUB_CTYPE_UPPER, GRUB_CTYPE_BLANK,
+	       GRUB_CTYPE_GRAPH, GRUB_CTYPE_PUNCT, GRUB_CTYPE_XDIGIT,
+	       GRUB_CTYPE_MAX} wctype_t;
+
+static inline wctype_t
+wctype (const char *name)
+{
+  wctype_t i;
+  static const char names[][10] = { "", 
+				    "alnum", "cntrl", "lower",
+				    "space", "alpha", "digit",
+				    "print", "upper", "blank",
+				    "graph", "punct", "xdigit" };
+  for (i = GRUB_CTYPE_INVALID; i < GRUB_CTYPE_MAX; i++)
+    if (grub_strcmp (names[i], name) == 0)
+      return i;
+  return GRUB_CTYPE_INVALID;
+}
+
+/* FIXME: take into account international lowercase characters.  */
+static inline int
+iswlower (wint_t wc)
+{
+  return grub_islower (wc);
+}
+
+static inline wint_t
+towlower (wint_t c)
+{
+  return grub_tolower (c);
+}
+
+static inline wint_t
+towupper (wint_t c)
+{
+  return grub_toupper (c);
+}
+
+static inline int
+iswalnum (wint_t c)
+{
+  return grub_isalpha (c) || grub_isdigit (c);
+}
+
+static inline int
+iswctype (wint_t wc, wctype_t desc)
+{
+  switch (desc)
+    {
+    case GRUB_CTYPE_ALNUM:
+      return iswalnum (wc);
+    case GRUB_CTYPE_CNTRL:
+      return grub_iscntrl (wc);
+    case GRUB_CTYPE_LOWER:
+      return iswlower (wc);
+    case GRUB_CTYPE_SPACE:
+      return grub_isspace (wc);
+    case GRUB_CTYPE_ALPHA:
+      return grub_isalpha (wc);
+    case GRUB_CTYPE_DIGIT:
+      return grub_isdigit (wc);
+    case GRUB_CTYPE_PRINT:
+      return grub_isprint (wc);
+    case GRUB_CTYPE_UPPER:
+      return grub_isupper (wc);
+    case GRUB_CTYPE_BLANK:
+      return wc == ' ' || wc == '\t';
+    case GRUB_CTYPE_GRAPH:
+      return grub_isgraph (wc);
+    case GRUB_CTYPE_PUNCT:
+      return grub_isprint (wc) && !grub_isspace (wc) && !iswalnum (wc);
+    case GRUB_CTYPE_XDIGIT:
+      return grub_isxdigit (wc);
+    default:
+      return 0;
+    }
+}
+
+#endif