New module 'unicase/u8-casecoll'.

diff --git a/ChangeLog b/ChangeLog
index f359a3c..6bd750f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-03-08  Bruno Haible  <bruno@clisp.org>
 
+       New module 'unicase/u8-casecoll'.
+       * lib/unicase/u8-casecoll.c: New file.
+       * lib/unicase/u-casecoll.h: New file.
+       * modules/unicase/u8-casecoll: New file.
+
        New module 'unicase/u32-casexfrm'.
        * lib/unicase/u32-casexfrm.c: New file.
        * modules/unicase/u32-casexfrm: New file.

diff --git a/lib/unicase/u-casecoll.h b/lib/unicase/u-casecoll.h
new file mode 100644 (file)
index 0000000..73094ab
--- /dev/null
+++ b/lib/unicase/u-casecoll.h
@@ -0,0 +1,68 @@
+/* Locale dependent, case and normalization insensitive comparison of Unicode
+   strings.
+   Copyright (C) 2009 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2009.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+int
+FUNC (const UNIT *s1, size_t n1, const UNIT *s2, size_t n2,
+      const char *iso639_language, uninorm_t nf, int *resultp)
+{
+  char buf1[2048];
+  char buf2[2048];
+  char *transformed1;
+  size_t transformed1_length;
+  char *transformed2;
+  size_t transformed2_length;
+  int cmp;
+
+  /* Normalize and transform S1.  */
+  transformed1_length = sizeof (buf1);
+  transformed1 =
+    U_CASEXFRM (s1, n1, iso639_language, nf, buf1, &transformed1_length);
+  if (transformed1 == NULL)
+    /* errno is set here.  */
+    return -1;
+
+  /* Normalize and transform S2.  */
+  transformed2_length = sizeof (buf2);
+  transformed2 =
+    U_CASEXFRM (s2, n2, iso639_language, nf, buf2, &transformed2_length);
+  if (transformed2 == NULL)
+    {
+      if (transformed1 != buf1)
+       {
+         int saved_errno = errno;
+         free (transformed1);
+         errno = saved_errno;
+       }
+      return -1;
+    }
+
+  /* Compare the transformed strings.  */
+  cmp = memcmp2 (transformed1, transformed1_length,
+                transformed2, transformed2_length);
+  if (cmp < 0)
+    cmp = -1;
+  else if (cmp > 0)
+    cmp = 1;
+
+  if (transformed2 != buf2)
+    free (transformed2);
+  if (transformed1 != buf1)
+    free (transformed1);
+  *resultp = cmp;
+  return 0;
+}

diff --git a/lib/unicase/u8-casecoll.c b/lib/unicase/u8-casecoll.c
new file mode 100644 (file)
index 0000000..28170e5
--- /dev/null
+++ b/lib/unicase/u8-casecoll.c
@@ -0,0 +1,32 @@
+/* Locale dependent, case and normalization insensitive comparison of UTF-8
+   strings.
+   Copyright (C) 2009 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2009.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unicase.h"
+
+#include <errno.h>
+#include <stdlib.h>
+
+#include "memcmp2.h"
+
+#define FUNC u8_casecoll
+#define UNIT uint8_t
+#define U_CASEXFRM u8_casexfrm
+#include "u-casecoll.h"

diff --git a/modules/unicase/u8-casecoll b/modules/unicase/u8-casecoll
new file mode 100644 (file)
index 0000000..f6b6157
--- /dev/null
+++ b/modules/unicase/u8-casecoll
@@ -0,0 +1,27 @@
+Description:
+Locale dependent, case and normalization insensitive comparison of UTF-8
+strings.
+
+Files:
+lib/unicase/u8-casecoll.c
+lib/unicase/u-casecoll.h
+
+Depends-on:
+unicase/base
+unicase/u8-casexfrm
+memcmp2
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += unicase/u8-casecoll.c
+
+Include:
+"unicase.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+