Changeset 437 for branches/branch-1-0/src/helpers/nls.c

Timestamp:

May 25, 2018, 3:57:47 AM (7 years ago)

Author:

rlwalsh

Message:

nls: fix DBCS handling in nlschr()
patch from Steve Levine

File:

• branches/branch-1-0/src/helpers/nls.c (modified) (2 diffs)

branches/branch-1-0/src/helpers/nls.c

@@ -262 +262 @@
     // we're on DBCS:
 
-    // we can't find c if it is a leading byte
-    if (G_afLeadByte[c] != TYPE_SBCS)
+    // we can't find c if it is a DBCS lead byte
+    if (G_afLeadByte[c])
         return NULL;
 
@@ -270 +270 @@
          ++p2)
     {
-        // check _previous_ DBCS type and refresh
-        // DBCS type accordingly
+        // Set current DBCS scan state based of _previous_ DBCS scan state
         switch (ulDBCSType)
         {
-            case TYPE_SBCS:
-            case TYPE_DBCS_2ND:
-                ulDBCSType = G_afLeadByte[*p2];
-                // we can safely do the test here (and skip rechecking
-                // the type) because c can't possibly be a leading byte
-                // V0.9.20 (2002-07-22) [lafaix]
-                if (*p2 == c)
-                    return (PSZ)p2;
-            break;
-
             case TYPE_DBCS_1ST :
                 ulDBCSType = TYPE_DBCS_2ND;
             break;
-        }
-    }
-
-    /*  old code V0.9.20 (2002-07-22) [umoeller]
-    // we're on DBCS:
-    for (p2 = p;
-         *p2;
-         ++p2)
-    {
+            case TYPE_SBCS:
+                if (G_afLeadByte[*p2])
+                    ulDBCSType = TYPE_DBCS_1ST;
+                break;
+        }
+
+        if (ulDBCSType != TYPE_DBCS_1ST) {
         if (*p2 == c)
-        {
-            // match: return this only if it's SBCS;
-            // if it's a DBCS lead char, skip it
-            switch (ulDBCS = nlsQueryDBCSChar(p, p2 - p))
-            {
-                case TYPE_SBCS:
                     return (PSZ)p2;
-
-                case TYPE_DBCS_1ST:
-                    ++p2;
+            ulDBCSType = TYPE_SBCS;     // Ensure next char checked for DBCS lead
             }
-        }
-    }
-    */
+
+    } // for
 
     return NULL;