Changeset 3056

Timestamp:

Apr 8, 2007, 7:12:27 PM (19 years ago)

Author:

bird

Message:

Added a fixed default (C/POSIX) collate locale to avoid unilib strangeness. Made an attempt at adjusting for this strangeness for the non-default locales...

Location:

trunk/libc

Files:

• include/klibc/locale.h (modified) (1 diff)
• src/libc/locale/locale_collate.c (modified) (1 diff)
• src/libc/locale/os2/setlocale.c (modified) (7 diffs)

trunk/libc/include/klibc/locale.h

@@ -241 +241 @@
 /** String collation information. */
 extern __LIBC_LOCALECOLLATE         __libc_gLocaleCollate;
+
+
 /** Character case conversion tables. */
 extern __LIBC_LOCALECTYPE           __libc_GLocaleCtype;

trunk/libc/src/libc/locale/locale_collate.c

@@ -79 +79 @@
 };
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/libc/src/libc/locale/os2/setlocale.c

@@ -221 +221 @@
 static int query_mbcs(UconvObject uobj, char *mbcs, unsigned char *au2MBCSPrefixs);
 
-static int localeCollateDo(__LIBC_PLOCALECOLLATE pCollate, UconvObject uobj, LocaleObject lobj);
+static int localeCollateDo(__LIBC_PLOCALECOLLATE pCollate, UconvObject uobj, LocaleObject lobj);
 static void localeCollateFree(__LIBC_PLOCALECOLLATE pCollate);
 static inline unsigned char Transform(LocaleObject lobj, UconvObject uobj,
@@ -384 +384 @@
  * @param   uobj            The UconvObject to use. Collate is responsible for freeing it.
  * @param   lobj            The LocaleObject to use. Collate is responsible for freeing it.
- */
-static int localeCollateDo(__LIBC_PLOCALECOLLATE pCollate, UconvObject uobj, LocaleObject lobj)
+ * @param   pszLocale       Pointer to the locale base specifier.
+ */
+static int localeCollateDo(__LIBC_PLOCALECOLLATE pCollate, UconvObject uobj, LocaleObject lobj, const char *pszLocale)
 {
     int rc;
@@ -391 +392 @@
     /* Cleanup in case of some special LC_ALL call. */
     localeCollateFree(pCollate);
+
+
+
+
+
+
+
+
+
+
 
     /*
@@ -435 +446 @@
                 aCW[i].len = sizeof(aCW[i].ucsWeight) / sizeof(aCW[i].ucsWeight[0]);
             }
+
+
+
+
+
         }
 
@@ -505 +521 @@
  * @param   uobj            The UconvObject to use. Ctype is responsible for freeing it.
  * @param   lobj            The LocaleObject to use. Ctype is responsible for freeing it.
+
  * @param   pszCodeset      The codeset used.
  */
@@ -1221 +1238 @@
  * @returns negated errno on failure.
  * @param   pszCodepage     Pointer to where the codepage specifier starts.
+
+
  * @param   pucsCodepage    Where to store the code page.
  * @param   cucCodepage     Number of UniChar's in the buffer.
@@ -1396 +1415 @@
     {
         case LC_COLLATE:
-            rc = localeCollateDo(&pTemp->Collate, uobj, lobj);
+            rc = localeCollateDo(&pTemp->Collate, uobj, lobj);
             fFree = rc != 0;
             break;