Correct collation key generation on OS X

This ixes bug #673047.

glib/gunicollate.c

@@ -215,26 +215,30 @@ collate_key_to_string (UCCollationValue *key,
                        gsize             key_len)
 {
   gchar *result;
-  gsize result_len = 0;
+  gsize result_len;
-  const gsize start = 2 * sizeof (void *) / sizeof (UCCollationValue);
+  long *lkey = (long *) key;
-  gsize i;
 
-  /* The first codes should be skipped: the same string on the same
+  /* UCCollationValue format:
-   * system can get different values at runtime in those positions,
+   *
-   * and they do not sort correctly.  The exact size of the prefix
+   * UCCollateOptions (32/64 bits)
-   * depends on whether we are building 64 or 32 bit.
+   * SizeInBytes      (32/64 bits)
+   * Value            (8 bits arrey)
+   *
+   * UCCollateOptions: ordering option mask of the collator
+   * used to create the key. Size changes on 32-bit / 64-bit
+   * hosts. On 64-bits also the extra half-word seems to have
+   * some extra (unknown) meaning.
+   * SizeInBytes: size of the whole structure, in bytes
+   * (including UCCollateOptions and SizeInBytes fields). Size
+   * changes on 32-bit & 64-bit hosts.
+   * Value: array of bytes containing the comparison weights.
+   * Seems to have several sub-strings separated by \001 and \002
+   * chars. Also, experience shows this is directly strcmp-able.
    */
-  if (key_len <= start)
-    return g_strdup ("");
-
-  for (i = start; i < key_len; i++)
-    result_len += utf8_encode (NULL, g_htonl (key[i] + 1));
 
+  result_len = lkey[1];
   result = g_malloc (result_len + 1);
-  result_len = 0;
+  memcpy (result, &lkey[2], result_len);
-  for (i = start; i < key_len; i++)
-    result_len += utf8_encode (result + result_len, g_htonl (key[i] + 1));
-
   result[result_len] = '\0';
 
   return result;

glib/tests/collate.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <glib.h>
 #include <locale.h>
 #include <stdlib.h>
@@ -231,6 +233,23 @@ const gchar *sorted2[] = {
 };
 
 const gchar *file_sorted2[] = {
+  /* Filename collation in OS X follows Finder style which gives
+   * a slightly different order from usual Linux locales. */
+#ifdef HAVE_CARBON
+  "a-.a",
+  "a.a",
+  "aa.a",
+  "file:foo",
+  "file0000",
+  "file000x",
+  "file1",
+  "file5",
+  "file10",
+  "file26",
+  "file0027",
+  "file027",
+  "file100",
+#else
   "a.a",
   "a-.a",
   "aa.a",
@@ -244,6 +263,7 @@ const gchar *file_sorted2[] = {
   "file0027",
   "file100",
   "file:foo",
+#endif
   NULL
 };