From 9e4b5d1127daa9aa506f8c133e1cdc178f56bbf5 Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Sat, 26 Mar 2005 15:55:57 +0000
Subject: [PATCH] ICU-4189 Fix for UCONFIG_NO_CONVERSION

X-SVN-Rev: 17401
---
 icu4c/source/i18n/transreg.cpp | 43 ++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/icu4c/source/i18n/transreg.cpp b/icu4c/source/i18n/transreg.cpp
index c1082e203a9..b232d531388 100644
--- a/icu4c/source/i18n/transreg.cpp
+++ b/icu4c/source/i18n/transreg.cpp
@@ -28,6 +28,7 @@
 #include "tridpars.h"
 #include "charstr.h"
 #include "uassert.h"
+#include "servloc.h"
 
 // Enable the following symbol to add debugging code that tracks the
 // allocation, deletion, and use of Entry objects.  BoundsChecker has
@@ -198,23 +199,29 @@ class Spec : public UMemory {
     Spec &operator=(const Spec &other); // forbid copying of this class
 };
 
-Spec::Spec(const UnicodeString& theSpec) : top(theSpec) {
+Spec::Spec(const UnicodeString& theSpec)
+: top(theSpec),
+  res(0)
+{
     UErrorCode status = U_ZERO_ERROR;
-    CharString topch(top);
-    Locale toploc(topch);
-    res = new ResourceBundle(U_ICUDATA_TRANSLIT, toploc, status);
-    /* test for NULL */
-    if (res == 0) {
-        return;
-    }
-    if (U_FAILURE(status) || status == U_USING_DEFAULT_WARNING) {
-        delete res;
-        res = 0;
+    CharString topch(theSpec);
+    Locale topLoc("");
+    LocaleUtility::initLocaleFromName(theSpec, topLoc);
+    if (!topLoc.isBogus()) {
+        res = new ResourceBundle(U_ICUDATA_TRANSLIT, topLoc, status);
+        /* test for NULL */
+        if (res == 0) {
+            return;
+        }
+        if (U_FAILURE(status) || status == U_USING_DEFAULT_WARNING) {
+            delete res;
+            res = 0;
+        }
     }
 
     // Canonicalize script name -or- do locale->script mapping
     status = U_ZERO_ERROR;
-    const int32_t capacity = 10;
+    static const int32_t capacity = 10;
     UScriptCode script[capacity]={USCRIPT_INVALID_CODE};
     int32_t num = uscript_getCode(topch,script,capacity, &status);
     if (num > 0 && script[0] != USCRIPT_INVALID_CODE) {
@@ -222,13 +229,12 @@ Spec::Spec(const UnicodeString& theSpec) : top(theSpec) {
     }
 
     // Canonicalize top
-    char buf[256];
     if (res != 0) {
         // Canonicalize locale name
-        status = U_ZERO_ERROR;
-        uloc_getName(topch, buf, sizeof(buf), &status);
-        if (U_SUCCESS(status) && status != U_STRING_NOT_TERMINATED_WARNING) {
-            top = UnicodeString(buf, "");
+        UnicodeString locStr;
+        LocaleUtility::initNameFromLocale(topLoc, locStr);
+        if (!locStr.isBogus()) {
+            top = locStr;
         }
     } else if (scriptName.length() != 0) {
         // We are a script; use canonical name
@@ -997,7 +1003,8 @@ Entry* TransliteratorRegistry::findInBundle(const Spec& specToOpen,
             continue;
         }
         
-        if (specToOpen.get() != subres.getLocale().getName()) {
+        s.truncate(0);
+        if (specToOpen.get() != LocaleUtility::initNameFromLocale(subres.getLocale(), s)) {
             continue;
         }