Tcl Source Code

Logged In: YES 
user_id=72656

Note that 8.4 has improved locale detection, so I believe most 
of this patch is mitigated there.  The other parts really need 
proper -locale options.

Logged In: YES 
user_id=72656

While some parts of this look OK, others look like they 
might adversely affect users in other locales, especially 
if they are relying on i18n standard behavior (please note 
that i18n != l10n).  In the places where it might be good, 
I believe it would be better to add -locale options, or 
some other capability to switch this on and off.

DESC: Correct bug in patch for file tcl/generic/tclCmdIL.c

diff -urw ../tclCmdIL.c.original tclCmdIL.c
--- ../tclCmdIL.c.originalTue Apr  4 10:04:41 2000
+++ tclCmdIL.cThu Dec  9 16:17:57 2000
@@ -2823,6 +2823,10 @@
     Tcl_Obj *objPtr;
     char buffer[TCL_INTEGER_SPACE];
 
+    /* * */
+    /* Variables which we need to locale sorting support. */
+    Tcl_DString ds1, ds2;
+    /* * */    
     order = 0;
     if (infoPtr->resultCode != TCL_OK) {
 /*
@@ -2889,7 +2893,10 @@
 objPtr2 = objPtr;
     }
     if (infoPtr->sortMode == SORTMODE_ASCII) {
-order = strcmp(Tcl_GetString(objPtr1), Tcl_GetString(objPtr2));
+/* * */
+/* Apply locale dependent sorting rules - patch by Roman Vasicek */
+order = strcoll(Tcl_UtfToExternalDString(NULL, Tcl_GetString(objPtr1), -1, &ds1), Tcl_UtfToExternalDString(NULL, Tcl_GetString(objPtr2), -1, &ds2));
+/* * */
     } else if (infoPtr->sortMode == SORTMODE_DICTIONARY) {
 order = DictionaryCompare(
 Tcl_GetString(objPtr1),Tcl_GetString(objPtr2));
@@ -2963,6 +2970,10 @@
     if (!infoPtr->isIncreasing) {
 order = -order;
     }
+    /* * */
+    Tcl_DStringFree(&ds1);
+    Tcl_DStringFree(&ds2);
+    /* * */
     return order;
 }