Changeset 444 for branches/branch-1-0/src/helpers

Timestamp:

Feb 20, 2019, 8:00:49 AM (6 years ago)

Author:

rlwalsh

Message:

nls: rewrite nlschr()

File:

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

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

@@ -243 +243 @@
  *      replacement for strchr with DBCS support.
  *
+ *      This finds single-byte characters in strings
+ *      that may contain DBCS characters. Both DBCS
+ *      leading and trailing bytes are ignored, even
+ *      if one of them matches the search character.
+ *
  *      If the system is not running with DBCS,
  *      this calls plain strchr automatically.
  *
- *@@added V0.9.19 (2002-06-13) [umoeller]
- *@@changed V0.9.20 (2002-07-22) [umoeller]: optimized
- *@@changed V0.9.20 (2002-07-22) [lafaix]: optimized
  */
 
@@ -254 +256 @@
 {
     PCSZ    p2;
-    ULONG   ulDBCSType = TYPE_SBCS;
-
+
+    // if not DBCS, do standard strchr()
     if (!nlsDBCS())
-        // not DBCS:
         return strchr(p, c);
-
-    // we're on DBCS:
 
     // we can't find c if it is a DBCS lead byte
@@ -266 +265 @@
         return NULL;
 
-    for (p2 = p;
-         *p2;
-         ++p2)
-    {
-        // Set current DBCS scan state based of _previous_ DBCS scan state
-        switch (ulDBCSType)
-        {
-            case TYPE_DBCS_1ST :
-                ulDBCSType = TYPE_DBCS_2ND;
-            break;
-            case TYPE_SBCS:
-                if (G_afLeadByte[*p2])
-                    ulDBCSType = TYPE_DBCS_1ST;
-                break;
-        }
-
-        if (ulDBCSType != TYPE_DBCS_1ST) {
+    for (p2 = p; *p2; p2++)
+    {
+        // skip over DBCS leading bytes and their trailing bytes
+        if (G_afLeadByte[*p2]) {
+
+            // exit if the trailing byte is zero (shouldn't be)
+            if (!*(++p2))
+                return NULL;
+
+            continue;
+        }
+
+        // test the SBCS char at p2
         if (*p2 == c)
-                    return (PSZ)p2;
-            ulDBCSType = TYPE_SBCS;     // Ensure next char checked for DBCS lead
-            }
-
-    } // for
+            return (PSZ)p2;
+    }
 
     return NULL;